Fix templating definitions

To prevent template init failures the datasource
has been added to the template definitions

diff --git a/dashboards/mgr-prometheus/ceph-backend-storage.json b/dashboards/mgr-prometheus/ceph-backend-storage.json
index 8620a5f0177caf446a3453de0e83ea30017d32d9..1814a7a1046773ca5b360b174fe33586d2875e04 100644 (file)
--- a/dashboards/mgr-prometheus/ceph-backend-storage.json
+++ b/dashboards/mgr-prometheus/ceph-backend-storage.json
@@ -1,10 +1,20 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "datasource",
@@ -42,7 +52,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1525149605368,
+  "iteration": 1527118602232,
   "links": [
     {
       "asDropdown": true,
@@ -1192,7 +1202,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 0,
         "includeAll": true,
         "label": "OSD Hostname",
@@ -1264,5 +1274,5 @@
   },
   "timezone": "browser",
   "title": "Ceph Backend Storage",
-  "version": 14
-}
+  "version": 22
+}
\ No newline at end of file

diff --git a/dashboards/mgr-prometheus/ceph-osd-information.json b/dashboards/mgr-prometheus/ceph-osd-information.json
index b51613fe5c083116b334d5b37396cd0f10256e70..daf75bd9d43248870041b17973bf5669aad36c4e 100644 (file)
--- a/dashboards/mgr-prometheus/ceph-osd-information.json
+++ b/dashboards/mgr-prometheus/ceph-osd-information.json
@@ -1,16 +1,26 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "panel",
       "id": "grafana-piechart-panel",
       "name": "Pie Chart",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     {
       "type": "datasource",
@@ -48,7 +58,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1526250090593,
+  "iteration": 1527118571092,
   "links": [
     {
       "asDropdown": true,
@@ -2045,7 +2055,7 @@
       {
         "allValue": ".*",
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 0,
         "includeAll": true,
         "label": "OSD Id",
@@ -2065,7 +2075,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": true,
         "label": "OSD Id",
@@ -2085,7 +2095,7 @@
       {
         "allValue": "",
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": true,
         "label": null,
@@ -2136,5 +2146,5 @@
   },
   "timezone": "browser",
   "title": "Ceph OSD Information",
-  "version": 14
-}
+  "version": 26
+}
\ No newline at end of file

diff --git a/dashboards/mgr-prometheus/ceph-pools.json b/dashboards/mgr-prometheus/ceph-pools.json
index 50fb0bbdaba0777e9657c3636dfd945d17c3e393..b3c2d02a44005d953168b0fb538a22726fc2782a 100644 (file)
--- a/dashboards/mgr-prometheus/ceph-pools.json
+++ b/dashboards/mgr-prometheus/ceph-pools.json
@@ -1,10 +1,20 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "panel",
@@ -42,7 +52,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1526263024209,
+  "iteration": 1527118557130,
   "links": [],
   "panels": [
     {
@@ -139,7 +149,11 @@
           "min": null,
           "show": false
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -222,7 +236,11 @@
           "min": null,
           "show": false
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "collapsed": false,
@@ -878,7 +896,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": true,
         "label": null,
@@ -898,7 +916,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": true,
         "label": "Pool Name",
@@ -949,5 +967,5 @@
   },
   "timezone": "browser",
   "title": "Ceph Pools",
-  "version": 16
-}
+  "version": 24
+}
\ No newline at end of file

diff --git a/dashboards/mgr-prometheus/ceph-rgw-workload.json b/dashboards/mgr-prometheus/ceph-rgw-workload.json
index 7ff2a4cc5b2fd3137f28db2abf01ed8ee96c6c6d..4c2b934f3f01cb2095346be875a43438efb771ff 100644 (file)
--- a/dashboards/mgr-prometheus/ceph-rgw-workload.json
+++ b/dashboards/mgr-prometheus/ceph-rgw-workload.json
@@ -1,10 +1,20 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "panel",
@@ -42,7 +52,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1524726965851,
+  "iteration": 1527118585082,
   "links": [],
   "panels": [
     {
@@ -137,7 +147,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -225,7 +239,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -306,7 +324,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "cacheTimeout": null,
@@ -519,8 +541,8 @@
           "scopedVars": {
             "rgw_servers": {
               "selected": false,
-              "text": "rgw.rhs-srv-01",
-              "value": "rgw.rhs-srv-01"
+              "text": "rgw.radosgw-staticsite.dl-rgw-pub01",
+              "value": "rgw.radosgw-staticsite.dl-rgw-pub01"
             }
           },
           "seriesOverrides": [],
@@ -627,8 +649,8 @@
           "scopedVars": {
             "rgw_servers": {
               "selected": false,
-              "text": "rgw.rhs-srv-01",
-              "value": "rgw.rhs-srv-01"
+              "text": "rgw.radosgw-staticsite.dl-rgw-pub01",
+              "value": "rgw.radosgw-staticsite.dl-rgw-pub01"
             }
           },
           "seriesOverrides": [],
@@ -724,8 +746,8 @@
           "scopedVars": {
             "rgw_servers": {
               "selected": false,
-              "text": "rgw.rhs-srv-01",
-              "value": "rgw.rhs-srv-01"
+              "text": "rgw.radosgw-staticsite.dl-rgw-pub01",
+              "value": "rgw.radosgw-staticsite.dl-rgw-pub01"
             }
           },
           "strokeWidth": 1,
@@ -780,7 +802,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": true,
         "label": null,
@@ -831,5 +853,5 @@
   },
   "timezone": "",
   "title": "Ceph RGW Workload",
-  "version": 15
+  "version": 8
 }

diff --git a/dashboards/mgr-prometheus/iscsi-client-details.json b/dashboards/mgr-prometheus/iscsi-client-details.json
index 7a9ab3392169720b066a8bec5abc0c0d2903f8b1..54edec74ecb22c5e30c860375fab43f4442212d2 100644 (file)
--- a/dashboards/mgr-prometheus/iscsi-client-details.json
+++ b/dashboards/mgr-prometheus/iscsi-client-details.json
@@ -1,10 +1,20 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "panel",
@@ -42,7 +52,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1526265032109,
+  "iteration": 1527118651310,
   "links": [],
   "panels": [
     {
@@ -138,7 +148,11 @@
           "min": null,
           "show": false
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -226,7 +240,11 @@
           "min": null,
           "show": false
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "columns": [],
@@ -351,7 +369,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 0,
         "includeAll": false,
         "label": "Client IQN",
@@ -371,7 +389,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": false,
         "label": null,
@@ -443,5 +461,5 @@
   },
   "timezone": "",
   "title": "iSCSI Client Details",
-  "version": 7
-}
+  "version": 9
+}
\ No newline at end of file

diff --git a/dashboards/mgr-prometheus/iscsi-overview.json b/dashboards/mgr-prometheus/iscsi-overview.json
index 3a745019e7dc0527a09b5907ee8caa86f42b72e6..8e2e396a029dd949c6e5cd9588b72d18bc520342 100644 (file)
--- a/dashboards/mgr-prometheus/iscsi-overview.json
+++ b/dashboards/mgr-prometheus/iscsi-overview.json
@@ -1,16 +1,26 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "panel",
       "id": "grafana-piechart-panel",
       "name": "Pie Chart",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     {
       "type": "panel",
@@ -54,7 +64,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1526263169717,
+  "iteration": 1527118621064,
   "links": [
     {
       "asDropdown": true,
@@ -882,7 +892,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1458,7 +1472,7 @@
       {
         "allValue": null,
         "current": {},
-        "datasource": null,
+        "datasource": "${DS_LOCAL}",
         "hide": 2,
         "includeAll": false,
         "label": null,
@@ -1530,5 +1544,5 @@
   },
   "timezone": "",
   "title": "iSCSI Overview",
-  "version": 30
+  "version": 21
 }