[bamboo] Automated branch merge (from release-18.0.3:abdb3491ad122e53…

…ccfa1e91d966672d7aa2bebd)
OpenNMS · Nov 3, 2016 · 45300a1 · 45300a1
2 parents fa47d5c + abdb349
commit 45300a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/thresholds/editExpression.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/thresholds/editExpression.jsp
@@ -2,8 +2,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2007-2014 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ * Copyright (C) 2007-2016 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -204,12 +204,12 @@
         <p>
         <b>Description</b>: An optional description for the threshold expression, to help identify what is their purpose.<br/>
         <b>Type</b>:<br/>
-        &nbsp;&nbsp;<b>high</b>: Triggers when the value of the data source exceeds the "value", and is re-armed when it drops below the "re-arm" value.<br/>
-        &nbsp;&nbsp;<b>low</b>: Triggers when the value of the data source drops below the "value", and is re-armed when it exceeds the "re-arm" value.<br/>
-        &nbsp;&nbsp;<b>relativeChange</b>: Triggers when the change in data source value from one collection to the next is greater than "value" percent.
+        &nbsp;&nbsp;<b>high</b>: Triggers when the value of the data source equals or exceeds the "value", and is re-armed when it drops below the "re-arm" value.<br/>
+        &nbsp;&nbsp;<b>low</b>: Triggers when the value of the data source drops to or below the "value", and is re-armed when it equals or exceeds the "re-arm" value.<br/>
+        &nbsp;&nbsp;<b>relativeChange</b>: Triggers when the change in data source value from one collection to the next is greater than or equal to "value" percent.
           Re-arm and trigger are not used.<br/>
-        &nbsp;&nbsp;<b>absoluteChange</b>: Triggers when the value changes by more than the specified amount.  Re-arm and trigger are not used.<br/>
-        &nbsp;&nbsp;<b>rearmingAbsoluteChange</b>: Like absoluteChange, Triggers when the value changes by more than the specified amount.  However,
+        &nbsp;&nbsp;<b>absoluteChange</b>: Triggers when the value changes by the specified amount or greater.  Re-arm and trigger are not used.<br/>
+        &nbsp;&nbsp;<b>rearmingAbsoluteChange</b>: Like absoluteChange, Triggers when the value changes by the specified amount or greater.  However,
           the "trigger" is used to re-arm the event after so many iterations with an unchanged delta.  Re-arm is not used.<br/>
         <b>Expression</b>: A  mathematical expression involving datasource names which will be evaluated and compared to the threshold values<br/>
         <b>Data source type</b>: Node for "node-level" data items, and "interface" for interface-level items.  <br/>

diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/thresholds/editThreshold.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/thresholds/editThreshold.jsp
@@ -2,8 +2,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2007-2014 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ * Copyright (C) 2007-2016 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -204,12 +204,12 @@
 <p>
 <b>Description</b>: An optional description for the threshold, to help identify what is their purpose.<br/>
 <b>Type</b>:<br/>
-&nbsp;&nbsp;<b>high</b>: Triggers when the value of the data source exceeds the "value", and is re-armed when it drops below the "re-arm" value.<br/>
-&nbsp;&nbsp;<b>low</b>: Triggers when the value of the data source drops below the "value", and is re-armed when it exceeds the "re-arm" value.<br/>
-&nbsp;&nbsp;<b>relativeChange</b>: Triggers when the change in data source value from one collection to the next is greater than "value" percent.
+&nbsp;&nbsp;<b>high</b>: Triggers when the value of the data source equals or exceeds the "value", and is re-armed when it drops below the "re-arm" value.<br/>
+&nbsp;&nbsp;<b>low</b>: Triggers when the value of the data source equals or drops to or below the "value", and is re-armed when it equals or exceeds the "re-arm" value.<br/>
+&nbsp;&nbsp;<b>relativeChange</b>: Triggers when the change in data source value from one collection to the next is greater than or equal to "value" percent.
   Re-arm and trigger are not used.<br/>
-&nbsp;&nbsp;<b>absoluteChange</b>: Triggers when the value changes by more than the specified amount.  Re-arm and trigger are not used.<br/>
-&nbsp;&nbsp;<b>rearmingAbsoluteChange</b>: Like absoluteChange, Triggers when the value changes by more than the specified amount.  However,
+&nbsp;&nbsp;<b>absoluteChange</b>: Triggers when the value changes by the specified amount or greater.  Re-arm and trigger are not used.<br/>
+&nbsp;&nbsp;<b>rearmingAbsoluteChange</b>: Like absoluteChange, Triggers when the value changes by the specified amount or greater.  However,
   the "trigger" is used to re-arm the event after so many iterations with an unchanged delta.  Re-arm is not used.<br/>
 <b>Expression</b>: A  mathematical expression involving datasource names which will be evaluated and compared to the threshold values<br/>
 <b>Data source type</b>: "node" for node-level data items, "if" for interface-level items, or any Generic Resource Type defined on datacollection-config.xml. Node-level will ignore filter configuration.<br/>