Merging upstream version 1.32.0.

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

1 files changed, 16 insertions, 32 deletions

diff --git a/health/health.d/vcsa.conf b/health/health.d/vcsa.conf
index 8538e488c..a9cc7ceef 100644
--- a/health/health.d/vcsa.conf
+++ b/health/health.d/vcsa.conf
@@ -1,20 +1,4 @@
 
-# make sure vcsa is running and responding
-
- template: vcsa_last_collected_secs
-       on: vcsa.system_health
-    class: Virtual Machine
-component: VMware vCenter
-     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
-
 # Overall system health:
 #  - 0: all components are healthy.
 #  - 1: one or more components might become overloaded soon.
@@ -24,9 +8,9 @@ component: VMware vCenter
 
  template: vcsa_system_health
        on: vcsa.system_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of system
     units: status
     every: 10s
@@ -46,9 +30,9 @@ component: VMware vCenter
 
  template: vcsa_swap_health
        on: vcsa.components_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of swap
     units: status
     every: 10s
@@ -61,9 +45,9 @@ component: VMware vCenter
 
  template: vcsa_storage_health
        on: vcsa.components_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of storage
     units: status
     every: 10s
@@ -76,9 +60,9 @@ component: VMware vCenter
 
  template: vcsa_mem_health
        on: vcsa.components_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of mem
     units: status
     every: 10s
@@ -91,9 +75,9 @@ component: VMware vCenter
 
  template: vcsa_load_health
        on: vcsa.components_health
-    class: Virtual Machine
+    class: Utilization
+     type: Virtual Machine
 component: VMware vCenter
-     type: Utilization
    lookup: max -10s unaligned of load
     units: status
     every: 10s
@@ -106,9 +90,9 @@ component: VMware vCenter
 
  template: vcsa_database_storage_health
        on: vcsa.components_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of database_storage
     units: status
     every: 10s
@@ -121,9 +105,9 @@ component: VMware vCenter
 
  template: vcsa_applmgmt_health
        on: vcsa.components_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of applmgmt
     units: status
     every: 10s
@@ -143,9 +127,9 @@ component: VMware vCenter
 
  template: vcsa_software_updates_health
        on: vcsa.software_updates_health
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: VMware vCenter
-     type: Errors
    lookup: max -10s unaligned of software_packages
     units: status
     every: 10s