more elastic swap checks

diff --git a/conf.d/health.d/swap.conf b/conf.d/health.d/swap.conf
index 552dd310adfa81c8ba7c04051258c3b7ac7a16d3..1420565bddfc3010b99477e4cf8697053ea4c71c 100644 (file)
--- a/conf.d/health.d/swap.conf
+++ b/conf.d/health.d/swap.conf
@@ -5,10 +5,10 @@
           # 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 )
    every: 1m
-    warn: $this > 1
-    crit: $this > 10
+    warn: $this > 10
+    crit: $this > 20
    units: % of RAM
-    info: the sum of all memory swapped out during the last 30 minutes, as a percentage of the available RAM
+    info: the amount of memory swapped in the last 30 minutes, as a percentage of the system RAM
 
    alarm: pcent_of_ram_in_swap
       on: system.swap
@@ -17,4 +17,4 @@
     warn: $this > 10
     crit: $this > 50
    units: % of RAM
-    info: the currently used swap space, as a percentage of the available RAM
+    info: the swap memory used, as a percentage of the system RAM

diff --git a/web/index.html b/web/index.html
index 162250b905efd380c4021283fe6f1b2cde5fe6a5..486bda4af3f49da586264a336cf48ebe309a5de7 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2504,6 +2504,7 @@ function alarmsUpdateModal() {
             }
 
             html += '<tr><td width="10%" style="text-align:right">check&nbsp;every</td><td>' + frequency_text(alarm.update_every) + '</td></tr>'
+                + '<tr><td width="10%" style="text-align:right">execute</td><td><span style="font-family: monospace;">' + alarm.exec + '</span></td></tr>'
                 + '<tr><td width="10%" style="text-align:right">source</td><td><span style="font-family: monospace;">' + alarm.source + '</span></td></tr>'
                 + '</table></td></tr>';