jsonnet: drop deprecated etcd metric

dgrisonnet · dgrisonnet · commit b5ec93208bcb · 2021-08-18T17:27:50.000+02:00
Signed-off-by: Damien Grisonnet &lt;dgrisonn@redhat.com&gt;
diff --git a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
@@ -32,7 +32,7 @@
   // Drop all etcd metrics which are deprecated in kubernetes.
   {
     sourceLabels: ['__name__'],
-    regex: 'etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)',
+    regex: 'etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)',
     action: 'drop',
   },
   // Drop all transformation metrics which are deprecated in kubernetes.
diff --git a/manifests/kubernetes-serviceMonitorApiserver.yaml b/manifests/kubernetes-serviceMonitorApiserver.yaml
@@ -31,7 +31,7 @@ spec:
       sourceLabels:
       - __name__
     - action: drop
-      regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
+      regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
       sourceLabels:
       - __name__
     - action: drop
diff --git a/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml b/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml
@@ -31,7 +31,7 @@ spec:
       sourceLabels:
       - __name__
     - action: drop
-      regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
+      regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
       sourceLabels:
       - __name__
     - action: drop
diff --git a/manifests/kubernetes-serviceMonitorKubelet.yaml b/manifests/kubernetes-serviceMonitorKubelet.yaml
@@ -32,7 +32,7 @@ spec:
       sourceLabels:
       - __name__
     - action: drop
-      regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
+      regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
       sourceLabels:
       - __name__
     - action: drop

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`// Drop all etcd metrics which are deprecated in kubernetes.`
`33`	`33`	`{`
`34`	`34`	`sourceLabels: ['__name__'],`
`35`		`- regex: 'etcd_(helper_cache_hit_count\|helper_cache_miss_count\|helper_cache_entry_count\|request_cache_get_latencies_summary\|request_cache_add_latencies_summary\|request_latencies_summary)',`
	`35`	`+ regex: 'etcd_(helper_cache_hit_count\|helper_cache_miss_count\|helper_cache_entry_count\|object_counts\|request_cache_get_latencies_summary\|request_cache_add_latencies_summary\|request_latencies_summary)',`
`36`	`36`	`action: 'drop',`
`37`	`37`	`},`
`38`	`38`	`// Drop all transformation metrics which are deprecated in kubernetes.`