Merging upstream version 1.31.0.

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

1 files changed, 26 insertions, 20 deletions

diff --git a/health/health.d/retroshare.conf b/health/health.d/retroshare.conf
index 51b1deb4c..ca22e60de 100644
--- a/health/health.d/retroshare.conf
+++ b/health/health.d/retroshare.conf
@@ -1,25 +1,31 @@
 # make sure RetroShare is running
 
-template: retroshare_last_collected_secs
-      on: retroshare.peers
-    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: sysadmin
+ template: retroshare_last_collected_secs
+       on: retroshare.peers
+    class: Data Sharing
+component: Retroshare
+     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: sysadmin
 
 # make sure the DHT is fine when active
 
-template: retroshare_dht_working
-      on: retroshare.dht
-    calc: $dht_size_all
-   units: peers
-   every: 1m
-    warn: $this < (($status >= $WARNING)  ? (120) : (100))
-    crit: $this < (($status == $CRITICAL) ? (10)  : (1))
-   delay: up 0 down 15m multiplier 1.5 max 1h
-    info: number of DHT peers
-      to: sysadmin
+ template: retroshare_dht_working
+       on: retroshare.dht
+    class: Data Sharing
+component: Retroshare
+     type: Utilization
+     calc: $dht_size_all
+    units: peers
+    every: 1m
+     warn: $this < (($status >= $WARNING)  ? (120) : (100))
+     crit: $this < (($status == $CRITICAL) ? (10)  : (1))
+    delay: up 0 down 15m multiplier 1.5 max 1h
+     info: number of DHT peers
+       to: sysadmin