From 48eefc51d9f50803947c88bc82fe8b818289db80 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 26 Sep 2019 14:14:08 +0200 Subject: [PATCH 1/2] jsonnet/kube-prometheus/kube-state-metrics: Do not drop job label Currently a lot of alerts relly on the job='kube-state-metrics' label. --- .../kube-state-metrics/kube-state-metrics.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index 00f6d67f..aeca71bc 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -279,7 +279,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', relabelings: [ { - regex: '(pod|service|job|endpoint|namespace)', + regex: '(pod|service|endpoint|namespace)', action: 'labeldrop', }, ], From 5839b8c1cb79837430a3ba61b4ea08a56b6a180d Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 26 Sep 2019 14:22:13 +0200 Subject: [PATCH 2/2] manifests/kube-state-metrics-serviceMonitor.yaml: Regenerate --- manifests/kube-state-metrics-serviceMonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml index b14ca7d5..4df66c09 100644 --- a/manifests/kube-state-metrics-serviceMonitor.yaml +++ b/manifests/kube-state-metrics-serviceMonitor.yaml @@ -13,7 +13,7 @@ spec: port: https-main relabelings: - action: labeldrop - regex: (pod|service|job|endpoint|namespace) + regex: (pod|service|endpoint|namespace) scheme: https scrapeTimeout: 30s tlsConfig: