Fix for differentiating no data vs 0s
Change-Id: I5cf9e80846dd6d4cbbbb01c4021d7356c1ae5e16
diff --git a/glance/files/grafana_dashboards/glance_influxdb.json b/glance/files/grafana_dashboards/glance_influxdb.json
index b88b663..a5d43cc 100644
--- a/glance/files/grafana_dashboards/glance_influxdb.json
+++ b/glance/files/grafana_dashboards/glance_influxdb.json
@@ -1632,24 +1632,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_images",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND \"state\" = 'active' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1689,13 +1676,7 @@
"title": "Public images",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -1741,24 +1722,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_images",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1798,13 +1766,7 @@
"title": "Private images",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -1859,7 +1821,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -1868,7 +1830,7 @@
"hide": false,
"measurement": "openstack_glance_images",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1917,7 +1879,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -1925,7 +1887,7 @@
"groupByTags": [],
"measurement": "openstack_glance_images",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "B",
"resultFormat": "time_series",
@@ -2035,24 +1997,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_images_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND \"state\" = 'active' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2092,13 +2041,7 @@
"title": "",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -2144,24 +2087,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_images_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'private' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'private' AND \"state\" = 'active' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2201,13 +2131,7 @@
"title": "",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -2261,7 +2185,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -2269,7 +2193,7 @@
"groupByTags": [],
"measurement": "openstack_glance_images_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2318,7 +2242,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -2326,7 +2250,7 @@
"groupByTags": [],
"measurement": "openstack_glance_images_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_images_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "B",
"resultFormat": "time_series",
@@ -2436,24 +2360,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_snapshots",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND \"state\" = 'active' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2493,13 +2404,7 @@
"title": "Public snapshots",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -2545,24 +2450,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_snapshots",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'private' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'private' AND \"state\" = 'active' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2602,13 +2494,7 @@
"title": "Private snapshots",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -2663,7 +2549,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -2671,7 +2557,7 @@
"groupByTags": [],
"measurement": "openstack_glance_snapshots",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2715,7 +2601,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -2723,7 +2609,7 @@
"groupByTags": [],
"measurement": "openstack_glance_snapshots",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots\" WHERE \"environment_label\" =~ /^$environment$/ AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "B",
"resultFormat": "time_series",
@@ -2827,24 +2713,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_snapshots_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2884,13 +2757,7 @@
"title": "",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -2936,24 +2803,11 @@
"dsType": "influxdb",
"fill": "",
"function": "last",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
+ "groupBy": [],
"groupByTags": [],
"measurement": "openstack_glance_snapshots_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(null)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2993,13 +2847,7 @@
"title": "",
"type": "singlestat",
"valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "0",
- "value": "null"
- }
- ],
+ "valueMaps": [],
"valueName": "current"
},
{
@@ -3053,7 +2901,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -3061,7 +2909,7 @@
"groupByTags": [],
"measurement": "openstack_glance_snapshots_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'public' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -3110,7 +2958,7 @@
},
{
"params": [
- "0"
+ "null"
],
"type": "fill"
}
@@ -3118,7 +2966,7 @@
"groupByTags": [],
"measurement": "openstack_glance_snapshots_size",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(0)",
+ "query": "SELECT last(\"value\") FROM \"openstack_glance_snapshots_size\" WHERE \"environment_label\" =~ /^$environment$/ AND \"state\" = 'active' AND \"visibility\" = 'private' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "B",
"resultFormat": "time_series",
@@ -3263,5 +3111,5 @@
},
"timezone": "browser",
"title": "Glance",
- "version": 2
+ "version": 3
}