Merging upstream version 1.31.0.

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

1 files changed, 43 insertions, 34 deletions

diff --git a/health/health.d/apcupsd.conf b/health/health.d/apcupsd.conf
index 12384fac6..07b5c28c9 100644
--- a/health/health.d/apcupsd.conf
+++ b/health/health.d/apcupsd.conf
@@ -1,40 +1,49 @@
 # you can disable an alarm notification by setting the 'to' line to: silent
 
-template: apcupsd_10min_ups_load
-      on: apcupsd.load
-      os: *
-   hosts: *
-  lookup: average -10m unaligned of percentage
-   units: %
-   every: 1m
-    warn: $this > (($status >= $WARNING)  ? (70) : (80))
-    crit: $this > (($status == $CRITICAL) ? (85) : (95))
-   delay: down 10m multiplier 1.5 max 1h
-    info: average UPS load over the last 10 minutes
-      to: sitemgr
+ template: apcupsd_10min_ups_load
+       on: apcupsd.load
+    class: Power Supply
+component: UPS
+     type: Utilization
+       os: *
+    hosts: *
+   lookup: average -10m unaligned of percentage
+    units: %
+    every: 1m
+     warn: $this > (($status >= $WARNING)  ? (70) : (80))
+     crit: $this > (($status == $CRITICAL) ? (85) : (95))
+    delay: down 10m multiplier 1.5 max 1h
+     info: average UPS load over the last 10 minutes
+       to: sitemgr
 
 # Discussion in https://github.com/netdata/netdata/pull/3928:
 # Fire the alarm as soon as it's going on battery (99% charge) and clear only when full.
-template: apcupsd_ups_charge
-      on: apcupsd.charge
-      os: *
-   hosts: *
-  lookup: average -60s unaligned of charge
-   units: %
-   every: 60s
-    warn: $this < 100
-    crit: $this < (($status == $CRITICAL) ? (60) : (50))
-   delay: down 10m multiplier 1.5 max 1h
-    info: average UPS charge over the last minute
-      to: sitemgr
+ template: apcupsd_ups_charge
+       on: apcupsd.charge
+    class: Power Supply
+component: UPS
+     type: Errors
+       os: *
+    hosts: *
+   lookup: average -60s unaligned of charge
+    units: %
+    every: 60s
+     warn: $this < 100
+     crit: $this < (($status == $CRITICAL) ? (60) : (50))
+    delay: down 10m multiplier 1.5 max 1h
+     info: average UPS charge over the last minute
+       to: sitemgr
 
-template: apcupsd_last_collected_secs
-      on: apcupsd.load
-    calc: $now - $last_collected_t
-   every: 10s
-   units: seconds ago
-    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: sitemgr
+ template: apcupsd_last_collected_secs
+       on: apcupsd.load
+    class: Power Supply
+component: UPS device
+     type: Latency
+     calc: $now - $last_collected_t
+    every: 10s
+    units: seconds ago
+     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: sitemgr