Merging upstream version 1.31.0.

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

1 files changed, 31 insertions, 25 deletions

diff --git a/health/health.d/swap.conf b/health/health.d/swap.conf
index 66c36c13c..5b3f89a97 100644
--- a/health/health.d/swap.conf
+++ b/health/health.d/swap.conf
@@ -1,29 +1,35 @@
 
 # you can disable an alarm notification by setting the 'to' line to: silent
 
-   alarm: 30min_ram_swapped_out
-      on: system.swapio
-      os: linux freebsd
-   hosts: *
-  lookup: sum -30m unaligned absolute of out
-          # we have to convert KB to MB by dividing $this (i.e. the result of the lookup) with 1024
-    calc: $this / 1024 * 100 / ( $system.ram.used + $system.ram.cached + $system.ram.free )
-   units: % of RAM
-   every: 1m
-    warn: $this > (($status >= $WARNING)  ? (20) : (30))
-   delay: down 15m multiplier 1.5 max 1h
-    info: percentage of the system RAM swapped in the last 30 minutes
-      to: sysadmin
+    alarm: 30min_ram_swapped_out
+       on: system.swapio
+    class: System
+component: Memory
+     type: Workload
+       os: linux freebsd
+    hosts: *
+   lookup: sum -30m unaligned absolute of out
+           # we have to convert KB to MB by dividing $this (i.e. the result of the lookup) with 1024
+     calc: $this / 1024 * 100 / ( $system.ram.used + $system.ram.cached + $system.ram.free )
+    units: % of RAM
+    every: 1m
+     warn: $this > (($status >= $WARNING)  ? (20) : (30))
+    delay: down 15m multiplier 1.5 max 1h
+     info: percentage of the system RAM swapped in the last 30 minutes
+       to: sysadmin
 
-   alarm: used_swap
-      on: system.swap
-      os: linux freebsd
-   hosts: *
-    calc: $used * 100 / ( $used + $free )
-   units: %
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? (80) : (90))
-    crit: $this > (($status == $CRITICAL) ? (90) : (98))
-   delay: up 30s down 15m multiplier 1.5 max 1h
-    info: swap memory utilization
-      to: sysadmin
+    alarm: used_swap
+       on: system.swap
+    class: System
+component: Memory
+     type: Utilization
+       os: linux freebsd
+    hosts: *
+     calc: $used * 100 / ( $used + $free )
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (90))
+     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+    delay: up 30s down 15m multiplier 1.5 max 1h
+     info: swap memory utilization
+       to: sysadmin