Remove useless Disk Usage panels
Opensatck returns only allocation related data, not real usage.
Change-Id: I7496609caeb7d6ea9e2963270e78ab8798df57dd
Related-PROD: PROD-27144
diff --git a/nova/files/grafana_dashboards/nova_utilization_prometheus.json b/nova/files/grafana_dashboards/nova_utilization_prometheus.json
index 2fbf7fd..43060e6 100644
--- a/nova/files/grafana_dashboards/nova_utilization_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_utilization_prometheus.json
@@ -970,21 +970,8 @@
{%- raw %}
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "used",
- "refId": "B"
- },
- {
-{%- endraw %}
-{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
- "expr": "max(avg((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
-{%- else %}
- "expr": "max(sum((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
-{%- endif %}
-{%- raw %}
- "format": "time_series",
- "intervalFactor": 2,
"legendFormat": "allocated",
- "refId": "C"
+ "refId": "B"
}
],
"thresholds": [],
@@ -1037,9 +1024,10 @@
"#d44a3a"
],
"datasource": null,
+ "decimals": 2,
"format": "percentunit",
"gauge": {
- "maxValue": 1,
+ "maxValue": 2,
"minValue": 0,
"show": true,
"thresholdLabels": false,
@@ -1047,11 +1035,11 @@
},
"gridPos": {
"h": 5,
- "w": 3,
+ "w": 6,
"x": 18,
"y": 11
},
- "id": 47,
+ "id": 55,
"interval": null,
"links": [],
"mappingType": 1,
@@ -1100,94 +1088,7 @@
"refId": "A"
}
],
- "thresholds": "0.85,0.95",
- "title": "Disk Usage %",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#299c46",
- "rgba(237, 129, 40, 0.89)",
- "#d44a3a"
- ],
- "datasource": null,
- "decimals": 2,
- "format": "percentunit",
- "gauge": {
- "maxValue": 6,
- "minValue": 0,
- "show": true,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 5,
- "w": 3,
- "x": 21,
- "y": 11
- },
- "id": 55,
- "interval": null,
- "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"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
-{%- endraw %}
-{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
- "expr": "max(avg((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
-{%- else %}
- "expr": "max(sum((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
-{%- endif %}
-{%- raw %}
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A"
- }
- ],
- "thresholds": "2,4",
+ "thresholds": "1,1.5",
"title": "Disk Allocated %",
"type": "singlestat",
"valueFontSize": "80%",
@@ -1778,94 +1679,6 @@
"valueName": "current"
},
{
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#299c46",
- "rgba(237, 129, 40, 0.89)",
- "#d44a3a"
- ],
- "datasource": null,
- "format": "percentunit",
- "gauge": {
- "maxValue": 1,
- "minValue": 0,
- "show": true,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 5,
- "w": 5,
- "x": 0,
- "y": 12
- },
- "id": 26,
- "interval": null,
- "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"
- }
- ],
- "scopedVars": {
- "aggregate": {
- "isNone": true,
- "selected": true,
- "text": "None",
- "value": ""
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "max(openstack_nova_aggregate_used_disk{aggregate=\"$aggregate\"} / openstack_nova_aggregate_disk{aggregate=\"$aggregate\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A"
- }
- ],
- "thresholds": "0.85,0.95",
- "title": "Disk Usage",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
"aliasColors": {},
"bars": false,
"dashLength": 10,
@@ -1874,8 +1687,8 @@
"fill": 1,
"gridPos": {
"h": 5,
- "w": 14,
- "x": 5,
+ "w": 19,
+ "x": 0,
"y": 12
},
"id": 25,
@@ -1922,15 +1735,8 @@
"expr": "max(openstack_nova_aggregate_used_disk{aggregate=\"$aggregate\"})",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "used",
- "refId": "B"
- },
- {
- "expr": "max(openstack_nova_aggregate_disk{aggregate=\"$aggregate\"} - openstack_nova_aggregate_disk_available{aggregate=\"$aggregate\"})",
- "format": "time_series",
- "intervalFactor": 2,
"legendFormat": "allocated",
- "refId": "C"
+ "refId": "B"
}
],
"thresholds": [],
@@ -2043,13 +1849,13 @@
"tableColumn": "",
"targets": [
{
- "expr": "max((openstack_nova_aggregate_disk{aggregate=\"$aggregate\"} - openstack_nova_aggregate_disk_available{aggregate=\"$aggregate\"}) / openstack_nova_aggregate_disk{aggregate=\"$aggregate\"})",
+ "expr": "max(openstack_nova_aggregate_used_disk{aggregate=\"$aggregate\"} / openstack_nova_aggregate_disk{aggregate=\"$aggregate\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A"
}
],
- "thresholds": "0.9,1",
+ "thresholds": "1,1.5",
"title": "Current Disk Allocation Ratio",
"type": "singlestat",
"valueFontSize": "80%",
@@ -2653,93 +2459,6 @@
"valueName": "current"
},
{
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "#299c46",
- "rgba(237, 129, 40, 0.89)",
- "#d44a3a"
- ],
- "datasource": null,
- "format": "percentunit",
- "gauge": {
- "maxValue": 1,
- "minValue": 0,
- "show": true,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 5,
- "w": 5,
- "x": 0,
- "y": 13
- },
- "id": 34,
- "interval": null,
- "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"
- }
- ],
- "scopedVars": {
- "host": {
- "selected": true,
- "text": "cmp1",
- "value": "cmp1"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "max(openstack_nova_used_disk{hostname=\"$host\"} / openstack_nova_disk{hostname=\"$host\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A"
- }
- ],
- "thresholds": "0.85,0.95",
- "title": "Disk Usage",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
"aliasColors": {},
"bars": false,
"dashLength": 10,
@@ -2748,8 +2467,8 @@
"fill": 1,
"gridPos": {
"h": 5,
- "w": 14,
- "x": 5,
+ "w": 19,
+ "x": 0,
"y": 13
},
"id": 35,
@@ -2795,15 +2514,8 @@
"expr": "max(openstack_nova_used_disk{hostname=\"$host\"})",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "used",
- "refId": "B"
- },
- {
- "expr": "max(openstack_nova_disk{hostname=\"$host\"} - openstack_nova_disk_available{hostname=\"$host\"})",
- "format": "time_series",
- "intervalFactor": 2,
"legendFormat": "allocated",
- "refId": "C"
+ "refId": "B"
}
],
"thresholds": [],
@@ -2915,13 +2627,13 @@
"tableColumn": "",
"targets": [
{
- "expr": "max((openstack_nova_disk{hostname=\"$host\"} - openstack_nova_disk_available{hostname=\"$host\"}) / openstack_nova_disk{hostname=\"$host\"})",
+ "expr": "max(openstack_nova_used_disk{hostname=\"$host\"} / openstack_nova_disk{hostname=\"$host\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A"
}
],
- "thresholds": "0.9,1",
+ "thresholds": "1,1.5",
"title": "Current Disk Allocation Ratio",
"type": "singlestat",
"valueFontSize": "80%",
@@ -3041,6 +2753,6 @@
"timezone": "",
"title": "Nova - Utilization",
"uid": null,
- "version": 2
+ "version": 3
}
{%- endraw %}