Merging upstream version 1.31.0.

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

1 files changed, 37 insertions, 28 deletions

diff --git a/health/health.d/backend.conf b/health/health.d/backend.conf
index 8089dc94e..948ea551a 100644
--- a/health/health.d/backend.conf
+++ b/health/health.d/backend.conf
@@ -1,33 +1,42 @@
 # Alert that backends subsystem will be disabled soon
-   alarm: backend_metrics_eol
-      on: netdata.backend_metrics
-   units: boolean
-    calc: $now - $last_collected_t 
-   every: 1m
-    warn: $this > 0
-   delay: down 5m multiplier 1.5 max 1h
-    info: the backends subsystem is deprecated and will be removed soon. Migrate your configuration to exporting.conf.
-      to: sysadmin
+    alarm: backend_metrics_eol
+       on: netdata.backend_metrics
+    class: Netdata
+component: Exporting engine
+     type: Errors
+    units: boolean
+     calc: $now - $last_collected_t
+    every: 1m
+     warn: $this > 0
+    delay: down 5m multiplier 1.5 max 1h
+     info: the backends subsystem is deprecated and will be removed soon. Migrate your configuration to exporting.conf.
+       to: sysadmin
 
 # make sure we are sending data to backend
 
-   alarm: backend_last_buffering
-      on: netdata.backend_metrics
-    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 buffering of backend data
-      to: dba
+    alarm: backend_last_buffering
+       on: netdata.backend_metrics
+    class: Netdata
+component: Exporting engine
+     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 buffering of backend data
+       to: dba
 
-   alarm: backend_metrics_sent
-      on: netdata.backend_metrics
-   units: %
-    calc: abs($sent) * 100 / abs($buffered)
-   every: 10s
-    warn: $this != 100
-   delay: down 5m multiplier 1.5 max 1h
-    info: percentage of metrics sent to the backend server
-      to: dba
+    alarm: backend_metrics_sent
+       on: netdata.backend_metrics
+    class: Netdata
+component: Exporting engine
+     type: Workload
+    units: %
+     calc: abs($sent) * 100 / abs($buffered)
+    every: 10s
+     warn: $this != 100
+    delay: down 5m multiplier 1.5 max 1h
+     info: percentage of metrics sent to the backend server
+       to: dba