Merging upstream version 1.42.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 43 insertions, 44 deletions

diff --git a/health/health.d/disks.conf b/health/health.d/disks.conf
index 7bd4f120c..27f5d6691 100644
--- a/health/health.d/disks.conf
+++ b/health/health.d/disks.conf
@@ -21,7 +21,7 @@ chart labels: mount_point=!/dev !/dev/* !/run !/run/* *
     units: %
     every: 1m
      warn: $this > (($status >= $WARNING ) ? (80) : (90))
-     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+     crit: ($this > (($status == $CRITICAL) ? (90) : (98))) && $avail < 5
     delay: up 1m down 15m multiplier 1.5 max 1h
      info: disk ${label:mount_point} space utilization
        to: sysadmin
@@ -55,33 +55,32 @@ chart labels: mount_point=!/dev !/dev/* !/run !/run/* *
 # we will use it in the next template to find
 # the hours remaining
 
-# template: disk_fill_rate
-#       on: disk.space
-#       os: linux freebsd
-#    hosts: *
-#   lookup: min -10m at -50m unaligned of avail
-#     calc: ($this - $avail) / (($now - $after) / 3600)
-#    every: 1m
-#    units: GB/hour
-#     info: average rate the disk fills up (positive), or frees up (negative) space, for the last hour
-
+template: disk_fill_rate
+      on: disk.space
+      os: linux freebsd
+   hosts: *
+  lookup: min -10m at -50m unaligned of avail
+    calc: ($this - $avail) / (($now - $after) / 3600)
+   every: 1m
+   units: GB/hour
+    info: average rate the disk fills up (positive), or frees up (negative) space, for the last hour
 
 # calculate the hours remaining
 # if the disk continues to fill
 # in this rate
 
-# template: out_of_disk_space_time
-#       on: disk.space
-#       os: linux freebsd
-#    hosts: *
-#     calc: ($disk_fill_rate > 0) ? ($avail / $disk_fill_rate) : (inf)
-#    units: hours
-#    every: 10s
-#     warn: $this > 0 and $this < (($status >= $WARNING)  ? (48) : (8))
-#     crit: $this > 0 and $this < (($status == $CRITICAL) ? (24) : (2))
-#    delay: down 15m multiplier 1.2 max 1h
-#     info: estimated time the disk will run out of space, if the system continues to add data with the rate of the last hour
-#       to: sysadmin
+template: out_of_disk_space_time
+      on: disk.space
+      os: linux freebsd
+   hosts: *
+    calc: ($disk_fill_rate > 0) ? ($avail / $disk_fill_rate) : (inf)
+   units: hours
+   every: 10s
+    warn: $this > 0 and $this < (($status >= $WARNING)  ? (48) : (8))
+    crit: $this > 0 and $this < (($status == $CRITICAL) ? (24) : (2))
+   delay: down 15m multiplier 1.2 max 1h
+    info: estimated time the disk will run out of space, if the system continues to add data with the rate of the last hour
+      to: silent
 
 
 # -----------------------------------------------------------------------------
@@ -95,32 +94,32 @@ chart labels: mount_point=!/dev !/dev/* !/run !/run/* *
 # we will use it in the next template to find
 # the hours remaining
 
-# template: disk_inode_rate
-#       on: disk.inodes
-#       os: linux freebsd
-#    hosts: *
-#   lookup: min -10m at -50m unaligned of avail
-#     calc: ($this - $avail) / (($now - $after) / 3600)
-#    every: 1m
-#    units: inodes/hour
-#     info: average rate at which disk inodes are allocated (positive), or freed (negative), for the last hour
+template: disk_inode_rate
+      on: disk.inodes
+      os: linux freebsd
+   hosts: *
+  lookup: min -10m at -50m unaligned of avail
+    calc: ($this - $avail) / (($now - $after) / 3600)
+   every: 1m
+   units: inodes/hour
+    info: average rate at which disk inodes are allocated (positive), or freed (negative), for the last hour
 
 # calculate the hours remaining
 # if the disk inodes are allocated
 # in this rate
 
-# template: out_of_disk_inodes_time
-#       on: disk.inodes
-#       os: linux freebsd
-#    hosts: *
-#     calc: ($disk_inode_rate > 0) ? ($avail / $disk_inode_rate) : (inf)
-#    units: hours
-#    every: 10s
-#     warn: $this > 0 and $this < (($status >= $WARNING)  ? (48) : (8))
-#     crit: $this > 0 and $this < (($status == $CRITICAL) ? (24) : (2))
-#    delay: down 15m multiplier 1.2 max 1h
-#     info: estimated time the disk will run out of inodes, if the system continues to allocate inodes with the rate of the last hour
-#       to: sysadmin
+template: out_of_disk_inodes_time
+      on: disk.inodes
+      os: linux freebsd
+   hosts: *
+    calc: ($disk_inode_rate > 0) ? ($avail / $disk_inode_rate) : (inf)
+   units: hours
+   every: 10s
+    warn: $this > 0 and $this < (($status >= $WARNING)  ? (48) : (8))
+    crit: $this > 0 and $this < (($status == $CRITICAL) ? (24) : (2))
+   delay: down 15m multiplier 1.2 max 1h
+    info: estimated time the disk will run out of inodes, if the system continues to allocate inodes with the rate of the last hour
+      to: silent
 
 
 # -----------------------------------------------------------------------------