Merging upstream version 1.31.0.

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

1 files changed, 137 insertions, 110 deletions

diff --git a/health/health.d/wmi.conf b/health/health.d/wmi.conf
index f1f71a606..6bd4e077f 100644
--- a/health/health.d/wmi.conf
+++ b/health/health.d/wmi.conf
@@ -3,128 +3,155 @@
 
 ## Availability
 
-template: wmi_last_collected_secs
-      on: cpu.collector_duration
-    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
+ 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
-      os: linux
-   hosts: *
-  lookup: average -10m unaligned match-names of dpc,user,privileged,interrupt
-   units: %
-   every: 1m
-    warn: $this > (($status >= $WARNING)  ? (75) : (85))
-    crit: $this > (($status == $CRITICAL) ? (85) : (95))
-   delay: down 15m multiplier 1.5 max 1h
-    info: average CPU utilization over the last 10 minutes
-      to: sysadmin
+ template: wmi_10min_cpu_usage
+       on: wmi.cpu_utilization_total
+    class: Windows
+component: CPU
+     type: Utilization
+       os: linux
+    hosts: *
+   lookup: average -10m unaligned match-names of dpc,user,privileged,interrupt
+    units: %
+    every: 1m
+     warn: $this > (($status >= $WARNING)  ? (75) : (85))
+     crit: $this > (($status == $CRITICAL) ? (85) : (95))
+    delay: down 15m multiplier 1.5 max 1h
+     info: average CPU utilization over the last 10 minutes
+       to: sysadmin
 
 
 ## Memory
 
-template: wmi_ram_in_use
-      on: wmi.memory_utilization
-      os: linux
-   hosts: *
-    calc: ($used) * 100 / ($used + $available)
-   units: %
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? (80) : (90))
-    crit: $this > (($status == $CRITICAL) ? (90) : (98))
-   delay: down 15m multiplier 1.5 max 1h
-    info: memory utilization
-      to: sysadmin
-
-template: wmi_swap_in_use
-      on: wmi.memory_swap_utilization
-      os: linux
-   hosts: *
-    calc: ($used) * 100 / ($used + $available)
-   units: %
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? (80) : (90))
-    crit: $this > (($status == $CRITICAL) ? (90) : (98))
-   delay: down 15m multiplier 1.5 max 1h
-    info: swap memory utilization
-      to: sysadmin
+ template: wmi_ram_in_use
+       on: wmi.memory_utilization
+    class: Windows
+component: Memory
+     type: Utilization
+       os: linux
+    hosts: *
+     calc: ($used) * 100 / ($used + $available)
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (90))
+     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+    delay: down 15m multiplier 1.5 max 1h
+     info: memory utilization
+       to: sysadmin
+
+ template: wmi_swap_in_use
+       on: wmi.memory_swap_utilization
+    class: Windows
+component: Memory
+     type: Utilization
+       os: linux
+    hosts: *
+     calc: ($used) * 100 / ($used + $available)
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (90))
+     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+    delay: down 15m multiplier 1.5 max 1h
+     info: swap memory utilization
+       to: sysadmin
 
 
 ## Network
 
-template: wmi_inbound_packets_discarded
-      on: wmi.net_discarded
-      os: linux
-   hosts: *
-families: *
-  lookup: sum -10m unaligned absolute match-names of inbound
-   units: packets
-   every: 1m
-    warn: $this >= 5
-   delay: down 1h multiplier 1.5 max 2h
-    info: number of inbound discarded packets for the network interface in the last 10 minutes
-      to: sysadmin
-
-template: wmi_outbound_packets_discarded
-      on: wmi.net_discarded
-      os: linux
-   hosts: *
-families: *
-  lookup: sum -10m unaligned absolute match-names of outbound
-   units: packets
-   every: 1m
-    warn: $this >= 5
-   delay: down 1h multiplier 1.5 max 2h
-    info: number of outbound discarded packets for the network interface in the last 10 minutes
-      to: sysadmin
-
-template: wmi_inbound_packets_errors
-      on: wmi.net_errors
-      os: linux
-   hosts: *
-families: *
-  lookup: sum -10m unaligned absolute match-names of inbound
-   units: packets
-   every: 1m
-    warn: $this >= 5
-   delay: down 1h multiplier 1.5 max 2h
-    info: number of inbound errors for the network interface in the last 10 minutes
-      to: sysadmin
-
-template: wmi_outbound_packets_errors
-      on: wmi.net_errors
-      os: linux
-   hosts: *
-families: *
-  lookup: sum -10m unaligned absolute match-names of outbound
-   units: packets
-   every: 1m
-    warn: $this >= 5
-   delay: down 1h multiplier 1.5 max 2h
-    info: number of outbound errors for the network interface in the last 10 minutes
-      to: sysadmin
+ template: wmi_inbound_packets_discarded
+       on: wmi.net_discarded
+    class: Windows
+component: Network
+     type: Errors
+       os: linux
+    hosts: *
+ families: *
+   lookup: sum -10m unaligned absolute match-names of inbound
+    units: packets
+    every: 1m
+     warn: $this >= 5
+    delay: down 1h multiplier 1.5 max 2h
+     info: number of inbound discarded packets for the network interface in the last 10 minutes
+       to: sysadmin
+
+ template: wmi_outbound_packets_discarded
+       on: wmi.net_discarded
+    class: Windows
+component: Network
+     type: Errors
+       os: linux
+    hosts: *
+ families: *
+   lookup: sum -10m unaligned absolute match-names of outbound
+    units: packets
+    every: 1m
+     warn: $this >= 5
+    delay: down 1h multiplier 1.5 max 2h
+     info: number of outbound discarded packets for the network interface in the last 10 minutes
+       to: sysadmin
+
+ template: wmi_inbound_packets_errors
+       on: wmi.net_errors
+    class: Windows
+component: Network
+     type: Errors
+       os: linux
+    hosts: *
+ families: *
+   lookup: sum -10m unaligned absolute match-names of inbound
+    units: packets
+    every: 1m
+     warn: $this >= 5
+    delay: down 1h multiplier 1.5 max 2h
+     info: number of inbound errors for the network interface in the last 10 minutes
+       to: sysadmin
+
+ template: wmi_outbound_packets_errors
+       on: wmi.net_errors
+    class: Windows
+component: Network
+     type: Errors
+       os: linux
+    hosts: *
+ families: *
+   lookup: sum -10m unaligned absolute match-names of outbound
+    units: packets
+    every: 1m
+     warn: $this >= 5
+    delay: down 1h multiplier 1.5 max 2h
+     info: number of outbound errors for the network interface in the last 10 minutes
+       to: sysadmin
 
 
 ## Disk
 
-template: wmi_disk_in_use
-      on: wmi.logical_disk_utilization
-      os: linux
-   hosts: *
-    calc: ($used) * 100 / ($used + $free)
-   units: %
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? (80) : (90))
-    crit: $this > (($status == $CRITICAL) ? (90) : (98))
-   delay: down 15m multiplier 1.5 max 1h
-    info: disk space utilization
-      to: sysadmin
+ template: wmi_disk_in_use
+       on: wmi.logical_disk_utilization
+    class: Windows
+component: Disk
+     type: Utilization
+       os: linux
+    hosts: *
+     calc: ($used) * 100 / ($used + $free)
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (90))
+     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+    delay: down 15m multiplier 1.5 max 1h
+     info: disk space utilization
+       to: sysadmin