From 974d3a70bef3b440187de9cceb35681882dbcd66 Mon Sep 17 00:00:00 2001
From: Lili Cosic <cosiclili@gmail.com>
Date: Mon, 23 Sep 2019 17:05:24 +0200
Subject: [PATCH 1/2] jsonnet/kube-prometheus/kube-state-metrics: Drop ksm own
 labels

These labels are confusing and misleading, as they describe
kube-state-metrics itself not the target itself.
---
 .../kube-state-metrics/kube-state-metrics.libsonnet         | 6 ++++++
 1 file changed, 6 insertions(+)

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 7814e8ec..c7812ac6 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -310,6 +310,12 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
               scrapeTimeout: $._config.kubeStateMetrics.scrapeTimeout,
               honorLabels: true,
               bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
+              relabelings: [
+                {
+                  regex: '(pod|service|job|endpoint|namespace)',
+                  action: 'labeldrop',
+                },
+              ],
               tlsConfig: {
                 insecureSkipVerify: true,
               },

From cb227144e283829df8a141288de50392f248db5f Mon Sep 17 00:00:00 2001
From: Lili Cosic <cosiclili@gmail.com>
Date: Mon, 23 Sep 2019 18:37:29 +0200
Subject: [PATCH 2/2] manifests/kube-state-metrics-serviceMonitor.yaml:
 Regenerate manifest

---
 manifests/kube-state-metrics-serviceMonitor.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index 2100449d..b14ca7d5 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-serviceMonitor.yaml
@@ -11,6 +11,9 @@ spec:
     honorLabels: true
     interval: 30s
     port: https-main
+    relabelings:
+    - action: labeldrop
+      regex: (pod|service|job|endpoint|namespace)
     scheme: https
     scrapeTimeout: 30s
     tlsConfig: