prevent division by zero in disk fill rate alarm ; more elastic default disk alarms

diff --git a/conf.d/health.d/disks.conf b/conf.d/health.d/disks.conf
index c333a303b2afc0e548d51ddfff643dbaed293909..8e3753164e53e0ea153c7f30107b0e459dcd8b53 100644 (file)
--- a/conf.d/health.d/disks.conf
+++ b/conf.d/health.d/disks.conf
@@ -38,8 +38,8 @@ template: disk_space_usage
     calc: $used * 100 / ($avail + $used)
    units: %
    every: 1m
-    warn: $this > (($status >= $WARNING ) ? (70) : (80))
-    crit: $this > (($status == $CRITICAL) ? (85) : (95))
+    warn: $this > (($status >= $WARNING ) ? (80) : (90))
+    crit: $this > (($status == $CRITICAL) ? (90) : (98))
    delay: up 1m down 15m multiplier 1.5 max 1h
     info: current disk space usage
       to: sysadmin
@@ -49,8 +49,8 @@ template: disk_inode_usage
     calc: $used * 100 / ($avail + $used)
    units: %
    every: 1m
-    warn: $this > (($status >= $WARNING)  ? (75) : (80))
-    crit: $this > (($status == $CRITICAL) ? (90) : (95))
+    warn: $this > (($status >= $WARNING)  ? (80) : (90))
+    crit: $this > (($status == $CRITICAL) ? (90) : (98))
    delay: up 1m down 15m multiplier 1.5 max 1h
     info: current disk inode usage
       to: sysadmin
@@ -82,7 +82,7 @@ template: disk_fill_rate
 
 template: out_of_disk_space_time
       on: disk.space
-    calc: $avail / $disk_fill_rate
+    calc: ($disk_fill_rate > 0) ? ($avail / $disk_fill_rate) : (0)
    units: hours
    every: 10s
     warn: $this > 0 and $this < (($status >= $WARNING)  ? (48) : (8))