Add availability zone tag to the Grafana dashboard
It also removes the Cinder backup panels because the backup panel isn't
currently supported by the platform.
Change-Id: I1e1421b3e5c4e69386f3dc4ea655510c3688d52a
diff --git a/cinder/files/grafana_dashboards/cinder_influxdb.json b/cinder/files/grafana_dashboards/cinder_influxdb.json
index cd21e5d..322f042 100644
--- a/cinder/files/grafana_dashboards/cinder_influxdb.json
+++ b/cinder/files/grafana_dashboards/cinder_influxdb.json
@@ -19,6 +19,7 @@
},
"editable": true,
"gnetId": null,
+ "graphTooltip": 1,
"hideControls": false,
"id": null,
"links": [],
@@ -26,7 +27,6 @@
"rows": [
{
"collapse": false,
- "editable": true,
"height": "250px",
"panels": [
{
@@ -440,12 +440,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)"
- },
+ "grid": {},
"id": 7,
"interval": ">60s",
"legend": {
@@ -688,6 +683,7 @@
]
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "HTTP response time on $server",
@@ -699,7 +695,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -725,13 +724,7 @@
"editable": true,
"error": false,
"fill": 1,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)",
- "thresholdLine": false
- },
+ "grid": {},
"id": 9,
"interval": "> 60s",
"legend": {
@@ -809,6 +802,7 @@
]
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "API Availability",
@@ -820,7 +814,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -847,13 +844,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)",
- "thresholdLine": false
- },
+ "grid": {},
"id": 8,
"interval": "> 60s",
"legend": {
@@ -1156,6 +1147,7 @@
]
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Number of HTTP responses on $server",
@@ -1167,7 +1159,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -1187,12 +1182,15 @@
]
}
],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
"showTitle": true,
- "title": "Service Status"
+ "title": "Service Status",
+ "titleSize": "h6"
},
{
"collapse": false,
- "editable": true,
"height": "100px",
"panels": [
{
@@ -1482,12 +1480,15 @@
"type": "text"
}
],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
"showTitle": true,
- "title": "Cinder API"
+ "title": "Cinder API",
+ "titleSize": "h6"
},
{
"collapse": false,
- "editable": true,
"height": "250px",
"panels": [
{
@@ -1894,7 +1895,6 @@
"hideTimeOverride": false,
"id": 63,
"interval": ">60s",
- "isNew": true,
"links": [],
"pageSize": null,
"scroll": true,
@@ -1944,7 +1944,7 @@
],
"measurement": "openstack_cinder_service",
"policy": "default",
- "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" =~ /^$environment$/and service = 'scheduler' GROUP BY time($interval), hostname",
+ "query": "SELECT az as \"AZ\", state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" =~ /^$environment$/and service = 'scheduler' GROUP BY time($interval), hostname",
"rawQuery": true,
"refId": "A",
"resultFormat": "table",
@@ -2375,7 +2375,6 @@
"hideTimeOverride": false,
"id": 68,
"interval": ">60s",
- "isNew": true,
"links": [],
"pageSize": null,
"scroll": true,
@@ -2425,488 +2424,7 @@
],
"measurement": "openstack_cinder_service",
"policy": "default",
- "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" =~ /^$environment$/and service = 'volume' GROUP BY time($interval), hostname",
- "rawQuery": true,
- "refId": "A",
- "resultFormat": "table",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": []
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "",
- "transform": "table",
- "type": "table"
- },
- {
- "content": "<br />\n<h3 align=\"center\"> Backups </h3>",
- "editable": true,
- "error": false,
- "id": 69,
- "links": [],
- "mode": "html",
- "span": 2,
- "style": {},
- "title": "",
- "type": "text"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "id": 70,
- "interval": "> 60s",
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "span": 1,
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "targets": [
- {
- "column": "value",
- "dsType": "influxdb",
- "fill": "",
- "function": "last",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "measurement": "openstack_cinder_services",
- "policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" =~ /^$environment$/ AND \"service\" = 'backup' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)",
- "rawQuery": false,
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "last"
- }
- ]
- ],
- "tags": [
- {
- "key": "environment_label",
- "operator": "=",
- "value": "$environment"
- },
- {
- "key": "service",
- "operator": "=",
- "value": "backup"
- },
- {
- "condition": "AND",
- "key": "state",
- "operator": "=",
- "value": "disabled"
- }
- ]
- }
- ],
- "thresholds": "1,1",
- "title": "",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "id": 71,
- "interval": "> 60s",
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "span": 1,
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "targets": [
- {
- "column": "value",
- "dsType": "influxdb",
- "fill": "",
- "function": "last",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "measurement": "openstack_cinder_services",
- "policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" =~ /^$environment$/ AND \"service\" = 'backup' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)",
- "rawQuery": false,
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "last"
- }
- ]
- ],
- "tags": [
- {
- "key": "environment_label",
- "operator": "=",
- "value": "$environment"
- },
- {
- "key": "service",
- "operator": "=",
- "value": "backup"
- },
- {
- "condition": "AND",
- "key": "state",
- "operator": "=",
- "value": "up"
- }
- ]
- }
- ],
- "thresholds": "1,1",
- "title": "",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "id": 72,
- "interval": "> 60s",
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "span": 1,
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "targets": [
- {
- "column": "value",
- "dsType": "influxdb",
- "fill": "",
- "function": "last",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "measurement": "openstack_cinder_services",
- "policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" =~ /^$environment$/ AND \"service\" = 'backup' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)",
- "rawQuery": false,
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "last"
- }
- ]
- ],
- "tags": [
- {
- "key": "environment_label",
- "operator": "=",
- "value": "$environment"
- },
- {
- "key": "service",
- "operator": "=",
- "value": "backup"
- },
- {
- "condition": "AND",
- "key": "state",
- "operator": "=",
- "value": "down"
- }
- ]
- }
- ],
- "thresholds": "1,1",
- "title": "",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "columns": [],
- "editable": true,
- "error": false,
- "fontSize": "100%",
- "hideTimeOverride": false,
- "id": 73,
- "interval": ">60s",
- "isNew": true,
- "links": [],
- "pageSize": null,
- "scroll": true,
- "showHeader": true,
- "sort": {
- "col": 0,
- "desc": true
- },
- "span": 7,
- "styles": [
- {
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "pattern": "Time",
- "type": "date"
- },
- {
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "decimals": 2,
- "pattern": "/.*/",
- "thresholds": [],
- "type": "string",
- "unit": "short"
- }
- ],
- "targets": [
- {
- "alias": "",
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "measurement": "openstack_cinder_service",
- "policy": "default",
- "query": "SELECT state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" =~ /^$environment$/and service = 'backup' GROUP BY time($interval), hostname",
+ "query": "SELECT az as \"AZ\", state, last(value) FROM \"openstack_cinder_service\" WHERE $timeFilter AND \"environment_label\" =~ /^$environment$/and service = 'volume' GROUP BY time($interval), hostname",
"rawQuery": true,
"refId": "A",
"resultFormat": "table",
@@ -2934,12 +2452,15 @@
"type": "table"
}
],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
"showTitle": true,
- "title": "Cinder services"
+ "title": "Cinder services",
+ "titleSize": "h6"
},
{
"collapse": false,
- "editable": true,
"height": "250px",
"panels": [
{
@@ -3296,12 +2817,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)"
- },
+ "grid": {},
"id": 54,
"interval": ">60s",
"legend": {
@@ -3484,6 +3000,7 @@
"target": ""
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Volumes",
@@ -3495,7 +3012,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -3865,12 +3385,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)"
- },
+ "grid": {},
"id": 55,
"interval": ">60s",
"legend": {
@@ -4052,6 +3567,7 @@
]
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Volumes size",
@@ -4063,7 +3579,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -4211,13 +3730,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)",
- "thresholdLine": false
- },
+ "grid": {},
"id": 30,
"interval": "> 60s",
"legend": {
@@ -4393,6 +3906,7 @@
]
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Creation time",
@@ -4404,7 +3918,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -4424,12 +3941,15 @@
]
}
],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
"showTitle": true,
- "title": "Volumes"
+ "title": "Volumes",
+ "titleSize": "h6"
},
{
"collapse": false,
- "editable": true,
"height": "250px",
"panels": [
{
@@ -4784,12 +4304,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)"
- },
+ "grid": {},
"id": 54,
"interval": ">60s",
"legend": {
@@ -4972,6 +4487,7 @@
"target": ""
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Snapshots",
@@ -4983,7 +4499,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -5353,12 +4872,7 @@
"editable": true,
"error": false,
"fill": 0,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)"
- },
+ "grid": {},
"id": 55,
"interval": ">60s",
"legend": {
@@ -5537,6 +5051,7 @@
]
}
],
+ "thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Snapshots size",
@@ -5548,7 +5063,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -5568,11 +5086,15 @@
]
}
],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
"showTitle": true,
- "title": "Snapshots"
+ "title": "Snapshots",
+ "titleSize": "h6"
}
],
- "schemaVersion": 12,
+ "schemaVersion": 14,
"sharedCrosshair": true,
"style": "dark",
"tags": [],
@@ -5581,31 +5103,47 @@
"list": [
{
"allFormat": "regex values",
+ "allValue": null,
"current": {},
"datasource": null,
"hide": 0,
"includeAll": false,
+ "label": null,
+ "multi": false,
"name": "environment",
"options": [],
"query": "show tag values from cpu_idle with key = environment_label",
"refresh": 1,
"refresh_on_load": true,
"regex": "",
- "type": "query"
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
},
{
"allFormat": "regex values",
+ "allValue": null,
"current": {},
"datasource": null,
"hide": 0,
"includeAll": true,
+ "label": null,
+ "multi": false,
"name": "server",
"options": [],
"query": "show tag values from openstack_cinder_http_response_times with key = hostname where environment_label =~ /^$environment$/",
"refresh": 1,
"refresh_on_load": true,
"regex": "",
- "type": "query"
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
}
]
},
@@ -5646,5 +5184,5 @@
},
"timezone": "browser",
"title": "Cinder",
- "version": 5
-}
+ "version": 7
+}
\ No newline at end of file