From 16bc5d63b3b6a6cf1935068f45c05d6e9fadf3d5 Mon Sep 17 00:00:00 2001
From: Philip Gough <philip.p.gough@gmail.com>
Date: Thu, 16 Dec 2021 16:54:18 +0000
Subject: [PATCH] jsonnet: Drop deprecated coredns_cache_misses_total

Deprecated via https://github.com/coredns/coredns/pull/4781
---
 README.md                                     | 14 ++++++-------
 .../components/k8s-control-plane.libsonnet    | 21 ++++++++++++++-----
 ...tesControlPlane-serviceMonitorCoreDNS.yaml |  5 +++++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index e83f7e1d..9acf1c0a 100644
--- a/README.md
+++ b/README.md
@@ -91,13 +91,13 @@ $ minikube addons disable metrics-server
 
 The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
 
-| kube-prometheus stack                                                                      | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 |
-|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
-| [`release-0.6`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.6)   | ✗               | ✔               | ✗               | ✗               | ✗               | ✗               |
-| [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7)   | ✗               | ✔               | ✔               | ✗               | ✗               | ✗               |
-| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8)   | ✗               | ✗               | ✔               | ✔               | ✗               | ✗               |
-| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9)   | ✗               | ✗               | ✗               | ✔               | ✔               | ✗               |
-| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main)                 | ✗               | ✗               | ✗               | ✗               | ✔               | ✔               |
+| kube-prometheus stack                                                                    | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 |
+|------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
+| [`release-0.6`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.6) | ✗               | ✔               | ✗               | ✗               | ✗               | ✗               |
+| [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7) | ✗               | ✔               | ✔               | ✗               | ✗               | ✗               |
+| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8) | ✗               | ✗               | ✔               | ✔               | ✗               | ✗               |
+| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9) | ✗               | ✗               | ✗               | ✔               | ✔               | ✗               |
+| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main)               | ✗               | ✗               | ✗               | ✗               | ✔               | ✔               |
 
 ## Quickstart
 
diff --git a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
index 84a1ffa4..d2aab5a5 100644
--- a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
+++ b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
@@ -310,11 +310,22 @@ function(params) {
       namespaceSelector: {
         matchNames: ['kube-system'],
       },
-      endpoints: [{
-        port: 'metrics',
-        interval: '15s',
-        bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-      }],
+      endpoints: [
+        {
+          port: 'metrics',
+          interval: '15s',
+          bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
+          metricRelabelings: [
+            // Drop deprecated metrics
+            // TODO (pgough) - consolidate how we drop metrics across the project
+            {
+              sourceLabels: ['__name__'],
+              regex: 'coredns_cache_misses_total',
+              action: 'drop',
+            },
+          ],
+        },
+      ],
     },
   },
 
diff --git a/manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml b/manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml
index e79c5b7d..f3313d6d 100644
--- a/manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml
+++ b/manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml
@@ -10,6 +10,11 @@ spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     interval: 15s
+    metricRelabelings:
+    - action: drop
+      regex: coredns_cache_misses_total
+      sourceLabels:
+      - __name__
     port: metrics
   jobLabel: app.kubernetes.io/name
   namespaceSelector:
-- 
GitLab