From cd4377fab21e0f500bef7f06543fa848a039c1e0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 20 Jul 2023 06:50:01 +0200
Subject: Merging upstream version 1.41.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 health/health.d/windows.conf | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

(limited to 'health/health.d/windows.conf')

diff --git a/health/health.d/windows.conf b/health/health.d/windows.conf
index d4bc7639c..28a886386 100644
--- a/health/health.d/windows.conf
+++ b/health/health.d/windows.conf
@@ -6,7 +6,7 @@
     class: Utilization
      type: Windows
 component: CPU
-       os: linux
+       os: *
     hosts: *
    lookup: average -10m unaligned match-names of dpc,user,privileged,interrupt
     units: %
@@ -25,7 +25,7 @@ component: CPU
     class: Utilization
      type: Windows
 component: Memory
-       os: linux
+       os: *
     hosts: *
      calc: ($used) * 100 / ($used + $available)
     units: %
@@ -36,31 +36,15 @@ component: Memory
      info: memory utilization
        to: sysadmin
 
- template: windows_swap_in_use
-       on: windows.memory_swap_utilization
-    class: Utilization
-     type: Windows
-component: Memory
-       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: windows_inbound_packets_discarded
-       on: windows.net_discarded
+       on: windows.net_nic_discarded
     class: Errors
      type: Windows
 component: Network
-       os: linux
+       os: *
     hosts: *
    lookup: sum -10m unaligned absolute match-names of inbound
     units: packets
@@ -71,11 +55,11 @@ component: Network
        to: sysadmin
 
  template: windows_outbound_packets_discarded
-       on: windows.net_discarded
+       on: windows.net_nic_discarded
     class: Errors
      type: Windows
 component: Network
-       os: linux
+       os: *
     hosts: *
    lookup: sum -10m unaligned absolute match-names of outbound
     units: packets
@@ -86,11 +70,11 @@ component: Network
        to: sysadmin
 
  template: windows_inbound_packets_errors
-       on: windows.net_errors
+       on: windows.net_nic_errors
     class: Errors
      type: Windows
 component: Network
-       os: linux
+       os: *
     hosts: *
    lookup: sum -10m unaligned absolute match-names of inbound
     units: packets
@@ -101,11 +85,11 @@ component: Network
        to: sysadmin
 
  template: windows_outbound_packets_errors
-       on: windows.net_errors
+       on: windows.net_nic_errors
     class: Errors
      type: Windows
 component: Network
-       os: linux
+       os: *
     hosts: *
    lookup: sum -10m unaligned absolute match-names of outbound
     units: packets
@@ -119,11 +103,11 @@ component: Network
 ## Disk
 
  template: windows_disk_in_use
-       on: windows.logical_disk_utilization
+       on: windows.logical_disk_space_usage
     class: Utilization
      type: Windows
 component: Disk
-       os: linux
+       os: *
     hosts: *
      calc: ($used) * 100 / ($used + $free)
     units: %
-- 
cgit v1.2.3