Merging upstream version 1.46.3.

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

1 files changed, 0 insertions, 50 deletions

diff --git a/health/health.d/upsd.conf b/health/health.d/upsd.conf
deleted file mode 100644
index 703a64881..000000000
--- a/health/health.d/upsd.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# you can disable an alarm notification by setting the 'to' line to: silent
-
- template: upsd_10min_ups_load
-       on: upsd.ups_load
-    class: Utilization
-     type: Power Supply
-component: UPS
-       os: *
-    hosts: *
-   lookup: average -10m unaligned of load
-    units: %
-    every: 1m
-     warn: $this > (($status >= $WARNING)  ? (70) : (80))
-     crit: $this > (($status == $CRITICAL) ? (85) : (95))
-    delay: down 10m multiplier 1.5 max 1h
-  summary: UPS ${label:ups_name} load
-     info: UPS ${label:ups_name} average load over the last 10 minutes
-       to: sitemgr
-
- template: upsd_ups_battery_charge
-       on: upsd.ups_battery_charge	
-    class: Errors
-     type: Power Supply
-component: UPS
-       os: *
-    hosts: *
-   lookup: average -60s unaligned of charge
-    units: %
-    every: 60s
-     warn: $this < 75
-     crit: $this < 40
-    delay: down 10m multiplier 1.5 max 1h
-  summary: UPS ${label:ups_name} battery charge
-     info: UPS ${label:ups_name} average battery charge over the last minute
-       to: sitemgr
-
- template: upsd_ups_last_collected_secs
-       on: upsd.ups_load
-    class: Latency
-     type: Power Supply
-component: UPS device
-     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
-  summary: UPS ${label:ups_name} last collected
-     info: UPS ${label:ups_name} number of seconds since the last successful data collection
-       to: sitemgr