Merge "Fix annotations in Grafana dashboard" into stacklight
diff --git a/cinder/files/grafana_influxdb.json b/cinder/files/grafana_influxdb.json
index 56b4308..cd21e5d 100644
--- a/cinder/files/grafana_influxdb.json
+++ b/cinder/files/grafana_influxdb.json
@@ -9,7 +9,7 @@
"iconSize": 13,
"lineColor": "rgba(255, 96, 96, 0.592157)",
"name": "Status",
- "query": "select title,tags,text from annotations where $timeFilter and cluster = 'cinder'",
+ "query": "select title,tags,text from annotations where $timeFilter and cluster =~ /^cinder/",
"showLine": true,
"tagsColumn": "tags",
"textColumn": "text",
@@ -18,10 +18,10 @@
]
},
"editable": true,
+ "gnetId": null,
"hideControls": false,
"id": null,
"links": [],
- "originalTitle": "Cinder",
"refresh": "1m",
"rows": [
{
@@ -52,6 +52,17 @@
"id": 6,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -59,6 +70,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -173,6 +191,17 @@
"id": 74,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -180,6 +209,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -294,6 +330,17 @@
"id": 13,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -301,6 +348,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -640,6 +694,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -760,6 +815,7 @@
"tooltip": {
"msResolution": false,
"shared": false,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -1106,6 +1162,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "individual"
},
"type": "graph",
@@ -1173,6 +1230,17 @@
"id": 48,
"interval": ">60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1180,6 +1248,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -1298,6 +1373,17 @@
"id": 50,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1305,6 +1391,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -1432,6 +1525,17 @@
"id": 60,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1439,6 +1543,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -1542,6 +1653,17 @@
"id": 61,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1549,6 +1671,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -1652,6 +1781,17 @@
"id": 62,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1659,6 +1799,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -1859,6 +2006,17 @@
"id": 65,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1866,6 +2024,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -1969,6 +2134,17 @@
"id": 66,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -1976,6 +2152,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2079,6 +2262,17 @@
"id": 67,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -2086,6 +2280,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2286,6 +2487,17 @@
"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,
@@ -2293,6 +2505,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2396,6 +2615,17 @@
"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,
@@ -2403,6 +2633,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2506,6 +2743,17 @@
"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,
@@ -2513,6 +2761,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 1,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2710,6 +2965,17 @@
"id": 12,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -2717,6 +2983,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2807,6 +3080,17 @@
"id": 21,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -2814,6 +3098,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -2905,6 +3196,17 @@
"id": 16,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -2912,6 +3214,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -3181,6 +3490,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -3227,6 +3537,17 @@
"id": 23,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -3234,6 +3555,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -3323,6 +3651,17 @@
"id": 24,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -3330,6 +3669,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -3420,6 +3766,17 @@
"id": 25,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -3427,6 +3784,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -3694,6 +4058,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -3740,6 +4105,17 @@
"id": 57,
"interval": ">60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -3747,6 +4123,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -4016,6 +4399,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "individual"
},
"type": "graph",
@@ -4071,6 +4455,17 @@
"id": 12,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -4078,6 +4473,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -4167,6 +4569,17 @@
"id": 21,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -4174,6 +4587,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -4264,6 +4684,17 @@
"id": 16,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -4271,6 +4702,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -4540,6 +4978,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -4586,6 +5025,17 @@
"id": 23,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -4593,6 +5043,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -4682,6 +5139,17 @@
"id": 24,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -4689,6 +5157,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -4779,6 +5254,17 @@
"id": 25,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -4786,6 +5272,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -5050,6 +5543,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -5152,5 +5646,5 @@
},
"timezone": "browser",
"title": "Cinder",
- "version": 4
+ "version": 5
}