Merge pull request #1159 from prashbnair/bz1955454

Bug 1955454: [release-4.6] removing crio metric
openshift · May 22, 2021 · 5db69dc · 5db69dc
2 parents 1fea627 + fd972f9
commit 5db69dc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/assets/prometheus-k8s/service-monitor-kubelet.yaml b/assets/prometheus-k8s/service-monitor-kubelet.yaml
@@ -84,6 +84,11 @@ spec:
       caFile: /etc/prometheus/configmaps/kubelet-serving-ca-bundle/ca-bundle.crt
       insecureSkipVerify: false
   - interval: 30s
+    metricRelabelings:
+    - action: drop
+      regex: container_runtime_crio_image_layer_reuse|container_runtime_crio_image_pulls_.+
+      sourceLabels:
+      - __name__
     port: https-metrics
     relabelings:
     - action: replace

diff --git a/jsonnet/prometheus.jsonnet b/jsonnet/prometheus.jsonnet
@@ -211,6 +211,13 @@ local sccRole =
                   replacement: 'crio',
                 },
               ],
+              metricRelabelings: [
+                {
+                  sourceLabels: ['__name__'],
+                  regex: 'container_runtime_crio_image_layer_reuse|container_runtime_crio_image_pulls_.+',
+                  action: 'drop',
+                },
+              ],
             }],
         },
       },

diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go