Merging upstream version 1.32.0.

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

1 files changed, 22 insertions, 22 deletions

diff --git a/health/health.d/vsphere.conf b/health/health.d/vsphere.conf
index aee7c5cd4..d8fc899b9 100644
--- a/health/health.d/vsphere.conf
+++ b/health/health.d/vsphere.conf
@@ -6,9 +6,9 @@
 
  template: vsphere_vm_mem_usage
        on: vsphere.vm_mem_usage_percentage
-    class: Virtual Machine
+    class: Utilization
+     type: Virtual Machine
 component: Memory
-     type: Utilization
     hosts: *
      calc: $used
     units: %
@@ -23,9 +23,9 @@ component: Memory
 
  template: vsphere_host_mem_usage
        on: vsphere.host_mem_usage_percentage
-    class: Virtual Machine
+    class: Utilization
+     type: Virtual Machine
 component: Memory
-     type: Utilization
     hosts: *
      calc: $used
     units: %
@@ -39,9 +39,9 @@ component: Memory
 
  template: vsphere_inbound_packets_errors
        on: vsphere.net_errors_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of rx
@@ -51,9 +51,9 @@ component: Network
 
  template: vsphere_outbound_packets_errors
        on: vsphere.net_errors_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of tx
@@ -65,9 +65,9 @@ component: Network
 
  template: vsphere_inbound_packets_errors_ratio
        on: vsphere.net_packets_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of rx
@@ -81,9 +81,9 @@ component: Network
 
  template: vsphere_outbound_packets_errors_ratio
        on: vsphere.net_packets_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of tx
@@ -100,9 +100,9 @@ component: Network
 
  template: vsphere_cpu_usage
        on: vsphere.cpu_usage_total
-    class: Virtual Machine
+    class: Utilization
+     type: Virtual Machine
 component: CPU
-     type: Utilization
     hosts: *
    lookup: average -10m unaligned match-names of used
     units: %
@@ -117,9 +117,9 @@ component: CPU
 
  template: vsphere_inbound_packets_dropped
        on: vsphere.net_drops_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of rx
@@ -129,9 +129,9 @@ component: Network
 
  template: vsphere_outbound_packets_dropped
        on: vsphere.net_drops_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of tx
@@ -143,9 +143,9 @@ component: Network
 
  template: vsphere_inbound_packets_dropped_ratio
        on: vsphere.net_packets_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of rx
@@ -159,9 +159,9 @@ component: Network
 
  template: vsphere_outbound_packets_dropped_ratio
        on: vsphere.net_packets_total
-    class: Virtual Machine
+    class: Errors
+     type: Virtual Machine
 component: Network
-     type: Errors
     hosts: *
  families: *
    lookup: sum -10m unaligned absolute match-names of tx