Merging upstream version 1.32.0.

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

1 files changed, 18 insertions, 18 deletions

diff --git a/health/health.d/kubelet.conf b/health/health.d/kubelet.conf
index 4d3c45f97..c2778cc5e 100644
--- a/health/health.d/kubelet.conf
+++ b/health/health.d/kubelet.conf
@@ -6,9 +6,9 @@
 
  template: kubelet_node_config_error
        on: k8s_kubelet.kubelet_node_config_error
-    class: Kubernetes
+    class: Errors
+     type: Kubernetes
 component: Kubelet
-     type: Errors
      calc: $kubelet_node_config_error
     units: bool
     every: 10s
@@ -22,9 +22,9 @@ component: Kubelet
  template: kubelet_token_requests
    lookup: sum -10s of token_fail_count
        on: k8s_kubelet.kubelet_token_requests
-    class: Kubernetes
+    class: Errors
+     type: Kubernetes
 component: Kubelet
-     type: Errors
     units: failed requests
     every: 10s
      warn: $this > 0
@@ -37,9 +37,9 @@ component: Kubelet
  template: kubelet_operations_error
    lookup: sum -1m
        on: k8s_kubelet.kubelet_operations_errors
-    class: Kubernetes
+    class: Errors
+     type: Kubernetes
 component: Kubelet
-     type: Errors
     units: errors
     every: 10s
      warn: $this > (($status >= $WARNING)  ? (0) : (20))
@@ -64,9 +64,9 @@ component: Kubelet
 
  template: kubelet_1m_pleg_relist_latency_quantile_05
        on: k8s_kubelet.kubelet_pleg_relist_latency_microseconds
-    class: Kubernetes
+    class: Latency
+     type: Kubernetes
 component: Kubelet
-     type: Latency
    lookup: average -1m unaligned of kubelet_pleg_relist_latency_05
     units: microseconds
     every: 10s
@@ -74,9 +74,9 @@ component: Kubelet
 
  template: kubelet_10s_pleg_relist_latency_quantile_05
        on: k8s_kubelet.kubelet_pleg_relist_latency_microseconds
-    class: Kubernetes
+    class: Latency
+     type: Kubernetes
 component: Kubelet
-     type: Latency
    lookup: average -10s unaligned of kubelet_pleg_relist_latency_05
      calc: $this * 100 / (($kubelet_1m_pleg_relist_latency_quantile_05 < 1000)?(1000):($kubelet_1m_pleg_relist_latency_quantile_05))
     every: 10s
@@ -92,9 +92,9 @@ component: Kubelet
 
  template: kubelet_1m_pleg_relist_latency_quantile_09
        on: k8s_kubelet.kubelet_pleg_relist_latency_microseconds
-    class: Kubernetes
+    class: Latency
+     type: Kubernetes
 component: Kubelet
-     type: Latency
    lookup: average -1m unaligned of kubelet_pleg_relist_latency_09
     units: microseconds
     every: 10s
@@ -102,9 +102,9 @@ component: Kubelet
 
  template: kubelet_10s_pleg_relist_latency_quantile_09
        on: k8s_kubelet.kubelet_pleg_relist_latency_microseconds
-    class: Kubernetes
+    class: Latency
+     type: Kubernetes
 component: Kubelet
-     type: Latency
    lookup: average -10s unaligned of kubelet_pleg_relist_latency_09
      calc: $this * 100 / (($kubelet_1m_pleg_relist_latency_quantile_09 < 1000)?(1000):($kubelet_1m_pleg_relist_latency_quantile_09))
     every: 10s
@@ -120,9 +120,9 @@ component: Kubelet
 
  template: kubelet_1m_pleg_relist_latency_quantile_099
        on: k8s_kubelet.kubelet_pleg_relist_latency_microseconds
-    class: Kubernetes
+    class: Latency
+     type: Kubernetes
 component: Kubelet
-     type: Latency
    lookup: average -1m unaligned of kubelet_pleg_relist_latency_099
     units: microseconds
     every: 10s
@@ -130,9 +130,9 @@ component: Kubelet
 
  template: kubelet_10s_pleg_relist_latency_quantile_099
        on: k8s_kubelet.kubelet_pleg_relist_latency_microseconds
-    class: Kubernetes
+    class: Latency
+     type: Kubernetes
 component: Kubelet
-     type: Latency
    lookup: average -10s unaligned of kubelet_pleg_relist_latency_099
      calc: $this * 100 / (($kubelet_1m_pleg_relist_latency_quantile_099 < 1000)?(1000):($kubelet_1m_pleg_relist_latency_quantile_099))
     every: 10s