diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index d5fabd045f8bf8106f888be78838df51407c4318..4a773925f0a32eec13914c7ecdcda81b3e49e8a3 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" } }, - "version": "50b1dbe739d9e4a59fb936b1733f8e53c86de897" + "version": "004e648d186bc7be6f1f519da26f96bc2533f1b6" }, { "name": "ksonnet", @@ -48,7 +48,7 @@ "subdir": "grafana-builder" } }, - "version": "94aef231932810633416bfe596a41dbad2b1ebb9" + "version": "bce24b0b087f7dc09c9e9f066f3e554a851792e9" }, { "name": "grafana", @@ -78,7 +78,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "a3e242d80ae1a13ae57904fc12e91fe4c9ecf972" + "version": "c74998267c71ef4a0fa847ce16d620b7fe3580bf" } ] } diff --git a/manifests/prometheus-serviceMonitorApiserver.yaml b/manifests/prometheus-serviceMonitorApiserver.yaml index 0cffe5418bf65194c8cb7d2b2e71e87394ab5310..6d884a2b8ce03f32693258cdac5b24a5710fa635 100644 --- a/manifests/prometheus-serviceMonitorApiserver.yaml +++ b/manifests/prometheus-serviceMonitorApiserver.yaml @@ -9,6 +9,11 @@ spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token interval: 30s + metricRelabelings: + - action: drop + regex: etcd_(debugging|disk|request|server).* + sourceLabels: + - __name__ port: https scheme: https tlsConfig: diff --git a/manifests/prometheus-serviceMonitorKubeControllerManager.yaml b/manifests/prometheus-serviceMonitorKubeControllerManager.yaml index dfb2a25d7508d24d71d1a2f47769c1c1427d4bd7..153a90da112806239eef66354daf4616583433d5 100644 --- a/manifests/prometheus-serviceMonitorKubeControllerManager.yaml +++ b/manifests/prometheus-serviceMonitorKubeControllerManager.yaml @@ -8,6 +8,11 @@ metadata: spec: endpoints: - interval: 30s + metricRelabelings: + - action: drop + regex: etcd_(debugging|disk|request|server).* + sourceLabels: + - __name__ port: http-metrics jobLabel: k8s-app namespaceSelector: