Merging upstream version 1.31.0.

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

1 files changed, 60 insertions, 48 deletions

diff --git a/health/health.d/cpu.conf b/health/health.d/cpu.conf
index 32c69f8f5..d11215768 100644
--- a/health/health.d/cpu.conf
+++ b/health/health.d/cpu.conf
@@ -1,55 +1,67 @@
 
 # you can disable an alarm notification by setting the 'to' line to: silent
 
-template: 10min_cpu_usage
-      on: system.cpu
-      os: linux
-   hosts: *
-  lookup: average -10m unaligned of user,system,softirq,irq,guest
-   units: %
-   every: 1m
-    warn: $this > (($status >= $WARNING)  ? (75) : (85))
-    crit: $this > (($status == $CRITICAL) ? (85) : (95))
-   delay: down 15m multiplier 1.5 max 1h
-    info: average CPU utilization over the last 10 minutes (excluding iowait, nice and steal)
-      to: sysadmin
+ template: 10min_cpu_usage
+       on: system.cpu
+    class: System
+component: CPU
+     type: Utilization
+       os: linux
+    hosts: *
+   lookup: average -10m unaligned of user,system,softirq,irq,guest
+    units: %
+    every: 1m
+     warn: $this > (($status >= $WARNING)  ? (75) : (85))
+     crit: $this > (($status == $CRITICAL) ? (85) : (95))
+    delay: down 15m multiplier 1.5 max 1h
+     info: average CPU utilization over the last 10 minutes (excluding iowait, nice and steal)
+       to: sysadmin
 
-template: 10min_cpu_iowait
-      on: system.cpu
-      os: linux
-   hosts: *
-  lookup: average -10m unaligned of iowait
-   units: %
-   every: 1m
-    warn: $this > (($status >= $WARNING)  ? (20) : (40))
-    crit: $this > (($status == $CRITICAL) ? (40) : (50))
-   delay: down 15m multiplier 1.5 max 1h
-    info: average CPU iowait time over the last 10 minutes
-      to: sysadmin
+ template: 10min_cpu_iowait
+       on: system.cpu
+    class: System
+component: CPU
+     type: Utilization
+       os: linux
+    hosts: *
+   lookup: average -10m unaligned of iowait
+    units: %
+    every: 1m
+     warn: $this > (($status >= $WARNING)  ? (20) : (40))
+     crit: $this > (($status == $CRITICAL) ? (40) : (50))
+    delay: down 15m multiplier 1.5 max 1h
+     info: average CPU iowait time over the last 10 minutes
+       to: sysadmin
 
-template: 20min_steal_cpu
-      on: system.cpu
-      os: linux
-   hosts: *
-  lookup: average -20m unaligned of steal
-   units: %
-   every: 5m
-    warn: $this > (($status >= $WARNING)  ? (5)  : (10))
-    crit: $this > (($status == $CRITICAL) ? (20) : (30))
-   delay: down 1h multiplier 1.5 max 2h
-    info: average CPU steal time over the last 20 minutes
-      to: sysadmin
+ template: 20min_steal_cpu
+       on: system.cpu
+    class: System
+component: CPU
+     type: Latency
+       os: linux
+    hosts: *
+   lookup: average -20m unaligned of steal
+    units: %
+    every: 5m
+     warn: $this > (($status >= $WARNING)  ? (5)  : (10))
+     crit: $this > (($status == $CRITICAL) ? (20) : (30))
+    delay: down 1h multiplier 1.5 max 2h
+     info: average CPU steal time over the last 20 minutes
+       to: sysadmin
 
 ## FreeBSD
-template: 10min_cpu_usage
-      on: system.cpu
-      os: freebsd
-   hosts: *
-  lookup: average -10m unaligned of user,system,interrupt
-   units: %
-   every: 1m
-    warn: $this > (($status >= $WARNING)  ? (75) : (85))
-    crit: $this > (($status == $CRITICAL) ? (85) : (95))
-   delay: down 15m multiplier 1.5 max 1h
-    info: average CPU utilization over the last 10 minutes (excluding nice)
-      to: sysadmin
+ template: 10min_cpu_usage
+       on: system.cpu
+    class: System
+component: CPU
+     type: Utilization
+       os: freebsd
+    hosts: *
+   lookup: average -10m unaligned of user,system,interrupt
+    units: %
+    every: 1m
+     warn: $this > (($status >= $WARNING)  ? (75) : (85))
+     crit: $this > (($status == $CRITICAL) ? (85) : (95))
+    delay: down 15m multiplier 1.5 max 1h
+     info: average CPU utilization over the last 10 minutes (excluding nice)
+       to: sysadmin