From b0214eded594b51ad9cddd334a6bc5cdb04bb7e7 Mon Sep 17 00:00:00 2001 From: Paul Cuzner Date: Fri, 25 May 2018 11:54:16 +1200 Subject: [PATCH] =?utf8?q?Fix=C2=A0templating=C2=A0definitions?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To prevent template init failures the datasource has been added to the template definitions --- .../mgr-prometheus/ceph-backend-storage.json | 20 ++++++-- .../mgr-prometheus/ceph-osd-information.json | 26 ++++++---- dashboards/mgr-prometheus/ceph-pools.json | 34 +++++++++---- .../mgr-prometheus/ceph-rgw-workload.json | 48 ++++++++++++++----- .../mgr-prometheus/iscsi-client-details.json | 34 +++++++++---- dashboards/mgr-prometheus/iscsi-overview.json | 26 +++++++--- 6 files changed, 140 insertions(+), 48 deletions(-) diff --git a/dashboards/mgr-prometheus/ceph-backend-storage.json b/dashboards/mgr-prometheus/ceph-backend-storage.json index 8620a5f..1814a7a 100644 --- 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 b51613f..daf75bd 100644 --- 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 50fb0bb..b3c2d02 100644 --- 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 7ff2a4c..4c2b934 100644 --- 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 7a9ab33..54edec7 100644 --- 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 3a74501..8e2e396 100644 --- 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 } -- 2.47.3