Merging upstream version 1.31.0.

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

1 files changed, 30 insertions, 24 deletions

diff --git a/health/health.d/cgroups.conf b/health/health.d/cgroups.conf
index c0a16f154..068533f10 100644
--- a/health/health.d/cgroups.conf
+++ b/health/health.d/cgroups.conf
@@ -1,28 +1,34 @@
 
 # you can disable an alarm notification by setting the 'to' line to: silent
 
-template: cgroup_10min_cpu_usage
-      on: cgroup.cpu_limit
-      os: linux
-   hosts: *
-  lookup: average -10m unaligned
-   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 cgroup CPU utilization over the last 10 minutes
-      to: sysadmin
+ template: cgroup_10min_cpu_usage
+       on: cgroup.cpu_limit
+    class: Cgroups
+component: CPU
+     type: Utilization
+       os: linux
+    hosts: *
+   lookup: average -10m unaligned
+    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 cgroup CPU utilization over the last 10 minutes
+       to: sysadmin
 
-template: cgroup_ram_in_use
-      on: cgroup.mem_usage
-      os: linux
-   hosts: *
-    calc: ($ram) * 100 / $memory_limit
-   units: %
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? (80) : (90))
-    crit: $this > (($status == $CRITICAL) ? (90) : (98))
-   delay: down 15m multiplier 1.5 max 1h
-    info: cgroup memory utilization
-      to: sysadmin
+ template: cgroup_ram_in_use
+       on: cgroup.mem_usage
+    class: Cgroups
+component: Memory
+     type: Utilization
+       os: linux
+    hosts: *
+     calc: ($ram) * 100 / $memory_limit
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (90))
+     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+    delay: down 15m multiplier 1.5 max 1h
+     info: cgroup memory utilization
+       to: sysadmin