From: Paul Cuzner <pcuzner@redhat.com>
Date: Thu, 4 Oct 2018 23:41:07 +0000 (+1300)
Subject: MGR/dashboard: make grafana datasource selectable
X-Git-Tag: v14.1.0~1150^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f97fee3a836355099c0eee2e4e233094fd1ef0e5;p=ceph.git

MGR/dashboard: make grafana datasource selectable

Grafana dashboard updated to use a templating
variable for the datasource

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
---

diff --git a/monitoring/grafana/dashboards/hosts-overview.json b/monitoring/grafana/dashboards/hosts-overview.json
index 50f7e4b06003..718aaa3ac644 100644
--- a/monitoring/grafana/dashboards/hosts-overview.json
+++ b/monitoring/grafana/dashboards/hosts-overview.json
@@ -48,7 +48,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": null,
+      "datasource": "$datasource",
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -129,7 +129,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": null,
+      "datasource": "$datasource",
       "decimals": 0,
       "description": "Average CPU busy across all hosts (OSD, RGW, MON etc) within the cluster",
       "format": "percentunit",
@@ -212,7 +212,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": null,
+      "datasource": "$datasource",
       "decimals": 0,
       "description": "Average Memory Usage across all hosts in the cluster (excludes buffer/cache usage)",
       "format": "percentunit",
@@ -295,7 +295,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "IOPS Load at the device as reported by the OS on all OSD hosts",
       "format": "none",
       "gauge": {
@@ -377,7 +377,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "Average Disk utilization for all OSD data devices (i.e. excludes journal/WAL)",
       "format": "percent",
       "gauge": {
@@ -459,7 +459,7 @@
         "rgba(237, 129, 40, 0.89)",
         "#d44a3a"
       ],
-      "datasource": null,
+      "datasource": "$datasource",
       "decimals": 0,
       "description": "Total send/receive network load across all hosts in the ceph cluster",
       "format": "bytes",
@@ -538,7 +538,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "Show the top 10 busiest hosts by cpu",
       "fill": 1,
       "gridPos": {
@@ -620,7 +620,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "$datasource",
       "description": "Top 10 hosts by network load",
       "fill": 1,
       "gridPos": {
@@ -704,10 +704,25 @@
   "tags": [],
   "templating": {
     "list": [
+      {
+        "current": {
+          "tags": [],
+          "text": "default",
+          "value": "default"
+        },
+        "hide": 0,
+        "label": "Data Source",
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
       {
         "allValue": "",
         "current": {},
-        "datasource": null,
+        "datasource": "$datasource",
         "hide": 2,
         "includeAll": true,
         "label": null,
@@ -727,7 +742,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "$datasource",
         "hide": 2,
         "includeAll": true,
         "label": null,
@@ -747,7 +762,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "$datasource",
         "hide": 2,
         "includeAll": true,
         "label": null,
@@ -767,7 +782,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "$datasource",
         "hide": 2,
         "includeAll": true,
         "label": null,