From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 9 Jun 2022 06:52:47 +0200
Subject: Merging upstream version 1.35.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 health/health.d/ram.conf | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'health/health.d/ram.conf')

diff --git a/health/health.d/ram.conf b/health/health.d/ram.conf
index 6e6e3b400..ff5f3ac17 100644
--- a/health/health.d/ram.conf
+++ b/health/health.d/ram.conf
@@ -1,18 +1,6 @@
 
 # you can disable an alarm notification by setting the 'to' line to: silent
 
-    alarm: used_ram_to_ignore
-       on: system.ram
-    class: Utilization
-     type: System
-component: Memory
-       os: linux freebsd
-    hosts: *
-     calc: ($zfs.arc_size.arcsz = nan)?(0):($zfs.arc_size.arcsz - $zfs.arc_size.min)
-    every: 10s
-     info: amount of memory reported as used, \
-           but it is actually capable for resizing itself based on the system needs (eg. ZFS ARC)
-
     alarm: ram_in_use
        on: system.ram
     class: Utilization
@@ -20,7 +8,7 @@ component: Memory
 component: Memory
        os: linux
     hosts: *
-     calc: ($used - $used_ram_to_ignore) * 100 / ($used + $cached + $free + $buffers)
+     calc: $used * 100 / ($used + $cached + $free + $buffers)
     units: %
     every: 10s
      warn: $this > (($status >= $WARNING)  ? (80) : (90))
@@ -66,7 +54,7 @@ host labels: _is_k8s_node = false
 component: Memory
        os: freebsd
     hosts: *
-     calc: ($active + $wired + $laundry + $buffers - $used_ram_to_ignore) * 100 / ($active + $wired + $laundry + $buffers - $used_ram_to_ignore + $cache + $free + $inactive)
+     calc: ($active + $wired + $laundry + $buffers) * 100 / ($active + $wired + $laundry + $buffers - $used_ram_to_ignore + $cache + $free + $inactive)
     units: %
     every: 10s
      warn: $this > (($status >= $WARNING)  ? (80) : (90))
@@ -82,7 +70,7 @@ component: Memory
 component: Memory
        os: freebsd
     hosts: *
-     calc: ($free + $inactive + $used_ram_to_ignore) * 100 / ($free + $active + $inactive + $wired + $cache + $laundry + $buffers)
+     calc: ($free + $inactive + $cache) * 100 / ($free + $active + $inactive + $wired + $cache + $laundry + $buffers)
     units: %
     every: 10s
      warn: $this < (($status >= $WARNING)  ? (15) : (10))
-- 
cgit v1.2.3