Merging upstream version 1.32.0.

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

1 files changed, 24 insertions, 24 deletions

diff --git a/health/health.d/ram.conf b/health/health.d/ram.conf
index 0e3cc29fa..6e6e3b400 100644
--- a/health/health.d/ram.conf
+++ b/health/health.d/ram.conf
@@ -3,9 +3,9 @@
 
     alarm: used_ram_to_ignore
        on: system.ram
-    class: System
+    class: Utilization
+     type: System
 component: Memory
-     type: Utilization
        os: linux freebsd
     hosts: *
      calc: ($zfs.arc_size.arcsz = nan)?(0):($zfs.arc_size.arcsz - $zfs.arc_size.min)
@@ -15,13 +15,12 @@ component: Memory
 
     alarm: ram_in_use
        on: system.ram
-    class: System
+    class: Utilization
+     type: System
 component: Memory
-     type: Utilization
        os: linux
     hosts: *
-#    calc: $used * 100 / ($used + $cached + $free)
-     calc: ($used - $used_ram_to_ignore) * 100 / ($used  + $cached + $free)
+     calc: ($used - $used_ram_to_ignore) * 100 / ($used + $cached + $free + $buffers)
     units: %
     every: 10s
      warn: $this > (($status >= $WARNING)  ? (80) : (90))
@@ -32,12 +31,12 @@ component: Memory
 
     alarm: ram_available
        on: mem.available
-    class: System
+    class: Utilization
+     type: System
 component: Memory
-     type: Utilization
        os: linux
     hosts: *
-     calc: ($avail + $system.ram.used_ram_to_ignore) * 100 / ($system.ram.used + $system.ram.cached + $system.ram.free + $system.ram.buffers)
+     calc: $avail * 100 / ($system.ram.used + $system.ram.cached + $system.ram.free + $system.ram.buffers)
     units: %
     every: 10s
      warn: $this < (($status >= $WARNING)  ? (15) : (10))
@@ -46,24 +45,25 @@ component: Memory
      info: percentage of estimated amount of RAM available for userspace processes, without causing swapping
        to: sysadmin
 
-   alarm: oom_kill
-      on: mem.oom_kill
-      os: linux
-   hosts: *
-  lookup: sum -1m unaligned
-   units: kills
-   every: 10s
-    warn: $this > 0
-   delay: down 5m
-    info: number of out of memory kills in the last minute
-      to: sysadmin
+      alarm: oom_kill
+         on: mem.oom_kill
+         os: linux
+      hosts: *
+     lookup: sum -30m unaligned
+      units: kills
+      every: 5m
+       warn: $this > 0
+      delay: down 10m
+host labels: _is_k8s_node = false
+       info: number of out of memory kills in the last 30 minutes
+         to: sysadmin
 
 ## FreeBSD
     alarm: ram_in_use
        on: system.ram
-    class: System
+    class: Utilization
+     type: System
 component: Memory
-     type: Utilization
        os: freebsd
     hosts: *
      calc: ($active + $wired + $laundry + $buffers - $used_ram_to_ignore) * 100 / ($active + $wired + $laundry + $buffers - $used_ram_to_ignore + $cache + $free + $inactive)
@@ -77,9 +77,9 @@ component: Memory
 
     alarm: ram_available
        on: system.ram
-    class: System
+    class: Utilization
+     type: System
 component: Memory
-     type: Utilization
        os: freebsd
     hosts: *
      calc: ($free + $inactive + $used_ram_to_ignore) * 100 / ($free + $active + $inactive + $wired + $cache + $laundry + $buffers)