From 866bf2f655ede9aa1bb6f4145db5862035cf49ad Mon Sep 17 00:00:00 2001
From: Emil <emil.vanneback@elastisys.com>
Date: Fri, 24 Apr 2020 12:30:07 +0200
Subject: [PATCH] fix coreDNS chart to have a dynamic datasource #22024
 (#22103)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Emil Vannebäck <emil.vanneback@elastisys.com>
---
 stable/prometheus-operator/Chart.yaml         |  2 +-
 .../grafana/dashboards-1.14/k8s-coredns.yaml  | 71 +++++++++++--------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml
index 9e63feb35e..f4467e626f 100644
--- a/stable/prometheus-operator/Chart.yaml
+++ b/stable/prometheus-operator/Chart.yaml
@@ -12,7 +12,7 @@ sources:
   - https://github.com/coreos/kube-prometheus
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 8.13.0
+version: 8.13.1
 appVersion: 0.38.1
 tillerVersion: ">=2.12.0"
 home: https://github.com/coreos/prometheus-operator
diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml
index 5e48858aa1..ec4e91b591 100644
--- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml
+++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml
@@ -15,33 +15,32 @@ metadata:
 data:
   k8s-coredns.json: |-
     {
+        "__inputs": [
+
+        ],
+        "__requires": [
+
+        ],
         "annotations": {
             "list": [
-                {
-                    "builtIn": 1,
-                    "datasource": "-- Grafana --",
-                    "enable": true,
-                    "hide": true,
-                    "iconColor": "rgba(0, 211, 255, 1)",
-                    "name": "Annotations & Alerts",
-                    "type": "dashboard"
-                }
+
             ]
         },
-        "description": "A dashboard for the CoreDNS DNS server.",
-        "editable": true,
-        "gnetId": 5926,
+        "editable": false,
+        "gnetId": null,
         "graphTooltip": 0,
-        "id": 9,
-        "iteration": 1539947521873,
-        "links": [],
+        "hideControls": false,
+        "id": null,
+        "links": [
+
+        ],
         "panels": [
             {
                 "aliasColors": {},
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -140,7 +139,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -234,7 +233,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -331,7 +330,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -428,7 +427,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -540,7 +539,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -652,7 +651,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -737,7 +736,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -839,7 +838,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -956,7 +955,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -1076,7 +1075,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -1161,7 +1160,7 @@ data:
                 "bars": false,
                 "dashLength": 10,
                 "dashes": false,
-                "datasource": "Prometheus",
+                "datasource": "$datasource",
                 "editable": true,
                 "error": false,
                 "fill": 1,
@@ -1259,6 +1258,22 @@ data:
         "tags": [],
         "templating": {
             "list": [
+                {
+                    "current": {
+                        "text": "default",
+                        "value": "default"
+                    },
+                    "hide": 0,
+                    "label": null,
+                    "name": "datasource",
+                    "options": [
+
+                    ],
+                    "query": "prometheus",
+                    "refresh": 1,
+                    "regex": "",
+                    "type": "datasource"
+                },
                 {
                     "allValue": ".*",
                     "current": {
@@ -1267,7 +1282,7 @@ data:
                         "text": "172.16.1.8:9153",
                         "value": "172.16.1.8:9153"
                     },
-                    "datasource": "Prometheus",
+                    "datasource": "$datasource",
                     "hide": 0,
                     "includeAll": true,
                     "label": "Instance",