Merge tag 'upstream/1.4.0+dfsg'

Upstream version 1.4.0+dfsg

1 files changed, 24 insertions, 18 deletions

diff --git a/conf.d/health.d/memcached.conf b/conf.d/health.d/memcached.conf
index 05ff14711..46a8ca0e5 100644
--- a/conf.d/health.d/memcached.conf
+++ b/conf.d/health.d/memcached.conf
@@ -4,43 +4,49 @@
 template: memcached_last_collected_secs
       on: memcached.cache
     calc: $now - $last_collected_t
-   every: 10s
-    warn: $this > ( 5 * $update_every)
-    crit: $this > (10 * $update_every)
    units: seconds ago
+   every: 10s
+    warn: $this > (($status >= $WARNING)  ? (0) : ( 5 * $update_every))
+    crit: $this > (($status == $CRITICAL) ? (0) : (60 * $update_every))
+   delay: down 5m multiplier 1.5 max 1h
     info: number of seconds since the last successful data collection
+      to: dba
 
 
 # detect if memcached cache is full
 
-template: cache_full_pcent
+template: memcached_cache_memory_usage
       on: memcached.cache
     calc: $used * 100 / ($used + $available)
-   every: 10s
-    warn: $this > 80
-    crit: $this > 90
    units: %
+   every: 10s
+    warn: $this > (($status >= $WARNING)  ? (70) : (80))
+    crit: $this > (($status == $CRITICAL) ? (80) : (90))
+   delay: up 0 down 15m multiplier 1.5 max 1h
     info: current cache memory usage
+      to: dba
 
 
 # find the rate memcached cache is filling
 
 template: cache_fill_rate
       on: memcached.cache
-  lookup: max -1s at -30m unaligned of available
-    calc: ($this - $available) / ($now - $after)
-   every: 15s
-   units: KB/s
-    info: average rate the cache fills up (positive), or frees up (negative) space, for the last 30 minutes
+  lookup: min -10m at -50m unaligned of available
+    calc: ($this - $available) / (($now - $after) / 3600)
+   units: KB/hour
+   every: 1m
+    info: average rate the cache fills up (positive), or frees up (negative) space, for the last hour
 
 
 # find the hours remaining until memcached cache is full
 
-template: cache_full_after_hours
+template: out_of_cache_space_time
       on: memcached.cache
-    calc: $available / $cache_fill_rate / 3600
-   every: 10s
-    warn: $this > 0 and $this < 48
-    crit: $this > 0 and $this < 24
+    calc: $available / $cache_fill_rate
    units: hours
-    info: estimated time the cache will run out of space, if the system continues to add data with the rate of the last 30 minutes
+   every: 10s
+    warn: $this > 0 and $this < (($status >= $WARNING)  ? (48) : (8))
+    crit: $this > 0 and $this < (($status == $CRITICAL) ? (24) : (2))
+   delay: down 15m multiplier 1.5 max 1h
+    info: estimated time the cache will run out of space, if the system continues to add data with the rate of the last hour
+      to: dba