From 86dd76323b9cb5d5b84a99a5ad5afe618720575e Mon Sep 17 00:00:00 2001
From: Grace Do <xgrace@gmail.com>
Date: Fri, 22 Nov 2019 12:04:28 -0800
Subject: [PATCH] kommander: Add kommander prom datasource to central Grafana
 and point Query dash to it (#279)

---
 stable/kommander/Chart.yaml                               | 2 +-
 .../grafana/dashboards/thanos-query-dashboard.yaml        | 8 ++++----
 stable/kommander/values.yaml                              | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/stable/kommander/Chart.yaml b/stable/kommander/Chart.yaml
index bd493403e..decc6a47f 100644
--- a/stable/kommander/Chart.yaml
+++ b/stable/kommander/Chart.yaml
@@ -3,7 +3,7 @@ name: kommander
 home: https://github.com/mesosphere/kommander
 appVersion: "1.150.12"
 description: Kommander
-version: 0.2.18
+version: 0.2.19
 maintainers:
   - name: hectorj2f
   - name: alejandroEsc
diff --git a/stable/kommander/templates/grafana/dashboards/thanos-query-dashboard.yaml b/stable/kommander/templates/grafana/dashboards/thanos-query-dashboard.yaml
index fe48eac9d..c7fc0118f 100644
--- a/stable/kommander/templates/grafana/dashboards/thanos-query-dashboard.yaml
+++ b/stable/kommander/templates/grafana/dashboards/thanos-query-dashboard.yaml
@@ -55,7 +55,7 @@ data:
       "gnetId": null,
       "graphTooltip": 1,
       "id": null,
-      "iteration": 1571948617065,
+      "iteration": 1574381793185,
       "links": [],
       "panels": [
         {
@@ -943,8 +943,8 @@ data:
         "list": [
           {
             "current": {
-              "text": "Prometheus",
-              "value": "Prometheus"
+              "text": "KommanderPrometheus",
+              "value": "KommanderPrometheus"
             },
             "hide": 0,
             "includeAll": false,
@@ -954,7 +954,7 @@ data:
             "options": [],
             "query": "prometheus",
             "refresh": 1,
-            "regex": "",
+            "regex": "KommanderPrometheus",
             "skipUrlSync": false,
             "type": "datasource"
           },
diff --git a/stable/kommander/values.yaml b/stable/kommander/values.yaml
index 59772345d..044a0ed73 100644
--- a/stable/kommander/values.yaml
+++ b/stable/kommander/values.yaml
@@ -178,9 +178,14 @@ grafana:
       datasources:
       - name: ThanosQuery
         type: prometheus
-        url: http://kommander-kubeaddons-thanos-query-http:10902/
+        url: http://kommander-kubeaddons-thanos-query-http.kommander:10902/
         access: proxy
         isDefault: true
+      - name: KommanderPrometheus
+        type: prometheus
+        url: http://prometheus-kubeaddons-prom-prometheus.kubeaddons:9090/
+        access: proxy
+        isDefault: false
 
   ## Sidecars that collect the configmaps with specified label and stores the included files them into the respective folders
   ## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards