From 58e2c131c2f703e048788b92e6844128c2e94b93 Mon Sep 17 00:00:00 2001
From: Philip Gough <philip.p.gough@gmail.com>
Date: Mon, 27 Sep 2021 17:13:00 +0100
Subject: [PATCH] Keep 'container_fs_.*' metrics from cAdvisor
---
jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet | 3 +--
manifests/kubernetes-serviceMonitorKubelet.yaml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
index 9a55c850..a0712699 100644
--- a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
+++ b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
@@ -140,8 +140,7 @@ function(params) {
sourceLabels: ['__name__', 'container'],
action: 'drop',
regex: '(' + std.join('|',
- [ // metrics are available at slice level
- 'container_fs_.*',
+ [
'container_blkio_device_usage_total',
]) + ');.+',
},
diff --git a/manifests/kubernetes-serviceMonitorKubelet.yaml b/manifests/kubernetes-serviceMonitorKubelet.yaml
index cded85cf..a1295a3b 100644
--- a/manifests/kubernetes-serviceMonitorKubelet.yaml
+++ b/manifests/kubernetes-serviceMonitorKubelet.yaml
@@ -67,7 +67,7 @@ spec:
- pod
- namespace
- action: drop
- regex: (container_fs_.*|container_blkio_device_usage_total);.+
+ regex: (container_blkio_device_usage_total);.+
sourceLabels:
- __name__
- container
--
GitLab