Adding upstream version 1.30.0.upstream/1.30.0

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

1 files changed, 12 insertions, 12 deletions

diff --git a/health/health.d/wmi.conf b/health/health.d/wmi.conf
index 0441fc1f3..f1f71a606 100644
--- a/health/health.d/wmi.conf
+++ b/health/health.d/wmi.conf
@@ -26,7 +26,7 @@ template: wmi_10min_cpu_usage
     warn: $this > (($status >= $WARNING)  ? (75) : (85))
     crit: $this > (($status == $CRITICAL) ? (85) : (95))
    delay: down 15m multiplier 1.5 max 1h
-    info: cpu utilization for the last 10 minutes
+    info: average CPU utilization over the last 10 minutes
       to: sysadmin
 
 
@@ -42,7 +42,7 @@ template: wmi_ram_in_use
     warn: $this > (($status >= $WARNING)  ? (80) : (90))
     crit: $this > (($status == $CRITICAL) ? (90) : (98))
    delay: down 15m multiplier 1.5 max 1h
-    info: used RAM
+    info: memory utilization
       to: sysadmin
 
 template: wmi_swap_in_use
@@ -55,13 +55,13 @@ template: wmi_swap_in_use
     warn: $this > (($status >= $WARNING)  ? (80) : (90))
     crit: $this > (($status == $CRITICAL) ? (90) : (98))
    delay: down 15m multiplier 1.5 max 1h
-    info: used Swap
+    info: swap memory utilization
       to: sysadmin
 
 
 ## Network
 
-template: inbound_packets_discarded
+template: wmi_inbound_packets_discarded
       on: wmi.net_discarded
       os: linux
    hosts: *
@@ -71,10 +71,10 @@ families: *
    every: 1m
     warn: $this >= 5
    delay: down 1h multiplier 1.5 max 2h
-    info: interface inbound discarded packets in the last 10 minutes
+    info: number of inbound discarded packets for the network interface in the last 10 minutes
       to: sysadmin
 
-template: outbound_packets_discarded
+template: wmi_outbound_packets_discarded
       on: wmi.net_discarded
       os: linux
    hosts: *
@@ -84,10 +84,10 @@ families: *
    every: 1m
     warn: $this >= 5
    delay: down 1h multiplier 1.5 max 2h
-    info: interface outbound discarded packets in the last 10 minutes
+    info: number of outbound discarded packets for the network interface in the last 10 minutes
       to: sysadmin
 
-template: inbound_packets_errors
+template: wmi_inbound_packets_errors
       on: wmi.net_errors
       os: linux
    hosts: *
@@ -97,10 +97,10 @@ families: *
    every: 1m
     warn: $this >= 5
    delay: down 1h multiplier 1.5 max 2h
-    info: interface inbound errors in the last 10 minutes
+    info: number of inbound errors for the network interface in the last 10 minutes
       to: sysadmin
 
-template: outbound_packets_errors
+template: wmi_outbound_packets_errors
       on: wmi.net_errors
       os: linux
    hosts: *
@@ -110,7 +110,7 @@ families: *
    every: 1m
     warn: $this >= 5
    delay: down 1h multiplier 1.5 max 2h
-    info: interface outbound errors in the last 10 minutes
+    info: number of outbound errors for the network interface in the last 10 minutes
       to: sysadmin
 
 
@@ -126,5 +126,5 @@ template: wmi_disk_in_use
     warn: $this > (($status >= $WARNING)  ? (80) : (90))
     crit: $this > (($status == $CRITICAL) ? (90) : (98))
    delay: down 15m multiplier 1.5 max 1h
-    info: used disk space
+    info: disk space utilization
       to: sysadmin