Merge pull request #2864 from laf/issue-2847

Updated global rules
librenms · Jan 28, 2016 · 163609a · 163609a
2 parents e00a35c + 87347bc
commit 163609a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/html/includes/print-alert-rules.php b/html/includes/print-alert-rules.php
@@ -53,23 +53,23 @@
     );
     $default_rules[] = array(
         'device_id' => '-1',
-        'rule'      => '%macros.port_usage_perc >= "80"',
+        'rule'      => '%macros.port_usage_perc >= "80" && %macros.port_up = "1" && %macros.port = "1"',
         'severity'  => 'critical',
         'extra'     => '{"mute":false,"count":"-1","delay":"300"}',
         'disabled'  => 0,
         'name'      => 'Port utilisation over threshold',
     );
     $default_rules[] = array(
         'device_id' => '-1',
-        'rule'      => '%sensors.sensor_current > %sensors.sensor_limit',
+        'rule'      => '%sensors.sensor_current > %sensors.sensor_limit && %sensors.sensor_alert = "1"',
         'severity'  => 'critical',
         'extra'     => '{"mute":false,"count":"-1","delay":"300"}',
         'disabled'  => 0,
         'name'      => 'Sensor over limit',
     );
     $default_rules[] = array(
         'device_id' => '-1',
-        'rule'      => '%sensors.sensor_current < %sensors.sensor_limit_low',
+        'rule'      => '%sensors.sensor_current < %sensors.sensor_limit_low && %sensors.sensor_alert = "1"',
         'severity'  => 'critical',
         'extra'     => '{"mute":false,"count":"-1","delay":"300"}',
         'disabled'  => 0,