Merging upstream version 1.43.0.

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

1 files changed, 142 insertions, 52 deletions

diff --git a/health/health.d/vcsa.conf b/health/health.d/vcsa.conf
index bff34cd39..3e20bfd1e 100644
--- a/health/health.d/vcsa.conf
+++ b/health/health.d/vcsa.conf
@@ -6,19 +6,32 @@
 #  - 3: one or more components might be in an unusable status and the appliance might become unresponsive soon.
 #  - 4: no health data is available.
 
- template: vcsa_system_health
-       on: vcsa.system_health
+ template: vcsa_system_health_warn
+       on: vcsa.system_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of system
+     calc: $orange
     units: status
     every: 10s
-     warn: ($this == 1) || ($this == 2)
-     crit: $this == 3
+     warn: $this == 1
     delay: down 1m multiplier 1.5 max 1h
-     info: overall system health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
+  summary: VCSA system status
+     info: VCSA overall system status is orange. One or more components are degraded.
+       to: sysadmin
+
+ template: vcsa_system_health_crit
+       on: vcsa.system_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $red
+    units: status
+    every: 10s
+     crit: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA system status
+     info: VCSA overall system status is red. One or more components are unavailable or will stop functioning soon.
        to: sysadmin
 
 # Components health:
@@ -28,96 +41,173 @@ component: VMware vCenter
 #  - 3: unavailable, or will stop functioning soon.
 #  - 4: no health data is available.
 
- template: vcsa_swap_health
-       on: vcsa.components_health
+ template: vcsa_applmgmt_health_warn
+       on: vcsa.applmgmt_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of swap
+     calc: $orange
     units: status
     every: 10s
      warn: $this == 1
-     crit: ($this == 2) || ($this == 3)
     delay: down 1m multiplier 1.5 max 1h
-     info: swap health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
-       to: sysadmin
+  summary: VCSA ApplMgmt service status
+     info: VCSA ApplMgmt component status is orange. It is degraded, and may have serious problems.
+       to: silent
 
- template: vcsa_storage_health
-       on: vcsa.components_health
+ template: vcsa_applmgmt_health_crit
+       on: vcsa.applmgmt_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of storage
+     calc: $red
     units: status
     every: 10s
      warn: $this == 1
-     crit: ($this == 2) || ($this == 3)
     delay: down 1m multiplier 1.5 max 1h
-     info: storage health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
+  summary: VCSA ApplMgmt service status
+     info: VCSA ApplMgmt component status is red. It is unavailable, or will stop functioning soon.
        to: sysadmin
+ 
+ template: vcsa_load_health_warn
+       on: vcsa.load_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $orange
+    units: status
+    every: 10s
+     warn: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA Load status
+     info: VCSA Load component status is orange. It is degraded, and may have serious problems.
+       to: silent
 
- template: vcsa_mem_health
-       on: vcsa.components_health
+ template: vcsa_load_health_crit
+       on: vcsa.load_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of mem
+     calc: $red
     units: status
     every: 10s
      warn: $this == 1
-     crit: ($this == 2) || ($this == 3)
     delay: down 1m multiplier 1.5 max 1h
-     info: memory health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
+  summary: VCSA Load status
+     info: VCSA Load component status is red. It is unavailable, or will stop functioning soon.
        to: sysadmin
 
- template: vcsa_load_health
-       on: vcsa.components_health
-    class: Utilization
+ template: vcsa_mem_health_warn
+       on: vcsa.mem_health_status
+    class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of load
+     calc: $orange
     units: status
     every: 10s
      warn: $this == 1
-     crit: ($this == 2) || ($this == 3)
     delay: down 1m multiplier 1.5 max 1h
-     info: load health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
+  summary: VCSA Memory status
+     info: VCSA Memory component status is orange. It is degraded, and may have serious problems.
+       to: silent
+
+ template: vcsa_mem_health_crit
+       on: vcsa.mem_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $red
+    units: status
+    every: 10s
+     warn: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA Memory status
+     info: VCSA Memory component status is red. It is unavailable, or will stop functioning soon.
        to: sysadmin
 
- template: vcsa_database_storage_health
-       on: vcsa.components_health
+ template: vcsa_swap_health_warn
+       on: vcsa.swap_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $orange
+    units: status
+    every: 10s
+     warn: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA Swap status
+     info: VCSA Swap component status is orange. It is degraded, and may have serious problems.
+       to: silent
+
+ template: vcsa_swap_health_crit
+       on: vcsa.swap_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of database_storage
+     calc: $red
     units: status
     every: 10s
      warn: $this == 1
-     crit: ($this == 2) || ($this == 3)
     delay: down 1m multiplier 1.5 max 1h
-     info: database storage health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
+  summary: VCSA Swap status
+     info: VCSA Swap component status is red. It is unavailable, or will stop functioning soon.
        to: sysadmin
 
- template: vcsa_applmgmt_health
-       on: vcsa.components_health
+ template: vcsa_database_storage_health_warn
+       on: vcsa.database_storage_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of applmgmt
+     calc: $orange
     units: status
     every: 10s
      warn: $this == 1
-     crit: ($this == 2) || ($this == 3)
     delay: down 1m multiplier 1.5 max 1h
-     info: applmgmt health status \
-           (-1: unknown, 0: green, 1: yellow, 2: orange, 3: red, 4: grey)
+  summary: VCSA Database status
+     info: VCSA Database Storage component status is orange. It is degraded, and may have serious problems.
+       to: silent
+
+ template: vcsa_database_storage_health_crit
+       on: vcsa.database_storage_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $red
+    units: status
+    every: 10s
+     warn: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA Database status
+     info: VCSA Database Storage component status is red. It is unavailable, or will stop functioning soon.
        to: sysadmin
 
+ template: vcsa_storage_health_warn
+       on: vcsa.storage_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $orange
+    units: status
+    every: 10s
+     warn: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA Storage status
+     info: VCSA Storage component status is orange. It is degraded, and may have serious problems.
+       to: silent
+
+ template: vcsa_storage_health_crit
+       on: vcsa.storage_health_status
+    class: Errors
+     type: Virtual Machine
+component: VMware vCenter
+     calc: $red
+    units: status
+    every: 10s
+     warn: $this == 1
+    delay: down 1m multiplier 1.5 max 1h
+  summary: VCSA Storage status
+     info: VCSA Storage component status is red. It is unavailable, or will stop functioning soon.
+       to: sysadmin
 
 # Software updates health:
 #  - 0: no updates available.
@@ -125,16 +215,16 @@ component: VMware vCenter
 #  - 3: security updates are available.
 #  - 4: an error retrieving information on software updates.
 
- template: vcsa_software_updates_health
-       on: vcsa.software_updates_health
+ template: vcsa_software_packages_health_warn
+       on: vcsa.software_packages_health_status
     class: Errors
      type: Virtual Machine
 component: VMware vCenter
-   lookup: max -10s unaligned of software_packages
+     calc: $orange
     units: status
     every: 10s
-     warn: ($this == 3) || ($this == 4)
+     warn: $this == 1
     delay: down 1m multiplier 1.5 max 1h
-     info: software updates availability status \
-           (-1: unknown, 0: green, 2: orange, 3: red, 4: grey)
-       to: sysadmin
+  summary: VCSA software status
+     info: VCSA software packages security updates are available.
+       to: silent