Adding upstream version 1.30.0.upstream/1.30.0

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

1 files changed, 4 insertions, 4 deletions

diff --git a/health/health.d/apcupsd.conf b/health/health.d/apcupsd.conf
index 4f86037ba..12384fac6 100644
--- a/health/health.d/apcupsd.conf
+++ b/health/health.d/apcupsd.conf
@@ -1,6 +1,6 @@
 # you can disable an alarm notification by setting the 'to' line to: silent
 
-template: 10min_ups_load
+template: apcupsd_10min_ups_load
       on: apcupsd.load
       os: *
    hosts: *
@@ -10,12 +10,12 @@ template: 10min_ups_load
     warn: $this > (($status >= $WARNING)  ? (70) : (80))
     crit: $this > (($status == $CRITICAL) ? (85) : (95))
    delay: down 10m multiplier 1.5 max 1h
-    info: average UPS load for the last 10 minutes
+    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: ups_charge
+template: apcupsd_ups_charge
       on: apcupsd.charge
       os: *
    hosts: *
@@ -25,7 +25,7 @@ template: ups_charge
     warn: $this < 100
     crit: $this < (($status == $CRITICAL) ? (60) : (50))
    delay: down 10m multiplier 1.5 max 1h
-    info: current UPS charge, averaged over the last 60 seconds to reduce measurement errors
+    info: average UPS charge over the last minute
       to: sitemgr
 
 template: apcupsd_last_collected_secs