Merging upstream version 1.32.0.

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

1 files changed, 16 insertions, 34 deletions

diff --git a/health/health.d/wmi.conf b/health/health.d/wmi.conf
index 6bd4e077f..90d39ce9d 100644
--- a/health/health.d/wmi.conf
+++ b/health/health.d/wmi.conf
@@ -1,29 +1,11 @@
 
-# you can disable an alarm notification by setting the 'to' line to: silent
-
-## Availability
-
- template: wmi_last_collected_secs
-       on: cpu.collector_duration
-    class: Windows
-component: Availability
-     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 data collection
-       to: sysadmin
-
 ## CPU
 
  template: wmi_10min_cpu_usage
        on: wmi.cpu_utilization_total
-    class: Windows
+    class: Utilization
+     type: Windows
 component: CPU
-     type: Utilization
        os: linux
     hosts: *
    lookup: average -10m unaligned match-names of dpc,user,privileged,interrupt
@@ -40,9 +22,9 @@ component: CPU
 
  template: wmi_ram_in_use
        on: wmi.memory_utilization
-    class: Windows
+    class: Utilization
+     type: Windows
 component: Memory
-     type: Utilization
        os: linux
     hosts: *
      calc: ($used) * 100 / ($used + $available)
@@ -56,9 +38,9 @@ component: Memory
 
  template: wmi_swap_in_use
        on: wmi.memory_swap_utilization
-    class: Windows
+    class: Utilization
+     type: Windows
 component: Memory
-     type: Utilization
        os: linux
     hosts: *
      calc: ($used) * 100 / ($used + $available)
@@ -75,9 +57,9 @@ component: Memory
 
  template: wmi_inbound_packets_discarded
        on: wmi.net_discarded
-    class: Windows
+    class: Errors
+     type: Windows
 component: Network
-     type: Errors
        os: linux
     hosts: *
  families: *
@@ -91,9 +73,9 @@ component: Network
 
  template: wmi_outbound_packets_discarded
        on: wmi.net_discarded
-    class: Windows
+    class: Errors
+     type: Windows
 component: Network
-     type: Errors
        os: linux
     hosts: *
  families: *
@@ -107,9 +89,9 @@ component: Network
 
  template: wmi_inbound_packets_errors
        on: wmi.net_errors
-    class: Windows
+    class: Errors
+     type: Windows
 component: Network
-     type: Errors
        os: linux
     hosts: *
  families: *
@@ -123,9 +105,9 @@ component: Network
 
  template: wmi_outbound_packets_errors
        on: wmi.net_errors
-    class: Windows
+    class: Errors
+     type: Windows
 component: Network
-     type: Errors
        os: linux
     hosts: *
  families: *
@@ -142,9 +124,9 @@ component: Network
 
  template: wmi_disk_in_use
        on: wmi.logical_disk_utilization
-    class: Windows
+    class: Utilization
+     type: Windows
 component: Disk
-     type: Utilization
        os: linux
     hosts: *
      calc: ($used) * 100 / ($used + $free)