Merging upstream version 1.31.0.

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

1 files changed, 40 insertions, 9 deletions

diff --git a/health/health.d/zfs.conf b/health/health.d/zfs.conf
index 74f96dd3..d6f5fa2f 100644
--- a/health/health.d/zfs.conf
+++ b/health/health.d/zfs.conf
@@ -1,10 +1,41 @@
 
-   alarm: zfs_memory_throttle
-      on: zfs.memory_ops
-  lookup: sum -10m unaligned absolute of throttled
-   units: events
-   every: 1m
-    warn: $this > 0
-   delay: down 1h multiplier 1.5 max 2h
-    info: number of times ZFS had to limit the ARC growth in the last 10 minutes
-      to: sysadmin
+    alarm: zfs_memory_throttle
+       on: zfs.memory_ops
+    class: System
+component: File system
+     type: Utilization
+   lookup: sum -10m unaligned absolute of throttled
+    units: events
+    every: 1m
+     warn: $this > 0
+    delay: down 1h multiplier 1.5 max 2h
+     info: number of times ZFS had to limit the ARC growth in the last 10 minutes
+       to: sysadmin
+
+# ZFS pool state
+
+ template: zfs_pool_state_warn
+       on: zfspool.state
+    class: System
+component: File system
+     type: Errors
+     calc: $degraded
+    units: boolean
+    every: 10s
+     warn: $this > 0
+    delay: down 1m multiplier 1.5 max 1h
+     info: ZFS pool $family state is degraded
+       to: sysadmin
+
+ template: zfs_pool_state_crit
+       on: zfspool.state
+    class: System
+component: File system
+     type: Errors
+     calc: $faulted + $unavail
+    units: boolean
+    every: 10s
+     crit: $this > 0
+    delay: down 1m multiplier 1.5 max 1h
+     info: ZFS pool $family state is faulted or unavail
+       to: sysadmin