updated alarms

diff --git a/conf.d/health.d/disks.conf b/conf.d/health.d/disks.conf
index 6b612bbc150810d1db8d56e4edb521416501b540..beb9a6affa999b1cf77d56f9fd1761944cd01594 100644 (file)
--- a/conf.d/health.d/disks.conf
+++ b/conf.d/health.d/disks.conf
@@ -5,7 +5,7 @@
 # raise an alarm if the disk is low on
 # available disk space
 
-template: disk_full_percentage
+template: disk_full_percent
       on: disk.space
     calc: $used * 100 / ($avail + $used)
    every: 1m
@@ -35,7 +35,7 @@ template: disk_fill_rate
 # if the disk continues to fill
 # in this rate
 
-template: disk_will_fill_in_hours
+template: disk_full_after_hours
       on: disk.space
     calc: $avail / $disk_fill_rate / 3600
    every: 10s
@@ -48,26 +48,26 @@ template: disk_will_fill_in_hours
 
 # raise an alarm if the disk is congested
 # by calculating the average disk utilization
-# for the last minute
+# for the last 2 minutes
 
-template: disk_congested
+template: 2min_disk_utilization
       on: disk.util
-  lookup: average -1m every 1m unaligned
-   green: 70
+  lookup: average -2m every 1m unaligned
+   green: 80
      red: 95
     warn: $this > $green
     crit: $this > $red
 
+
 # raise an alarm if the disk backlog
 # is above 1000ms (1s) per second
-# for 1 minute
+# for 2 minutes
 # (i.e. the disk cannot catch up)
 
-template: disk_not_catching_up
+template: 2min_disk_backlog
       on: disk.backlog
-  lookup: average -1m every 1m unaligned
+  lookup: average -2m every 1m unaligned
    green: 1000
      red: 2000
     warn: $this > $green
     crit: $this > $red
-

diff --git a/conf.d/health.d/entropy.conf b/conf.d/health.d/entropy.conf
index 4df41ad6094a4c726c7a26b5b3adf4f5d967ff70..e0366dd5e503dce10439cc616b74a094f736ff48 100644 (file)
--- a/conf.d/health.d/entropy.conf
+++ b/conf.d/health.d/entropy.conf
@@ -3,7 +3,7 @@
 # the alarm is checked every 1 minute
 # and examines the last 2 minutes of data
 
-   alarm: low_entropy_2m
+   alarm: min_2min_entropy
       on: system.entropy
   lookup: min -2m unaligned
    every: 1m

diff --git a/conf.d/health.d/net.conf b/conf.d/health.d/net.conf
index 25d54b1b13888d8c4e2dbf4c9325efe37c2ea8a3..7be563058a15630fd6ff82f9f184af7f047877cc 100644 (file)
--- a/conf.d/health.d/net.conf
+++ b/conf.d/health.d/net.conf
@@ -3,9 +3,9 @@
 # the alarm is checked every 10 seconds
 # and examines the last minute of data
 
-template: packet_drops_1m
+template: 10min_packet_drops
       on: net.drops
-  lookup: sum -1m unaligned absolute
+  lookup: sum -10m unaligned absolute
    every: 10s
     crit: $this > 0
 
@@ -14,9 +14,9 @@ template: packet_drops_1m
 # the alarm is checked every 10 seconds
 # and examines the last minute of data
 
-template: qos_packet_drops_1m
+template: 10min_qos_packet_drops
       on: tc.qos_dropped
-  lookup: sum -1m unaligned absolute
-   every: 10s
-    crit: $this > 0
+  lookup: sum -10m unaligned absolute
+   every: 30s
+    warn: $this > 0