Adding upstream version 1.31.0.upstream/1.31.0

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

1 files changed, 38 insertions, 29 deletions

diff --git a/health/health.d/redis.conf b/health/health.d/redis.conf
index 43f98a1d4..e8b289942 100644
--- a/health/health.d/redis.conf
+++ b/health/health.d/redis.conf
@@ -1,34 +1,43 @@
 
 # make sure redis is running
 
-template: redis_last_collected_secs
-      on: redis.operations
-    calc: $now - $last_collected_t
-   units: seconds ago
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
-    crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
-   delay: down 5m multiplier 1.5 max 1h
-    info: number of seconds since the last successful data collection
-      to: dba
+ template: redis_last_collected_secs
+       on: redis.operations
+    class: KV Storage
+component: Redis
+     type: Latency
+     calc: $now - $last_collected_t
+    units: seconds ago
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
+     crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
+    delay: down 5m multiplier 1.5 max 1h
+     info: number of seconds since the last successful data collection
+       to: dba
 
-template: redis_bgsave_broken
-families: *
-      on: redis.bgsave_health
-   every: 10s
-    crit: $rdb_last_bgsave_status != 0
-   units: ok/failed
-    info: status of the last RDB save operation (0: ok, 1: error)
-   delay: down 5m multiplier 1.5 max 1h
-      to: dba
+ template: redis_bgsave_broken
+ families: *
+       on: redis.bgsave_health
+    class: KV Storage
+component: Redis
+     type: Errors
+    every: 10s
+     crit: $rdb_last_bgsave_status != 0
+    units: ok/failed
+     info: status of the last RDB save operation (0: ok, 1: error)
+    delay: down 5m multiplier 1.5 max 1h
+       to: dba
 
-template: redis_bgsave_slow
-families: *
-      on: redis.bgsave_now
-   every: 10s
-    warn: $rdb_bgsave_in_progress > 600
-    crit: $rdb_bgsave_in_progress > 1200
-   units: seconds
-    info: duration of the on-going RDB save operation
-   delay: down 5m multiplier 1.5 max 1h
-      to: dba
+ template: redis_bgsave_slow
+ families: *
+       on: redis.bgsave_now
+    class: KV Storage
+component: Redis
+     type: Latency
+    every: 10s
+     warn: $rdb_bgsave_in_progress > 600
+     crit: $rdb_bgsave_in_progress > 1200
+    units: seconds
+     info: duration of the on-going RDB save operation
+    delay: down 5m multiplier 1.5 max 1h
+       to: dba