From 0c6db55178fb62bd48e539181e00d5c4c234c71c Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Fri, 19 Aug 2016 16:26:47 +0200 Subject: [PATCH] Convert Grafana dashboards to v3 format Since the last major upgrade of Grafana, the dashboard format has slightly changed, this change updates the format of all dashboards. Operations made: replace all dashboards by a fresh export from the Grafana UI. Change-Id: I1e346633c51cac22dd3a078ba8a9c247a64f48f4 --- .../templates/grafana_dashboards/Apache.json | 166 +++-- .../templates/grafana_dashboards/Ceph.json | 479 ++++++++++----- .../grafana_dashboards/Ceph_OSD.json | 387 +++++++----- .../templates/grafana_dashboards/Cinder.json | 514 ++++++++++++---- .../grafana_dashboards/Elasticsearch.json | 246 +++++--- .../templates/grafana_dashboards/Glance.json | 363 ++++++++--- .../templates/grafana_dashboards/HAProxy.json | 378 ++++++++---- .../templates/grafana_dashboards/Heat.json | 172 ++++-- .../grafana_dashboards/Hypervisor.json | 341 +++++++---- .../grafana_dashboards/InfluxDB.json | 415 +++++++++---- .../grafana_dashboards/Keystone.json | 250 ++++++-- .../templates/grafana_dashboards/LMA.json | 470 +++++++++------ .../templates/grafana_dashboards/Main.json | 345 ++++++++--- .../grafana_dashboards/Memcached.json | 277 ++++++--- .../templates/grafana_dashboards/MySQL.json | 194 ++++-- .../templates/grafana_dashboards/Neutron.json | 481 +++++++++++---- .../templates/grafana_dashboards/Nova.json | 2 +- .../grafana_dashboards/RabbitMQ.json | 2 +- .../templates/grafana_dashboards/System.json | 565 ++++++++++++------ 19 files changed, 4278 insertions(+), 1769 deletions(-) diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json index c72f3a12..061f4fee 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json @@ -41,6 +41,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 11, "interval": "> 60s", "links": [], @@ -83,6 +90,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'apache' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -116,7 +124,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -162,12 +170,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -175,7 +177,6 @@ }, "id": 9, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -218,6 +219,7 @@ ], "groupByTags": [], "measurement": "apache_requests", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"apache_requests\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -249,15 +251,30 @@ "timeShift": null, "title": "Number of requests", "tooltip": { + "msResolution": false, "shared": false, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -268,12 +285,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -281,7 +292,6 @@ }, "id": 8, "interval": "> 60s", - "leftYAxisLabel": "Bytes/s", "legend": { "avg": false, "current": false, @@ -324,6 +334,7 @@ ], "groupByTags": [], "measurement": "apache_bytes", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"apache_bytes\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -355,15 +366,30 @@ "timeShift": null, "title": "Bytes/s transmitted", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "Bytes/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -374,12 +400,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -429,6 +449,7 @@ ], "groupByTags": [], "measurement": "apache_connections", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"apache_connections\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -460,15 +481,29 @@ "timeShift": null, "title": "Number of connections", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -484,6 +519,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -522,6 +564,7 @@ ], "groupByTags": [], "measurement": "apache_connections", + "policy": "default", "query": "SELECT last(\"value\") FROM \"apache_connections\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -571,12 +614,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -629,6 +666,7 @@ ], "groupByTags": [], "measurement": "/apache_workers/", + "policy": "default", "query": "SELECT mean(\"value\") FROM /apache_workers/ WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -660,16 +698,30 @@ "timeShift": null, "title": "Workers states", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "transparent": false, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -685,6 +737,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 4, "interval": "> 60s", "links": [], @@ -723,6 +782,7 @@ ], "groupByTags": [], "measurement": "apache_idle_workers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"apache_idle_workers\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -767,7 +827,7 @@ "title": "Metrics" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -778,11 +838,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -791,11 +852,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "server", "options": [], "query": "show tag values from apache_requests with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -839,5 +901,5 @@ }, "timezone": "browser", "title": "Apache", - "version": 3 -} + "version": 2 +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json index 097ede92..49ebf9fb 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json @@ -41,6 +41,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 8, "interval": ">60s", "links": [], @@ -79,6 +86,7 @@ ], "groupByTags": [], "measurement": "ceph_health", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_health\" WHERE \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -106,7 +114,7 @@ ] } ], - "thresholds": "1,2,3", + "thresholds": "2,3", "title": "Health", "type": "singlestat", "valueFontSize": "80%", @@ -147,6 +155,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 10, "interval": ">60s", "links": [], @@ -185,6 +200,7 @@ ], "groupByTags": [], "measurement": "ceph_quorum_count", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_quorum_count\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -213,7 +229,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Quorum members", "type": "singlestat", "valueFontSize": "80%", @@ -239,6 +255,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 9, "interval": ">60s", "links": [], @@ -277,6 +300,7 @@ ], "groupByTags": [], "measurement": "ceph_monitor_count", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_monitor_count\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -305,7 +329,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Monitor nodes", "type": "singlestat", "valueFontSize": "80%", @@ -331,6 +355,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 32, "interval": ">60s", "links": [], @@ -367,6 +398,7 @@ ], "groupByTags": [], "measurement": "ceph_objects_count", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_objects_count\" WHERE \"environment_label\" = '$environment' AND \"cluster\" =~ /$cluster/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -425,6 +457,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 31, "interval": ">60s", "links": [], @@ -461,6 +500,7 @@ ], "groupByTags": [], "measurement": "ceph_pg_count", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_pg_count\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -515,6 +555,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 24, "interval": ">60s", "links": [], @@ -551,6 +598,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_total_percent_free", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_pool_total_percent_free\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -600,12 +648,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -613,7 +655,6 @@ }, "id": 1, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -657,6 +698,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_total_bytes_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_total_bytes_used\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -705,6 +747,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_total_bytes_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_total_bytes_free\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -737,15 +780,30 @@ "timeShift": null, "title": "Storage (total)", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -756,12 +814,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -769,7 +821,6 @@ }, "id": 12, "interval": ">60s", - "leftYAxisLabel": "pg", "legend": { "avg": false, "current": false, @@ -821,6 +872,7 @@ ], "hide": false, "measurement": "ceph_pg_state_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"ceph_pg_state_count\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval), \"tag\", \"state\"", "rawQuery": false, "refId": "A", @@ -859,15 +911,30 @@ "timeShift": null, "title": "Placement Groups by state", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "pg", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -892,6 +959,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 4, "interval": ">60s", "links": [], @@ -930,6 +1004,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_count", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_pool_count\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -983,12 +1058,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -997,7 +1066,6 @@ }, "id": 3, "interval": ">1m", - "leftYAxisLabel": "", "legend": { "alignAsTable": false, "avg": false, @@ -1044,6 +1112,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_bytes_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_bytes_used\" WHERE \"pool\" =~ /$pool/ AND \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1101,6 +1170,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_bytes_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_bytes_free\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"cluster\" =~ /$cluster/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1142,15 +1212,30 @@ "timeShift": null, "title": "Storage ($pool)", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1161,12 +1246,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1174,7 +1253,6 @@ }, "id": 7, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1218,6 +1296,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_objects", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_objects\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1259,15 +1338,30 @@ "timeShift": null, "title": "Number of objects ($pool)", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "none" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "none", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1296,6 +1390,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 15, "interval": ">60s", "links": [], @@ -1334,6 +1435,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_objects", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_pool_objects\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1392,12 +1494,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1405,7 +1501,6 @@ }, "id": 5, "interval": ">60s", - "leftYAxisLabel": "bytes/sec", "legend": { "avg": false, "current": false, @@ -1458,6 +1553,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_bytes_rate_rx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_bytes_rate_rx\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1515,6 +1611,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_bytes_rate_tx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_bytes_rate_tx\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1556,15 +1653,30 @@ "timeShift": null, "title": "I/O ($pool)", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "bytes/sec", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1575,12 +1687,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1588,7 +1694,6 @@ }, "id": 6, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -1633,6 +1738,7 @@ "groupByTags": [], "hide": false, "measurement": "ceph_pool_ops_rate", + "policy": "default", "query": "SELECT max(\"value\") FROM \"ceph_pool_ops_rate\" WHERE \"pool\" =~ /$pool/ AND \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1674,15 +1780,30 @@ "timeShift": null, "title": "Operations ($pool)", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1711,6 +1832,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 17, "interval": ">60s", "links": [], @@ -1749,6 +1877,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_size", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_size\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1807,12 +1936,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1863,6 +1986,7 @@ ], "groupByTags": [], "measurement": "ceph_pool_pg_num", + "policy": "default", "query": "SELECT max(\"value\") FROM \"ceph_pool_pg_num\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"pool\" =~ /$pool/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1904,15 +2028,29 @@ "timeShift": null, "title": "Number of PGs ($pool)", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1937,6 +2075,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 13, "interval": ">60s", "links": [], @@ -1975,6 +2120,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_up", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_up\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2033,6 +2179,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 14, "interval": ">60s", "links": [], @@ -2071,6 +2224,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_down", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_down\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2125,12 +2279,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2181,6 +2329,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_up", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_up\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2233,6 +2382,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_down", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_down\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2285,6 +2435,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_in", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_in\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -2337,6 +2488,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_out", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_count_out\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -2373,15 +2525,29 @@ "timeShift": null, "title": "OSD Daemons states", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2392,12 +2558,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2435,10 +2595,14 @@ "groupBy": [ { "interval": "auto", + "params": [ + "auto" + ], "type": "time" } ], "measurement": "ceph_osd_space_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_space_used\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2486,10 +2650,14 @@ "groupBy": [ { "interval": "auto", + "params": [ + "auto" + ], "type": "time" } ], "measurement": "ceph_osd_space_total", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_space_total\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2534,15 +2702,29 @@ "timeShift": null, "title": "Storage osd-$osd", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2553,12 +2735,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2609,6 +2785,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_latency_apply", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_latency_apply\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2650,15 +2827,29 @@ "timeShift": null, "title": "Apply Latency osd-$osd", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ms", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2669,12 +2860,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2725,6 +2910,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_latency_commit", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_osd_latency_commit\" WHERE \"cluster\" =~ /$cluster/ AND \"hostname\" =~ /$mon/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2766,15 +2952,29 @@ "timeShift": null, "title": "Commit Latency osd-$osd", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ms", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2789,7 +2989,7 @@ "title": "New row" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -2800,11 +3000,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2813,11 +3014,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "mon", "options": [], "query": "show tag values from ceph_health with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2826,11 +3028,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "cluster", "options": [], "query": "show tag values from ceph_health with key = cluster where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2839,11 +3042,12 @@ "allFormat": "regex wildcard", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "pool", "options": [], "query": "show tag values from ceph_pool_size with key = pool where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "/^[^.]/", "type": "query" @@ -2852,11 +3056,12 @@ "allFormat": "wildcard", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "osd", "options": [], "query": "show tag values from ceph_osd_space_total with key = osd where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2901,4 +3106,4 @@ "timezone": "browser", "title": "Ceph", "version": 2 -} +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json index 93dd08e2..9cb1e20b 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json @@ -22,12 +22,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -35,7 +29,6 @@ }, "id": 3, "interval": ">60s", - "leftYAxisLabel": "ops/s", "legend": { "avg": false, "current": false, @@ -78,6 +71,7 @@ } ], "measurement": "ceph_perf_osd_op_wip", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_wip\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -119,15 +113,30 @@ "timeShift": null, "title": "Operations WIP", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "ops/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -138,12 +147,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -151,7 +154,6 @@ }, "id": 4, "interval": ">60s", - "leftYAxisLabel": "ops/s", "legend": { "avg": false, "current": false, @@ -189,6 +191,7 @@ } ], "measurement": "ceph_perf_osd_op", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -227,15 +230,30 @@ "timeShift": null, "title": "Client Operations", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "ops/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -246,12 +264,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -259,7 +271,6 @@ }, "id": 5, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -299,6 +310,7 @@ "hide": false, "interval": "", "measurement": "ceph_perf_osd_op_in_bytes", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -348,6 +360,7 @@ ], "interval": "", "measurement": "ceph_perf_osd_op_out_bytes", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -386,15 +399,30 @@ "timeShift": null, "title": "I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -405,12 +433,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -418,7 +440,6 @@ }, "id": 6, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -461,6 +482,7 @@ } ], "measurement": "ceph_perf_osd_op_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -502,15 +524,30 @@ "timeShift": null, "title": "Operation Latency", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -529,12 +566,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -542,7 +573,6 @@ }, "id": 7, "interval": ">60s", - "leftYAxisLabel": "ops/s", "legend": { "avg": false, "current": false, @@ -586,6 +616,7 @@ ], "interval": "", "measurement": "ceph_perf_osd_op_r_out_bytes", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -635,6 +666,7 @@ ], "interval": "", "measurement": "ceph_perf_osd_op_r", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -673,15 +705,30 @@ "timeShift": null, "title": "Client reads", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "Bps" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "ops/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -692,12 +739,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -705,7 +746,6 @@ }, "id": 8, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -748,6 +788,7 @@ } ], "measurement": "ceph_perf_osd_op_r_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_r_latency\" WHERE \"cluster\" = 'ceph' AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -804,6 +845,7 @@ } ], "measurement": "ceph_perf_osd_op_r_process_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_r_process_latency\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -836,15 +878,30 @@ "timeShift": null, "title": "Client Read Latency", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "bytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ms", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] } ], @@ -863,12 +920,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -876,7 +927,6 @@ }, "id": 9, "interval": ">60s", - "leftYAxisLabel": "ops/s", "legend": { "avg": false, "current": false, @@ -919,6 +969,7 @@ } ], "measurement": "ceph_perf_osd_op_w_in_bytes", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -967,6 +1018,7 @@ } ], "measurement": "ceph_perf_osd_op_w", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -1015,6 +1067,7 @@ } ], "measurement": "ceph_perf_osd_op_w_rlat", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -1053,15 +1106,30 @@ "timeShift": null, "title": "Client writes", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "Bps" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "ops/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -1072,12 +1140,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1085,7 +1147,6 @@ }, "id": 10, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1128,6 +1189,7 @@ } ], "measurement": "ceph_perf_osd_op_w_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_w_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1184,6 +1246,7 @@ } ], "measurement": "ceph_perf_osd_op_w_process_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_w_process_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1225,15 +1288,30 @@ "timeShift": null, "title": "Client Write Latency", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "bytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ms", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] } ], @@ -1252,12 +1330,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1265,7 +1337,6 @@ }, "id": 11, "interval": ">60s", - "leftYAxisLabel": "op/s", "legend": { "avg": false, "current": false, @@ -1308,6 +1379,7 @@ } ], "measurement": "ceph_perf_osd_op_rw_in_bytes", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -1356,6 +1428,7 @@ } ], "measurement": "ceph_perf_osd_op_rw", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -1404,6 +1477,7 @@ } ], "measurement": "ceph_perf_osd_op_rw_rlat", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -1442,15 +1516,30 @@ "timeShift": null, "title": "Client Read/Write", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "Bps" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "op/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -1461,12 +1550,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1474,7 +1557,6 @@ }, "id": 12, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1517,6 +1599,7 @@ } ], "measurement": "ceph_perf_osd_op_rw_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_rw_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1573,6 +1656,7 @@ } ], "measurement": "ceph_perf_osd_op_rw_process_latency", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_op_rw_process_latency\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1614,15 +1698,30 @@ "timeShift": null, "title": "Client Read/Write Latency", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "none" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ms", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "none", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] } ], @@ -1641,12 +1740,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1654,7 +1747,6 @@ }, "id": 2, "interval": ">60s", - "leftYAxisLabel": "operations", "legend": { "avg": false, "current": false, @@ -1696,6 +1788,7 @@ } ], "measurement": "ceph_perf_osd_recovery_ops", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_perf_osd_recovery_ops\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1737,22 +1830,37 @@ "timeShift": null, "title": "Recovery Operations", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "operations", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] } ], "title": "New row" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -1763,11 +1871,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1776,11 +1885,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "cluster", "options": [], "query": "show tag values from ceph_health with key = cluster where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1789,11 +1899,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "osd", "options": [], "query": "show tag values from ceph_perf_osd_op_latency with key = osd where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1837,5 +1948,5 @@ }, "timezone": "browser", "title": "Ceph OSD", - "version": 3 -} + "version": 2 +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json index b804cd1e..c21ea109 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -77,6 +84,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'cinder' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -110,7 +118,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -161,6 +169,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 13, "interval": "> 60s", "links": [], @@ -202,6 +217,7 @@ "groupby_field": "", "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -236,7 +252,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "HTTP 5xx errors", "type": "singlestat", "valueFontSize": "80%", @@ -257,12 +273,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -314,6 +324,7 @@ ], "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -368,6 +379,7 @@ ], "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -422,6 +434,7 @@ ], "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -476,6 +489,7 @@ ], "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -514,15 +528,29 @@ "timeShift": null, "title": "HTTP response time on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -533,12 +561,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": 1, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -547,7 +569,6 @@ }, "id": 9, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -590,6 +611,7 @@ } ], "measurement": "openstack_check_api", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'cinder-api' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -627,15 +649,30 @@ "timeShift": null, "title": "API Availability", "tooltip": { + "msResolution": false, "shared": false, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": false, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "", + "logBase": 1, + "max": 1, + "min": 0, + "show": false + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": false + } ] }, { @@ -646,12 +683,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -706,6 +737,7 @@ ], "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '2xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -761,6 +793,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '1xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -816,6 +849,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '3xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -871,6 +905,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '4xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -926,6 +961,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_cinder_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -964,15 +1000,29 @@ "timeShift": null, "title": "Number of HTTP responses on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1009,6 +1059,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 48, "interval": ">60s", "links": [], @@ -1040,6 +1097,7 @@ } ], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'cinder-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -1077,7 +1135,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Cinder", "type": "singlestat", "valueFontSize": "80%", @@ -1127,6 +1185,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 50, "interval": "> 60s", "links": [], @@ -1158,6 +1223,7 @@ } ], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'cinder-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -1195,7 +1261,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1254,6 +1320,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 60, "interval": "> 60s", "links": [], @@ -1292,6 +1365,7 @@ } ], "measurement": "openstack_cinder_services", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'scheduler' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1331,7 +1405,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Disabled", "type": "singlestat", "valueFontSize": "80%", @@ -1357,6 +1431,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 61, "interval": "> 60s", "links": [], @@ -1395,6 +1476,7 @@ } ], "measurement": "openstack_cinder_services", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'scheduler' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1434,7 +1516,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Up", "type": "singlestat", "valueFontSize": "80%", @@ -1460,6 +1542,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 62, "interval": "> 60s", "links": [], @@ -1498,6 +1587,7 @@ } ], "measurement": "openstack_cinder_services", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'scheduler' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1537,7 +1627,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Down", "type": "singlestat", "valueFontSize": "80%", @@ -1607,6 +1697,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", "rawQuery": true, "refId": "A", @@ -1659,6 +1750,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 65, "interval": "> 60s", "links": [], @@ -1697,6 +1795,7 @@ } ], "measurement": "openstack_cinder_services", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'scheduler' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1736,7 +1835,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1762,6 +1861,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 66, "interval": "> 60s", "links": [], @@ -1800,6 +1906,7 @@ } ], "measurement": "openstack_cinder_services", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'volume' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1839,7 +1946,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1865,6 +1972,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 67, "interval": "> 60s", "links": [], @@ -1903,6 +2017,7 @@ } ], "measurement": "openstack_cinder_services", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_services\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'volume' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1942,7 +2057,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2012,6 +2127,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", @@ -2064,6 +2180,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 70, "interval": "> 60s", "links": [], @@ -2102,6 +2225,7 @@ } ], "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", @@ -2141,7 +2265,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2167,6 +2291,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 71, "interval": "> 60s", "links": [], @@ -2205,6 +2336,7 @@ } ], "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", @@ -2244,7 +2376,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2270,6 +2402,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 72, "interval": "> 60s", "links": [], @@ -2308,6 +2447,7 @@ } ], "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", @@ -2347,7 +2487,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2417,6 +2557,7 @@ } ], "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", "rawQuery": true, "refId": "A", @@ -2466,6 +2607,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 12, "interval": "> 60s", "links": [], @@ -2497,6 +2645,7 @@ } ], "measurement": "openstack_cinder_volumes", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -2556,6 +2705,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 21, "interval": "> 60s", "links": [], @@ -2588,6 +2744,7 @@ } ], "measurement": "openstack_cinder_volumes", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -2647,6 +2804,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 16, "interval": "> 60s", "links": [], @@ -2679,6 +2843,7 @@ } ], "measurement": "openstack_cinder_volumes", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -2733,12 +2898,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2789,6 +2948,7 @@ ], "hide": false, "measurement": "openstack_cinder_volumes", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2840,6 +3000,7 @@ } ], "measurement": "openstack_cinder_volumes", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2893,6 +3054,7 @@ ], "hide": false, "measurement": "openstack_cinder_volumes", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -2930,15 +3092,29 @@ "timeShift": null, "title": "Volumes", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2954,6 +3130,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 23, "interval": "> 60s", "links": [], @@ -2985,6 +3168,7 @@ } ], "measurement": "openstack_cinder_volumes_size", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -3043,6 +3227,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 24, "interval": "> 60s", "links": [], @@ -3075,6 +3266,7 @@ } ], "measurement": "openstack_cinder_volumes_size", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -3133,6 +3325,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 25, "interval": "> 60s", "links": [], @@ -3165,6 +3364,7 @@ } ], "measurement": "openstack_cinder_volumes_size", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -3218,12 +3418,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3273,6 +3467,7 @@ } ], "measurement": "openstack_cinder_volumes_size", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3325,6 +3520,7 @@ } ], "measurement": "openstack_cinder_volumes_size", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -3377,6 +3573,7 @@ } ], "measurement": "openstack_cinder_volumes_size", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volumes_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -3414,15 +3611,29 @@ "timeShift": null, "title": "Volumes size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "none" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "none", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -3438,6 +3649,13 @@ "editable": true, "error": false, "format": "s", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 57, "interval": ">60s", "links": [], @@ -3469,6 +3687,7 @@ } ], "measurement": "openstack_cinder_volume_creation_time", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_volume_creation_time\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -3530,12 +3749,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3591,6 +3804,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_volume_creation_time", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_cinder_volume_creation_time\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3640,6 +3854,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_volume_creation_time", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_volume_creation_time\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -3689,6 +3904,7 @@ "hide": false, "interval": "", "measurement": "openstack_cinder_volume_creation_time", + "policy": "default", "query": "SELECT min(\"value\") FROM \"openstack_cinder_volume_creation_time\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -3721,15 +3937,29 @@ "timeShift": null, "title": "Creation time", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -3754,6 +3984,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 12, "interval": "> 60s", "links": [], @@ -3785,6 +4022,7 @@ } ], "measurement": "openstack_cinder_snapshots", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -3843,6 +4081,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 21, "interval": "> 60s", "links": [], @@ -3875,6 +4120,7 @@ } ], "measurement": "openstack_cinder_snapshots", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -3933,6 +4179,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 16, "interval": "> 60s", "links": [], @@ -3965,6 +4218,7 @@ } ], "measurement": "openstack_cinder_snapshots", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -4019,12 +4273,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -4075,6 +4323,7 @@ ], "hide": false, "measurement": "openstack_cinder_snapshots", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -4126,6 +4375,7 @@ } ], "measurement": "openstack_cinder_snapshots", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -4179,6 +4429,7 @@ ], "hide": false, "measurement": "openstack_cinder_snapshots", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -4216,15 +4467,29 @@ "timeShift": null, "title": "Snapshots", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -4240,6 +4505,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 23, "interval": "> 60s", "links": [], @@ -4271,6 +4543,7 @@ } ], "measurement": "openstack_cinder_snapshots_size", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -4329,6 +4602,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 24, "interval": "> 60s", "links": [], @@ -4361,6 +4641,7 @@ } ], "measurement": "openstack_cinder_snapshots_size", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -4419,6 +4700,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 25, "interval": "> 60s", "links": [], @@ -4451,6 +4739,7 @@ } ], "measurement": "openstack_cinder_snapshots_size", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -4504,12 +4793,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -4559,6 +4842,7 @@ } ], "measurement": "openstack_cinder_snapshots_size", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'available' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -4610,6 +4894,7 @@ } ], "measurement": "openstack_cinder_snapshots_size", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'in-use' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -4661,6 +4946,7 @@ } ], "measurement": "openstack_cinder_snapshots_size", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_cinder_snapshots_size\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'error' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -4697,15 +4983,29 @@ "timeShift": null, "title": "Snapshots size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "none" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "none", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -4713,7 +5013,7 @@ "title": "Snapshots" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -4724,11 +5024,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -4737,11 +5038,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": true, "name": "server", "options": [], "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -4785,5 +5087,5 @@ }, "timezone": "browser", "title": "Cinder", - "version": 12 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json index 8a93df35..4ce506a2 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json @@ -41,6 +41,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 59, "interval": "> 60s", "links": [], @@ -76,6 +83,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'elasticsearch' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -108,7 +116,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -159,6 +167,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "hideTimeOverride": false, "id": 61, "interval": ">60s", @@ -190,6 +205,7 @@ } ], "measurement": "elasticsearch_cluster_number_of_nodes", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_number_of_nodes\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -240,12 +256,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -253,7 +263,6 @@ }, "id": 60, "interval": ">60s", - "leftYAxisLabel": "shards", "legend": { "avg": false, "current": false, @@ -288,6 +297,7 @@ } ], "measurement": "elasticsearch_cluster_active_primary_shards", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_active_primary_shards\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -326,6 +336,7 @@ } ], "measurement": "elasticsearch_cluster_active_shards", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_active_shards\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "B", @@ -364,6 +375,7 @@ } ], "measurement": "elasticsearch_cluster_relocating_shards", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_relocating_shards\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "C", @@ -402,6 +414,7 @@ } ], "measurement": "elasticsearch_cluster_unassigned_shards", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_unassigned_shards\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "E", @@ -440,6 +453,7 @@ } ], "measurement": "elasticsearch_cluster_initializing_shards", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_initializing_shards\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "D", @@ -471,15 +485,30 @@ "timeShift": null, "title": "Shards", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "shards", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -490,12 +519,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": 10, @@ -503,7 +526,6 @@ }, "id": 62, "interval": ">60s", - "leftYAxisLabel": "tasks", "legend": { "avg": false, "current": false, @@ -539,6 +561,7 @@ } ], "measurement": "elasticsearch_cluster_number_of_pending_tasks", + "policy": "default", "query": "SELECT last(\"value\") FROM \"elasticsearch_cluster_number_of_pending_tasks\" WHERE $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -570,15 +593,30 @@ "timeShift": null, "title": "Pending tasks", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "tasks", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -603,6 +641,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 32, "interval": "> 60s", "links": [], @@ -634,6 +679,7 @@ } ], "measurement": "lma_components_threads", + "policy": "default", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -688,12 +734,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -744,6 +784,7 @@ } ], "measurement": "lma_components_memory_rss", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -781,15 +822,29 @@ "timeShift": null, "title": "Resident Set Size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -800,12 +855,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -813,7 +862,6 @@ }, "id": 33, "interval": "> 60s", - "leftYAxisLabel": "bytes/sec", "legend": { "alignAsTable": false, "avg": false, @@ -857,6 +905,7 @@ } ], "measurement": "lma_components_disk_bytes_read", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -909,6 +958,7 @@ } ], "measurement": "lma_components_disk_bytes_write", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -946,15 +996,30 @@ "timeShift": null, "title": "Disk I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "bytes/sec", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -965,12 +1030,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1020,6 +1079,7 @@ } ], "measurement": "lma_components_cputime_syst", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1072,6 +1132,7 @@ } ], "measurement": "lma_components_cputime_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"service\" = 'elasticsearch' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1109,15 +1170,29 @@ "timeShift": null, "title": "CPU usage", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1133,6 +1208,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 58, "interval": null, "links": [], @@ -1162,6 +1244,7 @@ } ], "measurement": "fs_space_percent_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_percent_free\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -1216,12 +1299,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1270,6 +1347,7 @@ } ], "measurement": "fs_space_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_free\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1320,6 +1398,7 @@ } ], "measurement": "fs_space_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_used\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1370,6 +1449,7 @@ } ], "measurement": "fs_space_percent_reserved", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_percent_reserved\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -1407,15 +1487,29 @@ "timeShift": null, "title": "Disk usage on /opt/es/data", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1423,7 +1517,7 @@ "title": "Instance $server" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -1434,11 +1528,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1447,11 +1542,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "server", "options": [], "query": "show tag values from elasticsearch_cluster_health with key = \"hostname\" where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1495,5 +1591,5 @@ }, "timezone": "browser", "title": "Elasticsearch", - "version": 13 -} + "version": 2 +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json index d9949c6e..41c239db 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -84,6 +91,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'glance' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -117,7 +125,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -168,6 +176,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 13, "interval": "> 60s", "links": [], @@ -210,6 +225,7 @@ "groupby_field": "", "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -244,7 +260,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "HTTP 5xx errors", "type": "singlestat", "valueFontSize": "80%", @@ -265,12 +281,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -324,6 +334,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -380,6 +391,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -436,6 +448,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -492,6 +505,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -548,6 +562,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PATCH' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -586,15 +601,29 @@ "timeShift": null, "title": "HTTP response time on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -605,12 +634,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": 1, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -619,7 +642,6 @@ }, "id": 9, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -663,6 +685,7 @@ ], "groupByTags": [], "measurement": "openstack_check_api", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'glance-api' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -700,15 +723,30 @@ "timeShift": null, "title": "API Availability", "tooltip": { + "msResolution": false, "shared": false, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": false, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "", + "logBase": 1, + "max": 1, + "min": 0, + "show": false + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": false + } ] }, { @@ -719,12 +757,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -780,6 +812,7 @@ ], "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '2xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -836,6 +869,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '1xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -892,6 +926,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '3xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -948,6 +983,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '4xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -1004,6 +1040,7 @@ "hide": false, "interval": "", "measurement": "openstack_glance_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_glance_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -1042,15 +1079,29 @@ "timeShift": null, "title": "Number of HTTP responses on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1087,6 +1138,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 22, "interval": "> 60s", "links": [], @@ -1125,6 +1183,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'glance-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1188,6 +1247,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 23, "interval": "> 60s", "links": [], @@ -1226,6 +1292,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'glance-registry-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1313,6 +1380,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 26, "interval": "> 60s", "links": [], @@ -1351,6 +1425,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'glance-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1388,7 +1463,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1414,6 +1489,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 27, "interval": "> 60s", "links": [], @@ -1452,6 +1534,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'glance-registry-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1489,7 +1572,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1536,6 +1619,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 1, "interval": "> 60s", "links": [], @@ -1575,6 +1665,7 @@ ], "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)", "rawQuery": false, "refId": "A", @@ -1638,6 +1729,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 14, "interval": "> 60s", "links": [], @@ -1677,6 +1775,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(null)", "rawQuery": false, "refId": "A", @@ -1736,12 +1835,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1793,6 +1886,7 @@ "groupByTags": [], "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)", "rawQuery": false, "refId": "A", @@ -1850,6 +1944,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)", "rawQuery": false, "refId": "B", @@ -1893,15 +1988,29 @@ "timeShift": null, "title": "Number of images", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1917,6 +2026,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 17, "interval": "> 60s", "links": [], @@ -1956,6 +2072,7 @@ ], "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)", "rawQuery": false, "refId": "A", @@ -2019,6 +2136,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 18, "interval": "> 60s", "links": [], @@ -2058,6 +2182,7 @@ ], "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)", "rawQuery": false, "refId": "A", @@ -2116,12 +2241,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2129,7 +2248,6 @@ }, "id": 30, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -2173,6 +2291,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)", "rawQuery": false, "refId": "A", @@ -2230,6 +2349,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)", "rawQuery": false, "refId": "B", @@ -2272,15 +2392,30 @@ "timeShift": null, "title": "Images size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2296,6 +2431,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 15, "interval": "> 60s", "links": [], @@ -2335,6 +2477,7 @@ ], "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)", "rawQuery": false, "refId": "A", @@ -2398,6 +2541,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 16, "interval": "> 60s", "links": [], @@ -2437,6 +2587,7 @@ ], "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)", "rawQuery": false, "refId": "A", @@ -2496,12 +2647,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2552,6 +2697,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)", "rawQuery": false, "refId": "A", @@ -2604,6 +2750,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)", "rawQuery": false, "refId": "B", @@ -2641,15 +2788,29 @@ "timeShift": null, "title": "Number of snapshots", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2665,6 +2826,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 19, "interval": "> 60s", "links": [], @@ -2704,6 +2872,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(null)", "rawQuery": false, "refId": "A", @@ -2767,6 +2936,13 @@ "editable": true, "error": false, "format": "bytes", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 20, "interval": "> 60s", "links": [], @@ -2806,6 +2982,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(null)", "rawQuery": false, "refId": "A", @@ -2864,12 +3041,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2920,6 +3091,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)", "rawQuery": false, "refId": "A", @@ -2977,6 +3149,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)", "rawQuery": false, "refId": "B", @@ -3019,15 +3192,29 @@ "timeShift": null, "title": "Snapshots size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -3035,7 +3222,7 @@ "title": "Resources" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -3046,11 +3233,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3059,11 +3247,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": true, "name": "server", "options": [], "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3107,5 +3296,5 @@ }, "timezone": "browser", "title": "Glance", - "version": 5 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json index 8d87f4f0..fa8134f8 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 23, "interval": "> 60s", "links": [], @@ -77,6 +84,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'haproxy-openstack' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -110,7 +118,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -161,6 +169,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 1, "interval": ">60s", "links": [], @@ -193,6 +208,7 @@ } ], "measurement": "pacemaker_local_resource_active", + "policy": "default", "query": "SELECT last(\"value\") FROM \"pacemaker_local_resource_active\" WHERE \"hostname\" =~ /$server/ AND \"resource\" = 'vip__public' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -225,7 +241,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "Public VIP", "type": "singlestat", "valueFontSize": "50%", @@ -261,6 +277,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 19, "interval": ">60s", "links": [], @@ -293,6 +316,7 @@ } ], "measurement": "pacemaker_local_resource_active", + "policy": "default", "query": "SELECT last(\"value\") FROM \"pacemaker_local_resource_active\" WHERE \"hostname\" =~ /$server/ AND \"resource\" = 'vip__management' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -325,7 +349,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "Management VIP", "type": "singlestat", "valueFontSize": "50%", @@ -361,6 +385,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 16, "interval": ">60s", "links": [], @@ -393,6 +424,7 @@ } ], "measurement": "haproxy_backend_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_status\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -420,7 +452,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "Backend status ($service)", "type": "singlestat", "valueFontSize": "50%", @@ -468,6 +500,13 @@ "editable": true, "error": false, "format": "s", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 11, "interval": ">60s", "links": [], @@ -500,6 +539,7 @@ ], "interval": "", "measurement": "haproxy_uptime", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_uptime\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -548,12 +588,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -603,6 +637,7 @@ } ], "measurement": "haproxy_connections", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_connections\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -650,6 +685,7 @@ ], "hide": false, "measurement": "haproxy_pipes_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_pipes_free\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "B", @@ -699,6 +735,7 @@ "hide": false, "interval": "", "measurement": "haproxy_pipes_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_pipes_used\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "C", @@ -747,6 +784,7 @@ ], "interval": "", "measurement": "haproxy_tasks", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_tasks\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "D", @@ -779,15 +817,29 @@ "timeShift": null, "title": "Server statistics", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -809,12 +861,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -860,6 +906,7 @@ ], "interval": "", "measurement": "haproxy_frontend_bytes_in", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_bytes_in\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -910,6 +957,7 @@ "hide": false, "interval": "", "measurement": "haproxy_frontend_bytes_out", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_bytes_out\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -948,15 +996,29 @@ "timeShift": null, "title": "Network I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "bytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -967,12 +1029,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -980,7 +1036,6 @@ }, "id": 17, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "alignAsTable": false, "avg": false, @@ -1020,6 +1075,7 @@ ], "interval": "", "measurement": "haproxy_frontend_response_1xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_1xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -1068,6 +1124,7 @@ } ], "measurement": "haproxy_frontend_response_2xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_2xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -1116,6 +1173,7 @@ } ], "measurement": "haproxy_frontend_response_3xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_3xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -1164,6 +1222,7 @@ } ], "measurement": "haproxy_frontend_response_4xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_4xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval)", "rawQuery": true, "refId": "D", @@ -1212,6 +1271,7 @@ } ], "measurement": "haproxy_frontend_response_5xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_5xx\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "E", @@ -1260,6 +1320,7 @@ } ], "measurement": "haproxy_frontend_response_other", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_response_other\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "F", @@ -1298,15 +1359,30 @@ "timeShift": null, "title": "HTTP responses", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "none" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "none", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1317,12 +1393,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1330,7 +1400,6 @@ }, "id": 4, "interval": ">60s", - "leftYAxisLabel": "sessions", "legend": { "avg": false, "current": false, @@ -1374,6 +1443,7 @@ ], "hide": false, "measurement": "haproxy_frontend_session_current", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_frontend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1427,6 +1497,7 @@ "hide": false, "interval": "", "measurement": "haproxy_frontend_session_current", + "policy": "default", "query": "SELECT max(\"value\") FROM \"haproxy_frontend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1479,6 +1550,7 @@ ], "interval": "", "measurement": "haproxy_frontend_session_current", + "policy": "default", "query": "SELECT min(\"value\") FROM \"haproxy_frontend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -1515,15 +1587,30 @@ "timeShift": null, "title": "Sessions", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "sessions", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1534,12 +1621,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1547,7 +1628,6 @@ }, "id": 18, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -1585,6 +1665,7 @@ } ], "measurement": "haproxy_frontend_error_requests", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_error_requests\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -1633,6 +1714,7 @@ } ], "measurement": "haproxy_frontend_denied_requests", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_denied_requests\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -1682,6 +1764,7 @@ } ], "measurement": "haproxy_frontend_denied_responses", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_frontend_denied_responses\" WHERE \"hostname\" =~ /$server/ AND \"frontend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -1721,15 +1804,30 @@ "timeShift": null, "title": "Errors", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1751,12 +1849,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1802,6 +1894,7 @@ ], "interval": "", "measurement": "haproxy_backend_bytes_in", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_bytes_in\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -1852,6 +1945,7 @@ "hide": false, "interval": "", "measurement": "haproxy_backend_bytes_out", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_bytes_out\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval)", "rawQuery": true, "refId": "B", @@ -1890,15 +1984,29 @@ "timeShift": null, "title": "Network I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "bytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1909,12 +2017,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1922,7 +2024,6 @@ }, "id": 20, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "alignAsTable": false, "avg": false, @@ -1962,6 +2063,7 @@ ], "interval": "", "measurement": "haproxy_backend_response_1xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_1xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -2010,6 +2112,7 @@ } ], "measurement": "haproxy_backend_response_2xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_2xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -2058,6 +2161,7 @@ } ], "measurement": "haproxy_backend_response_3xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_3xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -2106,6 +2210,7 @@ } ], "measurement": "haproxy_backend_response_4xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_4xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "D", @@ -2154,6 +2259,7 @@ } ], "measurement": "haproxy_backend_response_5xx", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_5xx\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "E", @@ -2202,6 +2308,7 @@ } ], "measurement": "haproxy_backend_response_other", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_response_other\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "F", @@ -2240,15 +2347,30 @@ "timeShift": null, "title": "HTTP responses", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "none" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "none", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2259,12 +2381,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2272,7 +2388,6 @@ }, "id": 21, "interval": ">60s", - "leftYAxisLabel": "sessions", "legend": { "avg": false, "current": false, @@ -2316,6 +2431,7 @@ ], "hide": false, "measurement": "haproxy_backend_session_current", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"haproxy_backend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2369,6 +2485,7 @@ "hide": false, "interval": "", "measurement": "haproxy_backend_session_current", + "policy": "default", "query": "SELECT max(\"value\") FROM \"haproxy_backend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2421,6 +2538,7 @@ ], "interval": "", "measurement": "haproxy_backend_session_current", + "policy": "default", "query": "SELECT min(\"value\") FROM \"haproxy_backend_session_current\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -2457,15 +2575,30 @@ "timeShift": null, "title": "Sessions", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "sessions", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2476,12 +2609,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2489,7 +2616,6 @@ }, "id": 14, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -2525,6 +2651,7 @@ } ], "measurement": "haproxy_backend_error_connection", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_error_connection\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -2571,6 +2698,7 @@ } ], "measurement": "haproxy_backend_error_responses", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_error_responses\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -2620,6 +2748,7 @@ ], "interval": "", "measurement": "haproxy_backend_denied_requests", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_denied_requests\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -2670,6 +2799,7 @@ ], "interval": "", "measurement": "haproxy_backend_denied_responses", + "policy": "default", "query": "SELECT derivative(first(value),1s) FROM \"haproxy_backend_denied_responses\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /$service/ AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "D", @@ -2709,15 +2839,30 @@ "timeShift": null, "title": "Errors", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2725,7 +2870,7 @@ "title": "Backend" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -2736,11 +2881,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2749,11 +2895,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "server", "options": [], "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2762,11 +2909,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "service", "options": [], "query": "show tag values from haproxy_backend_servers with key = backend where hostname = '$server' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2810,5 +2958,5 @@ }, "timezone": "browser", "title": "HAProxy", - "version": 3 -} + "version": 2 +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json index 09e9a9a7..40613ba3 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -84,6 +91,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'heat' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -117,7 +125,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -168,6 +176,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 13, "interval": "> 60s", "links": [], @@ -210,6 +225,7 @@ "groupby_field": "", "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -244,7 +260,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "HTTP 5xx errors", "type": "singlestat", "valueFontSize": "80%", @@ -265,12 +281,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -317,6 +327,7 @@ ], "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "A", @@ -366,6 +377,7 @@ ], "interval": "", "measurement": "openstack_heat_http_responses", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "B", @@ -415,6 +427,7 @@ ], "interval": "", "measurement": "openstack_heat_http_responses", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "C", @@ -464,6 +477,7 @@ ], "interval": "", "measurement": "openstack_heat_http_responses", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": true, "refId": "D", @@ -502,15 +516,29 @@ "timeShift": null, "title": "HTTP response time on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -521,12 +549,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": 1, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -535,7 +557,6 @@ }, "id": 9, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -579,6 +600,7 @@ ], "groupByTags": [], "measurement": "openstack_check_api", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'heat-api' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -616,15 +638,30 @@ "timeShift": null, "title": "API Availability", "tooltip": { + "msResolution": false, "shared": false, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": false, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "", + "logBase": 1, + "max": 1, + "min": 0, + "show": false + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": false + } ] }, { @@ -635,12 +672,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -696,6 +727,7 @@ ], "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '2xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -752,6 +784,7 @@ "hide": false, "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '1xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -808,6 +841,7 @@ "hide": false, "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '3xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -864,6 +898,7 @@ "hide": false, "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '4xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -920,6 +955,7 @@ "hide": false, "interval": "", "measurement": "openstack_heat_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_heat_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -958,15 +994,29 @@ "timeShift": null, "title": "Number of HTTP responses on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1003,6 +1053,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 52, "interval": "> 60s", "links": [], @@ -1042,6 +1099,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'heat-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1079,7 +1137,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "OpenStack", "type": "singlestat", "valueFontSize": "80%", @@ -1105,6 +1163,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 53, "interval": "> 60s", "links": [], @@ -1144,6 +1209,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'heat-cfn-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1181,7 +1247,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "CloudFormation", "type": "singlestat", "valueFontSize": "80%", @@ -1231,6 +1297,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 59, "interval": "> 60s", "links": [], @@ -1270,6 +1343,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'heat-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1307,7 +1381,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1333,6 +1407,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 60, "interval": "> 60s", "links": [], @@ -1372,6 +1453,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'heat-cfn-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1409,7 +1491,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1439,7 +1521,7 @@ "title": "Heat API" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -1450,11 +1532,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1463,11 +1546,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": true, "name": "server", "options": [], "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1511,5 +1595,5 @@ }, "timezone": "browser", "title": "Heat", - "version": 4 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json index 9bc0945a..bd915641 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json @@ -22,12 +22,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": 100, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -84,6 +78,7 @@ } ], "measurement": "cpu_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_user\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -138,6 +133,7 @@ } ], "measurement": "cpu_idle", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_idle\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "B", @@ -193,6 +189,7 @@ } ], "measurement": "cpu_interrupt", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_interrupt\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "C", @@ -248,6 +245,7 @@ } ], "measurement": "cpu_nice", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_nice\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "D", @@ -303,6 +301,7 @@ } ], "measurement": "cpu_system", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_system\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "E", @@ -358,6 +357,7 @@ } ], "measurement": "cpu_steal", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_steal\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "F", @@ -413,6 +413,7 @@ } ], "measurement": "cpu_wait", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_wait\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "G", @@ -446,15 +447,29 @@ "timeShift": null, "title": "CPU", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": 100, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -467,14 +482,8 @@ "datasource": null, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, "max": null, "min": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -483,7 +492,6 @@ "id": 9, "interactive": true, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -539,6 +547,7 @@ ], "interval": "", "measurement": "memory_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_used\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -595,6 +604,7 @@ ], "interval": "", "measurement": "memory_buffered", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_buffered\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "B", @@ -651,6 +661,7 @@ ], "interval": "", "measurement": "memory_cached", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_cached\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "C", @@ -707,6 +718,7 @@ ], "interval": "", "measurement": "memory_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_free\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "D", @@ -741,16 +753,31 @@ "timezone": "browser", "title": "Memory", "tooltip": { + "msResolution": false, "query_as_alias": true, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -766,6 +793,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 10, "interval": ">60s", "links": [], @@ -810,6 +844,7 @@ } ], "measurement": "fs_space_percent_free", + "policy": "default", "query": "SELECT last(\"value\") FROM \"fs_space_percent_free\" WHERE \"hostname\" = '$hostname' AND \"fs\" = '/var/lib/nova' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -844,7 +879,7 @@ ] } ], - "thresholds": "5,10,15", + "thresholds": "10,15", "title": "Available ephemeral storage", "type": "singlestat", "valueFontSize": "80%", @@ -879,6 +914,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 11, "interval": "> 60s", "isNew": true, @@ -915,6 +957,7 @@ } ], "measurement": "openstack_nova_running_instances", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_nova_running_instances\" WHERE \"hostname\" = '$hostname' AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -963,12 +1006,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1016,6 +1053,7 @@ } ], "measurement": "openstack_nova_free_vcpus", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_free_vcpus\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "B", @@ -1060,6 +1098,7 @@ } ], "measurement": "openstack_nova_used_vcpus", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_used_vcpus\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -1091,15 +1130,29 @@ "timeShift": null, "title": "Virtual CPUs", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1110,12 +1163,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1163,6 +1210,7 @@ } ], "measurement": "openstack_nova_free_ram", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_free_ram\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "B", @@ -1207,6 +1255,7 @@ } ], "measurement": "openstack_nova_used_ram", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_used_ram\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -1238,15 +1287,29 @@ "timeShift": null, "title": "Virtual RAM", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "mbytes", - "mbytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "mbytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "mbytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1257,12 +1320,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1310,6 +1367,7 @@ } ], "measurement": "openstack_nova_free_disk", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_free_disk\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "B", @@ -1354,6 +1412,7 @@ } ], "measurement": "openstack_nova_used_disk", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_used_disk\" WHERE \"hostname\" =~ /$hostname$/ AND $timeFilter GROUP BY time($interval) fill(previous)", "rawQuery": false, "refId": "A", @@ -1385,15 +1444,29 @@ "timeShift": null, "title": "Virtual Disk", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "gbytes", - "gbytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "gbytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "gbytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1413,12 +1486,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": 100, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": 100, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1426,7 +1493,6 @@ }, "id": 1, "interval": ">60s", - "leftYAxisLabel": "%", "legend": { "avg": false, "current": false, @@ -1444,7 +1510,6 @@ "pointradius": 5, "points": false, "renderer": "flot", - "rightYAxisLabel": "%", "seriesOverrides": [ { "alias": "/virt_vcpu_time/", @@ -1474,6 +1539,7 @@ } ], "measurement": "virt_cpu_time", + "policy": "default", "query": "SELECT mean(\"value\") /10000000 FROM \"virt_cpu_time\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND $timeFilter GROUP BY time($interval) fill(none)", "rawQuery": false, "refId": "A", @@ -1536,6 +1602,7 @@ } ], "measurement": "virt_vcpu_time", + "policy": "default", "query": "SELECT mean(\"value\") /10000000 FROM \"virt_vcpu_time\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND $timeFilter GROUP BY time($interval), \"vcpu_number\" fill(none)", "rawQuery": false, "refId": "B", @@ -1579,15 +1646,31 @@ "timeShift": null, "title": "CPU", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "%", + "logBase": 1, + "max": 100, + "min": 0, + "show": true + }, + { + "format": "short", + "label": "%", + "logBase": 1, + "max": 100, + "min": 0, + "show": true + } ] }, { @@ -1598,12 +1681,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1611,7 +1688,6 @@ }, "id": 2, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1629,7 +1705,6 @@ "pointradius": 5, "points": false, "renderer": "flot", - "rightYAxisLabel": "", "seriesOverrides": [], "span": 6, "stack": false, @@ -1653,6 +1728,7 @@ } ], "measurement": "virt_memory_total", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"virt_memory_total\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND $timeFilter GROUP BY time($interval) fill(none)", "rawQuery": false, "refId": "A", @@ -1690,15 +1766,31 @@ "timeShift": null, "title": "Memory", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -1709,12 +1801,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1762,6 +1848,7 @@ } ], "measurement": "virt_disk_octets_read", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"virt_disk_octets_read\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"device\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval) fill(none)", "rawQuery": false, "refId": "A", @@ -1818,6 +1905,7 @@ } ], "measurement": "virt_disk_octets_write", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"virt_disk_octets_write\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"device\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval) fill(none)", "rawQuery": false, "refId": "B", @@ -1861,15 +1949,29 @@ "timeShift": null, "title": "Disk I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1880,12 +1982,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1933,6 +2029,7 @@ } ], "measurement": "virt_if_octets_rx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"virt_if_octets_rx\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"interface\" =~ /$interface$/ AND $timeFilter GROUP BY time($interval) fill(none)", "rawQuery": false, "refId": "A", @@ -1989,6 +2086,7 @@ } ], "measurement": "virt_if_octets_tx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"virt_if_octets_tx\" WHERE \"hostname\" =~ /$hostname$/ AND \"instance_id\" =~ /$instance_id$/ AND \"interface\" =~ /$interface$/ AND $timeFilter GROUP BY time($interval) fill(none)", "rawQuery": false, "refId": "B", @@ -2032,15 +2130,29 @@ "timeShift": null, "title": "Network I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2048,7 +2160,7 @@ "title": "Virtual instance" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -2058,11 +2170,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2071,13 +2184,14 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "multi": false, "multiFormat": "glob", "name": "hostname", "options": [], "query": "show tag values from openstack_nova_running_instances with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2086,13 +2200,14 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "multi": false, "multiFormat": "glob", "name": "instance_id", "options": [], "query": "show tag values from virt_cpu_time with key = instance_id where hostname = '$hostname' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "type": "query" }, @@ -2100,13 +2215,14 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "multi": false, "multiFormat": "glob", "name": "disk", "options": [], "query": "show tag values from virt_disk_octets_read with key = device where hostname = '$hostname' and instance_id = '$instance_id' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2115,13 +2231,14 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "multi": false, "multiFormat": "glob", "name": "interface", "options": [], "query": "show tag values from virt_if_octets_rx with key = interface where hostname = '$hostname' and instance_id = '$instance_id' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "type": "query" } @@ -2160,4 +2277,4 @@ "timezone": "browser", "title": "Hypervisor", "version": 2 -} +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json index f469fe33..0e64c8b2 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json @@ -41,6 +41,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "isNew": true, @@ -77,6 +84,7 @@ } ], "measurement": "influxdb_httpd_failed_auths", + "policy": "default", "query": "SELECT last(\"value\") FROM \"influxdb_httpd_failed_auths\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -124,12 +132,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -138,7 +140,6 @@ "id": 1, "interval": "> 60s", "isNew": true, - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -179,6 +180,7 @@ } ], "measurement": "influxdb_httpd_query_requests", + "policy": "default", "query": "SELECT derivative(last(\"value\"), 1s) FROM \"influxdb_httpd_query_requests\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "A", "resultFormat": "time_series", @@ -228,6 +230,7 @@ } ], "measurement": "influxdb_httpd_write_requests", + "policy": "default", "query": "SELECT derivative(last(\"value\"), 1s) FROM \"influxdb_httpd_write_requests\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "B", @@ -278,6 +281,7 @@ } ], "measurement": "influxdb_httpd_ping_requests", + "policy": "default", "query": "SELECT derivative(last(\"value\"), 1s) FROM \"influxdb_httpd_ping_requests\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "C", @@ -315,15 +319,30 @@ "timeShift": null, "title": "Requests", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -334,12 +353,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -348,7 +361,6 @@ "id": 2, "interval": "> 60s", "isNew": true, - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -390,6 +402,7 @@ ], "hide": false, "measurement": "influxdb_httpd_query_response_bytes", + "policy": "default", "query": "SELECT derivative(mean(\"value\"), 1s) FROM \"influxdb_httpd_query_response_bytes\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "A", "resultFormat": "time_series", @@ -439,6 +452,7 @@ } ], "measurement": "influxdb_httpd_write_request_bytes", + "policy": "default", "query": "SELECT derivative(mean(\"value\"), 1s) FROM \"influxdb_httpd_write_request_bytes\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "B", "resultFormat": "time_series", @@ -475,15 +489,30 @@ "timeShift": null, "title": "I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -508,6 +537,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 4, "interval": "> 60s", "isNew": true, @@ -544,6 +580,7 @@ } ], "measurement": "influxdb_go_routines", + "policy": "default", "query": "SELECT last(\"value\") FROM \"influxdb_go_routines\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "A", "resultFormat": "time_series", @@ -591,12 +628,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -605,7 +636,6 @@ "id": 7, "interval": "> 60s", "isNew": true, - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -646,6 +676,7 @@ } ], "measurement": "influxdb_memory_mallocs", + "policy": "default", "query": "SELECT derivative(mean(\"value\"), 1s) FROM \"influxdb_memory_mallocs\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "A", "resultFormat": "time_series", @@ -695,6 +726,7 @@ } ], "measurement": "influxdb_memory_frees", + "policy": "default", "query": "SELECT derivative(mean(\"value\"), 1s) FROM \"influxdb_memory_frees\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "B", "resultFormat": "time_series", @@ -744,6 +776,7 @@ } ], "measurement": "influxdb_memory_lookups", + "policy": "default", "query": "SELECT derivative(mean(\"value\"), 1s) FROM \"influxdb_memory_lookups\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "C", "resultFormat": "time_series", @@ -780,15 +813,30 @@ "timeShift": null, "title": "Memory operations", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -799,12 +847,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -813,7 +855,6 @@ "id": 3, "interval": "> 60s", "isNew": true, - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -854,6 +895,7 @@ } ], "measurement": "influxdb_memory_system", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"influxdb_memory_system\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "A", "resultFormat": "time_series", @@ -897,6 +939,7 @@ } ], "measurement": "influxdb_memory_alloc", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"influxdb_memory_alloc\" WHERE \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(null)", "refId": "B", "resultFormat": "time_series", @@ -927,15 +970,30 @@ "timeShift": null, "title": "Memory usage", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -960,6 +1018,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 9, "interval": "> 60s", "links": [], @@ -991,6 +1056,7 @@ } ], "measurement": "lma_components_threads", + "policy": "default", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"service\" = 'influxd' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval)", "refId": "A", "resultFormat": "time_series", @@ -1044,12 +1110,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1100,6 +1160,7 @@ } ], "measurement": "lma_components_memory_rss", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"service\" = 'influxd' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -1136,15 +1197,29 @@ "timeShift": null, "title": "Resident Set Size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1155,12 +1230,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1168,7 +1237,6 @@ }, "id": 10, "interval": "> 60s", - "leftYAxisLabel": "bytes/sec", "legend": { "alignAsTable": false, "avg": false, @@ -1212,6 +1280,7 @@ } ], "measurement": "lma_components_disk_bytes_read", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"service\" = 'influxd' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -1263,6 +1332,7 @@ } ], "measurement": "lma_components_disk_bytes_write", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"service\" = 'influxd' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "B", "resultFormat": "time_series", @@ -1299,15 +1369,30 @@ "timeShift": null, "title": "Disk I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "bytes/sec", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1318,12 +1403,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1373,6 +1452,7 @@ } ], "measurement": "lma_components_cputime_syst", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"service\" = 'influxd' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -1424,6 +1504,7 @@ } ], "measurement": "lma_components_cputime_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"service\" = 'influxd' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "B", "resultFormat": "time_series", @@ -1460,15 +1541,29 @@ "timeShift": null, "title": "CPU usage", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1484,6 +1579,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 12, "interval": null, "links": [], @@ -1513,6 +1615,7 @@ } ], "measurement": "fs_space_percent_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_percent_free\" WHERE \"fs\" = '/var/lib/influxdb' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval)", "refId": "A", "resultFormat": "time_series", @@ -1566,12 +1669,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1619,6 +1716,7 @@ } ], "measurement": "fs_space_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_free\" WHERE \"fs\" = '/var/lib/influxdb' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1669,6 +1767,7 @@ } ], "measurement": "fs_space_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_used\" WHERE \"fs\" = '/var/lib/influxdb' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1719,6 +1818,7 @@ } ], "measurement": "fs_space_reserved", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_reserved\" WHERE \"fs\" = '/var/lib/influxdb' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -1756,15 +1856,29 @@ "timeShift": null, "title": "Disk usage on /var/lib/influxdb", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1788,6 +1902,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 14, "interval": "> 60s", "links": [], @@ -1819,6 +1940,7 @@ } ], "measurement": "lma_components_threads", + "policy": "default", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"service\" = 'grafana-server' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval)", "refId": "A", "resultFormat": "time_series", @@ -1872,12 +1994,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1928,6 +2044,7 @@ } ], "measurement": "lma_components_memory_rss", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"service\" = 'grafana-server' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -1964,15 +2081,29 @@ "timeShift": null, "title": "Resident Set Size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1983,12 +2114,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1996,7 +2121,6 @@ }, "id": 16, "interval": "> 60s", - "leftYAxisLabel": "bytes/sec", "legend": { "alignAsTable": false, "avg": false, @@ -2040,6 +2164,7 @@ } ], "measurement": "lma_components_disk_bytes_read", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"service\" = 'grafana-server' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -2091,6 +2216,7 @@ } ], "measurement": "lma_components_disk_bytes_write", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"service\" = 'grafana-server' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "B", "resultFormat": "time_series", @@ -2127,15 +2253,30 @@ "timeShift": null, "title": "Disk I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "bytes/sec", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2146,12 +2287,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2201,6 +2336,7 @@ } ], "measurement": "lma_components_cputime_syst", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"service\" = 'grafana-server' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "A", "resultFormat": "time_series", @@ -2252,6 +2388,7 @@ } ], "measurement": "lma_components_cputime_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"service\" = 'grafana-server' AND \"hostname\" =~ /$server$/ AND $timeFilter GROUP BY time($interval) fill(0)", "refId": "B", "resultFormat": "time_series", @@ -2288,15 +2425,29 @@ "timeShift": null, "title": "CPU usage", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2304,7 +2455,7 @@ "title": "Grafana" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -2314,13 +2465,14 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "multi": false, "multiFormat": "glob", "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2329,13 +2481,14 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "multi": false, "multiFormat": "glob", "name": "server", "options": [], "query": "show tag values from influxdb_go_routines with key=\"hostname\" where environment_label = '$environment' ", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2374,5 +2527,5 @@ }, "timezone": "browser", "title": "InfluxDB", - "version": 7 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json index 96b7efe1..b565e972 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -84,6 +91,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'keystone' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -117,7 +125,7 @@ ] } ], - "thresholds": "0,1,2", + "thresholds": "1,2", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -163,6 +171,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 13, "interval": "> 60s", "links": [], @@ -205,6 +220,7 @@ "groupby_field": "", "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -239,7 +255,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "HTTP 5xx errors", "type": "singlestat", "valueFontSize": "80%", @@ -260,12 +276,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -320,6 +330,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -376,6 +387,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -426,6 +438,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "C", @@ -482,6 +495,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -520,15 +534,29 @@ "timeShift": null, "title": "HTTP response time on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -539,12 +567,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": 1, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -553,7 +575,6 @@ }, "id": 9, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -597,6 +618,7 @@ ], "groupByTags": [], "measurement": "openstack_check_api", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'keystone-public-api' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -634,15 +656,30 @@ "timeShift": null, "title": "API Availability", "tooltip": { + "msResolution": false, "shared": false, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": false, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "", + "logBase": 1, + "max": 1, + "min": 0, + "show": false + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": false + } ] }, { @@ -653,12 +690,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -708,6 +739,7 @@ ], "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '2xx' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -758,6 +790,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '1xx' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "B", @@ -808,6 +841,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '3xx' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "C", @@ -858,6 +892,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '4xx' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "D", @@ -908,6 +943,7 @@ "hide": false, "interval": "", "measurement": "openstack_keystone_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_keystone_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "E", @@ -946,15 +982,29 @@ "timeShift": null, "title": "Number of HTTP responses on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -991,6 +1041,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 16, "interval": ">60s", "links": [], @@ -1029,6 +1086,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'keystone-public-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1092,6 +1150,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 17, "interval": ">60s", "links": [], @@ -1130,6 +1195,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'keystone-admin-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1217,6 +1283,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 20, "interval": ">60s", "links": [], @@ -1255,6 +1328,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'keystone-public-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1292,7 +1366,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1318,6 +1392,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 21, "interval": ">60s", "links": [], @@ -1356,6 +1437,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'keystone-admin-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1393,7 +1475,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1440,6 +1522,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 12, "interval": "> 60s", "links": [], @@ -1478,6 +1567,7 @@ ], "groupByTags": [], "measurement": "openstack_keystone_users", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_keystone_users\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1532,12 +1622,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1545,7 +1629,6 @@ }, "id": 23, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1583,6 +1666,7 @@ } ], "measurement": "openstack_keystone_users", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_keystone_users\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -1620,15 +1704,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1644,6 +1743,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 11, "interval": "> 60s", "links": [], @@ -1682,6 +1788,7 @@ ], "groupByTags": [], "measurement": "openstack_keystone_tenants", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_keystone_tenants\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1736,12 +1843,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1749,7 +1850,6 @@ }, "id": 24, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1793,6 +1893,7 @@ ], "groupByTags": [], "measurement": "openstack_keystone_tenants", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_keystone_tenants\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'enabled' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1829,15 +1930,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1845,7 +1961,7 @@ "title": "Resources" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -1856,11 +1972,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1869,11 +1986,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": true, "name": "server", "options": [], "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1917,5 +2035,5 @@ }, "timezone": "browser", "title": "Keystone", - "version": 4 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json index f4883bf9..587f9472 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json @@ -4,7 +4,7 @@ }, "editable": true, "hideControls": false, - "id": 6, + "id": null, "links": [], "originalTitle": "LMA self-monitoring", "refresh": "1m", @@ -27,6 +27,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 2, "interval": "> 60s", "links": [], @@ -58,6 +65,7 @@ } ], "measurement": "lma_components_threads", + "policy": "default", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -110,12 +118,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -166,6 +168,7 @@ } ], "measurement": "lma_components_memory_rss", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -201,15 +204,29 @@ "timeShift": null, "title": "Resident Set Size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -220,12 +237,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -233,7 +244,6 @@ }, "id": 3, "interval": "> 60s", - "leftYAxisLabel": "bytes/sec", "legend": { "alignAsTable": false, "avg": false, @@ -277,6 +287,7 @@ } ], "measurement": "lma_components_disk_bytes_read", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -327,6 +338,7 @@ } ], "measurement": "lma_components_disk_bytes_write", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -362,15 +374,30 @@ "timeShift": null, "title": "Disk I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "bytes/sec", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -381,12 +408,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -436,6 +457,7 @@ } ], "measurement": "lma_components_cputime_syst", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -486,6 +508,7 @@ } ], "measurement": "lma_components_cputime_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"hostname\" = '$node' AND \"service\" = 'hekad' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -521,15 +544,29 @@ "timeShift": null, "title": "CPU usage", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -549,12 +586,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -562,7 +593,6 @@ }, "id": 60, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "alignAsTable": false, "avg": false, @@ -652,11 +682,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -667,12 +711,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -680,7 +718,6 @@ }, "id": 61, "interval": "> 60s", - "leftYAxisLabel": "per message", "legend": { "avg": false, "current": false, @@ -770,11 +807,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ns", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ns", + "label": "per message", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -785,12 +836,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -798,7 +843,6 @@ }, "id": 62, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "alignAsTable": false, "avg": false, @@ -892,11 +936,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -916,12 +974,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -929,7 +981,6 @@ }, "id": 63, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -1015,11 +1066,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1030,12 +1095,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1043,7 +1102,6 @@ }, "id": 64, "interval": "> 60s", - "leftYAxisLabel": "per message", "legend": { "avg": false, "current": false, @@ -1133,11 +1191,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ns", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ns", + "label": "per message", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1148,12 +1220,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1161,7 +1227,6 @@ }, "id": 65, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "alignAsTable": false, "avg": false, @@ -1255,11 +1320,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1270,12 +1349,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1283,7 +1356,6 @@ }, "id": 66, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "alignAsTable": false, "avg": false, @@ -1373,11 +1445,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1388,12 +1474,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1401,7 +1481,6 @@ }, "id": 67, "interval": "> 60s", - "leftYAxisLabel": "per message", "legend": { "avg": false, "current": false, @@ -1491,11 +1570,25 @@ "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ns", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "ns", + "label": "per message", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1520,6 +1613,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 42, "interval": "> 60s", "links": [], @@ -1551,6 +1651,7 @@ } ], "measurement": "lma_components_threads", + "policy": "default", "query": "SELECT last(\"value\") FROM \"lma_components_threads\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval)", "rawQuery": false, "refId": "A", @@ -1603,12 +1704,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1659,6 +1754,7 @@ } ], "measurement": "lma_components_memory_rss", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_memory_rss\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1694,15 +1790,29 @@ "timeShift": null, "title": "Resident Set Size", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1713,12 +1823,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1726,7 +1830,6 @@ }, "id": 44, "interval": "> 60s", - "leftYAxisLabel": "bytes/sec", "legend": { "alignAsTable": false, "avg": false, @@ -1770,6 +1873,7 @@ } ], "measurement": "lma_components_disk_bytes_read", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_read\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1820,6 +1924,7 @@ } ], "measurement": "lma_components_disk_bytes_write", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_disk_bytes_write\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1855,15 +1960,30 @@ "timeShift": null, "title": "Disk I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "bytes/sec", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1874,12 +1994,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1929,6 +2043,7 @@ } ], "measurement": "lma_components_cputime_syst", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_syst\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1979,6 +2094,7 @@ } ], "measurement": "lma_components_cputime_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"lma_components_cputime_user\" WHERE \"hostname\" = '$node' AND \"service\" = 'collectd' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2014,15 +2130,29 @@ "timeShift": null, "title": "CPU usage", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2030,7 +2160,7 @@ "title": "Collectd" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -2041,11 +2171,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2054,11 +2185,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "node", "options": [], "query": "show tag values from lma_components_threads with key = \"hostname\" where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -2102,5 +2234,5 @@ }, "timezone": "browser", "title": "LMA self-monitoring", - "version": 4 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json index 764c58cc..a17cb374 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json @@ -27,6 +27,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 1, "interval": "> 60s", "links": [ @@ -76,6 +83,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'cinder' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -109,7 +117,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Cinder", "type": "singlestat", "valueFontSize": "50%", @@ -160,6 +168,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 2, "interval": "> 60s", "links": [ @@ -209,6 +224,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'keystone' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -242,7 +258,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Keystone", "type": "singlestat", "valueFontSize": "50%", @@ -293,6 +309,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 3, "interval": "> 60s", "links": [ @@ -342,6 +365,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'glance' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -375,7 +399,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Glance", "type": "singlestat", "valueFontSize": "50%", @@ -426,6 +450,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 4, "interval": "> 60s", "links": [ @@ -475,6 +506,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'heat' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -508,7 +540,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Heat", "type": "singlestat", "valueFontSize": "50%", @@ -559,6 +591,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 23, "interval": "> 60s", "links": [ @@ -608,6 +647,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'neutron' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -641,7 +681,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Neutron", "type": "singlestat", "valueFontSize": "50%", @@ -692,6 +732,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 5, "interval": "> 60s", "links": [ @@ -741,6 +788,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'nova' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -774,7 +822,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Nova", "type": "singlestat", "valueFontSize": "50%", @@ -837,6 +885,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 16, "interval": ">60s", "links": [ @@ -884,6 +939,7 @@ "groupByTags": [], "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'rabbitmq' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -917,7 +973,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "RabbitMQ", "type": "singlestat", "valueFontSize": "50%", @@ -968,6 +1024,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 15, "interval": ">60s", "links": [ @@ -1015,6 +1078,7 @@ "groupByTags": [], "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'mysql' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1048,7 +1112,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "MySQL", "type": "singlestat", "valueFontSize": "50%", @@ -1099,6 +1163,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 18, "interval": ">60s", "links": [ @@ -1147,6 +1218,7 @@ "groupByTags": [], "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'apache' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1180,7 +1252,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "Apache", "type": "singlestat", "valueFontSize": "50%", @@ -1231,6 +1303,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 10, "interval": ">60s", "links": [ @@ -1279,6 +1358,7 @@ "groupByTags": [], "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'haproxy-openstack' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1312,7 +1392,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "haproxy", "type": "singlestat", "valueFontSize": "50%", @@ -1363,6 +1443,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 17, "interval": ">60s", "links": [ @@ -1411,6 +1498,7 @@ "groupByTags": [], "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"cluster_name\" = 'memcached' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1444,7 +1532,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "memcached", "type": "singlestat", "valueFontSize": "50%", @@ -1499,12 +1587,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1555,6 +1637,7 @@ ], "groupByTags": [], "measurement": "openstack_nova_total_free_vcpus", + "policy": "default", "query": "SELECT min(\"value\") FROM \"openstack_nova_total_free_vcpus\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1603,6 +1686,7 @@ ], "groupByTags": [], "measurement": "openstack_nova_total_used_vcpus", + "policy": "default", "query": "SELECT max(\"value\") FROM \"openstack_nova_total_used_vcpus\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1635,15 +1719,29 @@ "timeShift": null, "title": "Number of VCPUs", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1654,12 +1752,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1667,7 +1759,6 @@ }, "id": 12, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1711,6 +1802,7 @@ ], "groupByTags": [], "measurement": "openstack_nova_total_free_ram", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_total_free_ram\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1759,6 +1851,7 @@ ], "groupByTags": [], "measurement": "openstack_nova_total_used_ram", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_total_used_ram\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1791,15 +1884,30 @@ "timeShift": null, "title": "RAM", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "mbytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1810,12 +1918,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1866,6 +1968,7 @@ ], "groupByTags": [], "measurement": "openstack_nova_total_free_disk", + "policy": "default", "query": "SELECT min(\"value\") FROM \"openstack_nova_total_free_disk\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1914,6 +2017,7 @@ ], "groupByTags": [], "measurement": "openstack_nova_total_used_disk", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"openstack_nova_total_used_disk\" WHERE $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1946,15 +2050,29 @@ "timeShift": null, "title": "Disk", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "gbytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "gbytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1974,12 +2092,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": 100, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2030,6 +2142,7 @@ ], "groupByTags": [], "measurement": "cpu_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_user\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2077,6 +2190,7 @@ ], "groupByTags": [], "measurement": "cpu_idle", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_idle\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2125,6 +2239,7 @@ ], "groupByTags": [], "measurement": "cpu_interrupt", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_interrupt\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -2173,6 +2288,7 @@ ], "groupByTags": [], "measurement": "cpu_nice", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_nice\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -2221,6 +2337,7 @@ ], "groupByTags": [], "measurement": "cpu_system", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_system\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -2269,6 +2386,7 @@ ], "groupByTags": [], "measurement": "cpu_steal", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_steal\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "F", @@ -2317,6 +2435,7 @@ ], "groupByTags": [], "measurement": "cpu_wait", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_wait\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "G", @@ -2349,15 +2468,29 @@ "timeShift": null, "title": "CPU on $controller", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": 100, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2369,14 +2502,8 @@ "datasource": null, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, "max": null, "min": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2385,7 +2512,6 @@ "id": 21, "interactive": true, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -2435,6 +2561,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_used\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2484,6 +2611,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_buffered", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_buffered\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2533,6 +2661,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_cached", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_cached\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -2582,6 +2711,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_free\" WHERE \"hostname\" = '$controller' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -2615,16 +2745,31 @@ "timezone": "browser", "title": "Memory on $controller", "tooltip": { + "msResolution": false, "query_as_alias": true, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2640,6 +2785,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 22, "interval": ">60s", "links": [], @@ -2678,6 +2830,7 @@ ], "groupByTags": [], "measurement": "fs_space_percent_free", + "policy": "default", "query": "SELECT last(value) FROM \"fs_space_percent_free\" WHERE \"hostname\" = '$controller' AND \"fs\" = '/' AND $timeFilter AND \"environment_label\" = '$environment'GROUP BY time($interval)", "rawQuery": true, "refId": "A", @@ -2710,7 +2863,7 @@ ] } ], - "thresholds": "5,10,15", + "thresholds": "10,15", "title": "Disk space on $controller", "type": "singlestat", "valueFontSize": "80%", @@ -2745,6 +2898,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 8, "interval": ">60s", "links": [ @@ -2791,6 +2951,7 @@ ], "groupByTags": [], "measurement": "ceph_health", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_health\" WHERE $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2819,7 +2980,7 @@ ] } ], - "thresholds": "1,2,3", + "thresholds": "2,3", "title": "Cluster", "type": "singlestat", "valueFontSize": "80%", @@ -2860,6 +3021,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 9, "interval": ">60s", "links": [], @@ -2900,6 +3068,7 @@ "groupByTags": [], "interval": "", "measurement": "ceph_pool_total_percent_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"ceph_pool_total_percent_free\" WHERE $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2954,6 +3123,13 @@ "editable": true, "error": false, "format": "short", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 26, "interval": ">60s", "links": [], @@ -2992,6 +3168,7 @@ ], "groupByTags": [], "measurement": "ceph_objects_count", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_objects_count\" WHERE $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3046,6 +3223,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 24, "interval": ">60s", "links": [], @@ -3084,6 +3268,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_up", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_up\" WHERE $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3138,6 +3323,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 25, "interval": ">60s", "links": [], @@ -3176,6 +3368,7 @@ ], "groupByTags": [], "measurement": "ceph_osd_count_down", + "policy": "default", "query": "SELECT last(\"value\") FROM \"ceph_osd_count_down\" WHERE $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3222,7 +3415,7 @@ "title": "Ceph" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -3233,11 +3426,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3246,11 +3440,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "controller", "options": [], "query": "show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3294,5 +3489,5 @@ }, "timezone": "browser", "title": "Main", - "version": 3 -} + "version": 2 +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json index 3fbe1f4e..b9b7ee3b 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json @@ -41,6 +41,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 9, "interval": "> 60s", "links": [], @@ -83,6 +90,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'memcached' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -116,7 +124,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -162,12 +170,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -175,7 +177,6 @@ }, "id": 1, "interval": ">1m", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -229,6 +230,7 @@ } ], "measurement": "memcached_items_current", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_items_current\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -261,15 +263,30 @@ "timeShift": null, "title": "Items", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -280,12 +297,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -342,6 +353,7 @@ } ], "measurement": "memcached_df_cache_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_df_cache_used\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -374,15 +386,29 @@ "timeShift": null, "title": "Cache used", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "bytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -401,12 +427,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -414,7 +434,6 @@ }, "id": 3, "interval": ">1m", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -464,6 +483,7 @@ } ], "measurement": "memcached_command_get", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_command_get\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -519,6 +539,7 @@ ], "hide": false, "measurement": "memcached_command_set", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_command_set\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "B", @@ -551,15 +572,30 @@ "timeShift": null, "title": "Get/Set rates", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -570,12 +606,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -632,6 +662,7 @@ } ], "measurement": "memcached_df_cache_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_df_cache_free\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -664,15 +695,29 @@ "timeShift": null, "title": "Cache free", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "bytes" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -694,12 +739,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": 100, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -772,6 +811,7 @@ ], "interval": "", "measurement": "memcached_percent_hitratio", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_percent_hitratio\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -805,15 +845,29 @@ "timeShift": null, "title": "Hits ratio", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "percent" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": 100, + "min": 0, + "show": true + }, + { + "format": "percent", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -827,12 +881,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -840,7 +888,6 @@ }, "id": 5, "interval": ">1m", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -897,6 +944,7 @@ "hide": false, "interval": "", "measurement": "memcached_ops_hits", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_ops_hits\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -953,6 +1001,7 @@ "hide": false, "interval": "", "measurement": "memcached_ops_misses", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_ops_misses\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "B", @@ -1007,6 +1056,7 @@ } ], "measurement": "memcached_ops_evictions", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_ops_evictions\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "C", @@ -1040,15 +1090,30 @@ "timeShift": null, "title": "Cache hits stats", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] } ], @@ -1067,12 +1132,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1141,6 +1200,7 @@ ], "interval": "", "measurement": "memcached_octets_tx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_octets_tx\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -1196,6 +1256,7 @@ ], "interval": "", "measurement": "memcached_octets_rx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_octets_rx\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "B", @@ -1228,15 +1289,29 @@ "timeShift": null, "title": "Network I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1251,12 +1326,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1314,6 +1383,7 @@ ], "interval": "", "measurement": "memcached_connections_current", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memcached_connections_current\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval), \"hostname\" fill(previous)", "rawQuery": false, "refId": "A", @@ -1346,22 +1416,36 @@ "timeShift": null, "title": "Connections", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], "title": "New row" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -1371,11 +1455,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1419,5 +1504,5 @@ }, "timezone": "browser", "title": "Memcached", - "version": 5 -} + "version": 2 +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json index 5c79e6f3..c7fa8255 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 26, "interval": "> 60s", "links": [], @@ -84,6 +91,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'mysql' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -117,7 +125,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -163,12 +171,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -176,7 +178,6 @@ }, "id": 23, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -220,6 +221,7 @@ ], "groupByTags": [], "measurement": "mysql_octets_rx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_octets_rx\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -267,6 +269,7 @@ ], "groupByTags": [], "measurement": "mysql_octets_tx", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_octets_tx\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -298,15 +301,30 @@ "timeShift": null, "title": "Network I/O", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "Bps", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -317,12 +335,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -330,7 +342,6 @@ }, "id": 24, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -374,6 +385,7 @@ ], "groupByTags": [], "measurement": "mysql_locks_immediate", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_locks_immediate\" WHERE \"environment_label\" = '$environment' AND \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -426,6 +438,7 @@ ], "groupByTags": [], "measurement": "mysql_locks_waited", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_locks_waited\" WHERE \"environment_label\" = '$environment' AND \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -462,15 +475,30 @@ "timeShift": null, "title": "Locks", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -481,12 +509,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -494,7 +516,6 @@ }, "id": 22, "interval": ">60s", - "leftYAxisLabel": "Thread Count", "legend": { "avg": false, "current": false, @@ -538,6 +559,7 @@ ], "groupByTags": [], "measurement": "mysql_threads_cached", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_threads_cached\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -585,6 +607,7 @@ ], "groupByTags": [], "measurement": "mysql_threads_connected", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_threads_connected\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -632,6 +655,7 @@ ], "groupByTags": [], "measurement": "mysql_threads_running", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_threads_running\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -663,15 +687,30 @@ "timeShift": null, "title": "Threads", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "Thread Count", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -682,12 +721,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -695,7 +728,6 @@ }, "id": 21, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -739,6 +771,7 @@ ], "groupByTags": [], "measurement": "mysql_commands", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'commit' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -791,6 +824,7 @@ ], "groupByTags": [], "measurement": "mysql_commands", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'delete' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -843,6 +877,7 @@ ], "groupByTags": [], "measurement": "mysql_commands", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'insert' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -895,6 +930,7 @@ ], "groupByTags": [], "measurement": "mysql_commands", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'select' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -947,6 +983,7 @@ ], "groupByTags": [], "measurement": "mysql_commands", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'rollback' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -999,6 +1036,7 @@ ], "groupByTags": [], "measurement": "mysql_commands", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_commands\" WHERE \"hostname\" =~ /$server/ AND \"statement\" = 'update' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "F", @@ -1035,15 +1073,30 @@ "timeShift": null, "title": "Commands", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1054,12 +1107,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1067,7 +1114,6 @@ }, "id": 25, "interval": "> 60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -1117,6 +1163,7 @@ } ], "measurement": "mysql_handler", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"mysql_handler\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval), \"handler\" fill(previous)", "rawQuery": false, "refId": "A", @@ -1149,22 +1196,37 @@ "timeShift": null, "title": "Handlers", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], "title": "MySQL" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -1175,11 +1237,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1188,11 +1251,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "server", "options": [], "query": "show tag values from mysql_commands with key = hostname where environment_label = '$environment' ", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -1237,4 +1301,4 @@ "timezone": "browser", "title": "MySQL", "version": 2 -} +} \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json index 0bc1a22a..725c1bcb 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json @@ -42,6 +42,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -84,6 +91,7 @@ "groupby_field": "", "interval": "", "measurement": "cluster_status", + "policy": "default", "query": "SELECT last(\"value\") FROM \"cluster_status\" WHERE \"environment_label\" = '$environment' AND \"cluster_name\" = 'neutron' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -117,7 +125,7 @@ ] } ], - "thresholds": "0,1,3", + "thresholds": "1,3", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -168,6 +176,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 13, "interval": "> 60s", "links": [], @@ -210,6 +225,7 @@ "groupby_field": "", "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -244,7 +260,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "HTTP 5xx errors", "type": "singlestat", "valueFontSize": "80%", @@ -265,12 +281,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -323,6 +333,7 @@ ], "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'GET' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -378,6 +389,7 @@ ], "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'POST' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -433,6 +445,7 @@ ], "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'PUT' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -488,6 +501,7 @@ ], "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT max(\"upper_90\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_method\" = 'DELETE' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -526,15 +540,29 @@ "timeShift": null, "title": "HTTP response time on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "s", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -545,12 +573,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": 1, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -559,7 +581,6 @@ }, "id": 9, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -603,6 +624,7 @@ ], "groupByTags": [], "measurement": "openstack_check_api", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_check_api\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'neutron-api' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -640,15 +662,30 @@ "timeShift": null, "title": "API Availability", "tooltip": { + "msResolution": false, "shared": false, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": false, - "y_formats": [ - "none", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "none", + "label": "", + "logBase": 1, + "max": 1, + "min": 0, + "show": false + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": false + } ] }, { @@ -659,12 +696,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -720,6 +751,7 @@ ], "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '2xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -776,6 +808,7 @@ "hide": false, "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '1xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -832,6 +865,7 @@ "hide": false, "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '3xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -888,6 +922,7 @@ "hide": false, "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '4xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -944,6 +979,7 @@ "hide": false, "interval": "", "measurement": "openstack_neutron_http_response_times", + "policy": "default", "query": "SELECT sum(\"count\") FROM \"openstack_neutron_http_response_times\" WHERE \"hostname\" =~ /$server/ AND \"http_status\" = '5xx' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -982,15 +1018,29 @@ "timeShift": null, "title": "Number of HTTP responses on $server", "tooltip": { + "msResolution": false, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -1027,6 +1077,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 30, "interval": "> 60s", "links": [], @@ -1065,6 +1122,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'neutron-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1102,7 +1160,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Neutron", "type": "singlestat", "valueFontSize": "80%", @@ -1152,6 +1210,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 33, "interval": "> 60s", "links": [], @@ -1190,6 +1255,7 @@ ], "groupByTags": [], "measurement": "haproxy_backend_servers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" = '$environment' AND \"backend\" = 'neutron-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1227,7 +1293,7 @@ ] } ], - "thresholds": "0,0,1", + "thresholds": "0,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1286,6 +1352,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 43, "interval": "> 60s", "links": [], @@ -1325,6 +1398,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'dhcp' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1364,7 +1438,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Disabled", "type": "singlestat", "valueFontSize": "80%", @@ -1390,6 +1464,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 44, "interval": "> 60s", "links": [], @@ -1429,6 +1510,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'dhcp' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1468,7 +1550,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Up", "type": "singlestat", "valueFontSize": "80%", @@ -1494,6 +1576,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 45, "interval": "> 60s", "links": [], @@ -1533,6 +1622,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'dhcp' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1572,7 +1662,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "Down", "type": "singlestat", "valueFontSize": "80%", @@ -1642,6 +1732,7 @@ } ], "measurement": "openstack_nova_service", + "policy": "default", "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'dhcp' GROUP BY time($interval), hostname", "rawQuery": true, "refId": "A", @@ -1694,6 +1785,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 48, "interval": "> 60s", "links": [], @@ -1733,6 +1831,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'l3' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1772,7 +1871,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1798,6 +1897,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 49, "interval": "> 60s", "links": [], @@ -1837,6 +1943,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'l3' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1876,7 +1983,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -1902,6 +2009,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 50, "interval": "> 60s", "links": [], @@ -1941,6 +2055,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'l3' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1980,7 +2095,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2050,6 +2165,7 @@ } ], "measurement": "openstack_neutron_agent", + "policy": "default", "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'l3' GROUP BY time($interval), hostname", "rawQuery": true, "refId": "A", @@ -2102,6 +2218,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 53, "interval": "> 60s", "links": [], @@ -2141,6 +2264,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'metadata' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2180,7 +2304,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2206,6 +2330,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 54, "interval": "> 60s", "links": [], @@ -2245,6 +2376,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'metadata' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2284,7 +2416,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2310,6 +2442,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 55, "interval": "> 60s", "links": [], @@ -2349,6 +2488,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'metadata' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2388,7 +2528,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2458,6 +2598,7 @@ } ], "measurement": "openstack_neutron_agent", + "policy": "default", "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'metadata' GROUP BY time($interval), hostname", "rawQuery": true, "refId": "A", @@ -2510,6 +2651,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 58, "interval": "> 60s", "links": [], @@ -2549,6 +2697,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'openvswitch' AND \"state\" = 'disabled' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2588,7 +2737,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2614,6 +2763,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 59, "interval": "> 60s", "links": [], @@ -2653,6 +2809,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'openvswitch' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2692,7 +2849,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2718,6 +2875,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 60, "interval": "> 60s", "links": [], @@ -2757,6 +2921,7 @@ } ], "measurement": "openstack_neutron_agents", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_agents\" WHERE \"environment_label\" = '$environment' AND \"service\" = 'openvswitch' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -2796,7 +2961,7 @@ ] } ], - "thresholds": "0,1,1", + "thresholds": "1,1", "title": "", "type": "singlestat", "valueFontSize": "80%", @@ -2866,6 +3031,7 @@ } ], "measurement": "openstack_neutron_agent", + "policy": "default", "query": "SELECT state, last(value) FROM \"openstack_neutron_agent\" WHERE $timeFilter AND \"environment_label\" = '$environment'and service = 'openvswitch' GROUP BY time($interval), hostname", "rawQuery": true, "refId": "A", @@ -2916,6 +3082,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 1, "interval": "> 60s", "links": [], @@ -2955,6 +3128,7 @@ ], "groupByTags": [], "measurement": "openstack_neutron_networks", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_networks\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3009,12 +3183,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3022,7 +3190,6 @@ }, "id": 35, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -3068,6 +3235,7 @@ "state" ], "measurement": "openstack_neutron_networks", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_networks\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3100,15 +3268,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -3124,6 +3307,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 2, "interval": "> 60s", "links": [], @@ -3162,6 +3352,7 @@ ], "groupByTags": [], "measurement": "openstack_neutron_subnets", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_subnets\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3212,12 +3403,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3225,7 +3410,6 @@ }, "id": 36, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -3269,6 +3453,7 @@ ], "groupByTags": [], "measurement": "openstack_neutron_subnets", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_subnets\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3301,15 +3486,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -3325,6 +3525,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 3, "interval": "> 60s", "links": [], @@ -3363,6 +3570,7 @@ ], "groupByTags": [], "measurement": "openstack_neutron_ports", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_ports\" WHERE \"environment_label\" = '$environment' AND \"owner\" = 'compute' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3422,12 +3630,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3435,7 +3637,6 @@ }, "id": 37, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -3481,6 +3682,7 @@ "owner" ], "measurement": "openstack_neutron_ports", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_ports\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3513,15 +3715,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -3538,6 +3755,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, "interval": "> 60s", "links": [], @@ -3576,6 +3800,7 @@ ], "groupByTags": [], "measurement": "openstack_neutron_routers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_routers\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'active' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3630,12 +3855,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3643,7 +3862,6 @@ }, "id": 38, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -3689,6 +3907,7 @@ "state" ], "measurement": "openstack_neutron_routers", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_routers\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3721,15 +3940,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -3745,6 +3979,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 41, "interval": "> 60s", "links": [], @@ -3783,6 +4024,7 @@ ], "groupByTags": [], "measurement": "openstack_neutron_floatingips", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_floatingips\" WHERE \"environment_label\" = '$environment' AND \"state\" = 'associated' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -3836,12 +4078,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3849,7 +4085,6 @@ }, "id": 39, "interval": "> 60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -3895,6 +4130,7 @@ "state" ], "measurement": "openstack_neutron_floatingips", + "policy": "default", "query": "SELECT last(\"value\") FROM \"openstack_neutron_floatingips\" WHERE \"environment_label\" = '$environment' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3927,15 +4163,30 @@ "timeShift": null, "title": "", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -3943,7 +4194,7 @@ "title": "Resources" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -3954,11 +4205,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3967,11 +4219,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": true, "name": "server", "options": [], "query": " show tag values from pacemaker_local_resource_active with key = hostname where environment_label = '$environment' ", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -4015,5 +4268,5 @@ }, "timezone": "browser", "title": "Neutron", - "version": 6 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json index 0aa0c222..cf1dfe2e 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json @@ -5462,5 +5462,5 @@ }, "timezone": "browser", "title": "Nova", - "version": 4 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json index 97b131c9..0522b6d3 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json @@ -1267,5 +1267,5 @@ }, "timezone": "browser", "title": "RabbitMQ", - "version": 3 + "version": 2 } \ No newline at end of file diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json index baea8dbd..04122f86 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json @@ -22,12 +22,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": 100, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -78,6 +72,7 @@ ], "groupByTags": [], "measurement": "cpu_user", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_user\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -125,6 +120,7 @@ ], "groupByTags": [], "measurement": "cpu_idle", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_idle\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -173,6 +169,7 @@ ], "groupByTags": [], "measurement": "cpu_interrupt", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_interrupt\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -221,6 +218,7 @@ ], "groupByTags": [], "measurement": "cpu_nice", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_nice\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -269,6 +267,7 @@ ], "groupByTags": [], "measurement": "cpu_system", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_system\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -317,6 +316,7 @@ ], "groupByTags": [], "measurement": "cpu_steal", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_steal\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "F", @@ -365,6 +365,7 @@ ], "groupByTags": [], "measurement": "cpu_wait", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"cpu_wait\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "G", @@ -397,15 +398,29 @@ "timeShift": null, "title": "CPU", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "percent", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": 100, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -417,14 +432,8 @@ "datasource": null, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, "max": null, "min": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -433,7 +442,6 @@ "id": 4, "interactive": true, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -483,6 +491,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_used\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -532,6 +541,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_buffered", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_buffered\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -581,6 +591,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_cached", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_cached\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -630,6 +641,7 @@ "groupByTags": [], "interval": "", "measurement": "memory_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"memory_free\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -663,16 +675,31 @@ "timezone": "browser", "title": "Memory", "tooltip": { + "msResolution": false, "query_as_alias": true, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -683,12 +710,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -739,6 +760,7 @@ ], "groupByTags": [], "measurement": "load_shortterm", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"load_shortterm\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -786,6 +808,7 @@ ], "groupByTags": [], "measurement": "load_midterm", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"load_midterm\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -833,6 +856,7 @@ ], "groupByTags": [], "measurement": "load_longterm", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"load_longterm\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -864,15 +888,29 @@ "timeShift": null, "title": "System load", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -883,12 +921,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": 0, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -946,6 +978,7 @@ ], "groupByTags": [], "measurement": "processes_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'blocked' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -998,6 +1031,7 @@ ], "groupByTags": [], "measurement": "processes_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'paging' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1050,6 +1084,7 @@ ], "groupByTags": [], "measurement": "processes_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'running' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -1102,6 +1137,7 @@ ], "groupByTags": [], "measurement": "processes_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'sleeping' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "D", @@ -1154,6 +1190,7 @@ ], "groupByTags": [], "measurement": "processes_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'stopped' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "E", @@ -1206,6 +1243,7 @@ ], "groupByTags": [], "measurement": "processes_count", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_count\" WHERE \"hostname\" = '$server' AND \"state\" = 'zombies' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "F", @@ -1242,15 +1280,29 @@ "timeShift": null, "title": "Processes", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": 0, + "show": true + } ] }, { @@ -1261,12 +1313,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1274,7 +1320,6 @@ }, "id": 16, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -1318,6 +1363,7 @@ ], "groupByTags": [], "measurement": "processes_fork_rate", + "policy": "default", "query": "SELECT max(\"value\") FROM \"processes_fork_rate\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1349,15 +1395,30 @@ "timeShift": null, "title": "Process fork", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1373,6 +1434,13 @@ "editable": true, "error": false, "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 26, "interval": ">60s", "links": [], @@ -1411,6 +1479,7 @@ ], "groupByTags": [], "measurement": "logged_users", + "policy": "default", "query": "SELECT last(\"value\") FROM \"logged_users\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1473,6 +1542,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 27, "interval": ">60s", "links": [], @@ -1511,6 +1587,7 @@ ], "groupByTags": [], "measurement": "fs_space_percent_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_percent_free\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1543,7 +1620,7 @@ ] } ], - "thresholds": "5,10,15", + "thresholds": "10,15", "title": "Free space", "type": "singlestat", "valueFontSize": "80%", @@ -1565,14 +1642,8 @@ "datasource": null, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, "max": null, "min": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1581,7 +1652,6 @@ "id": 9, "interactive": true, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1631,6 +1701,7 @@ "groupByTags": [], "interval": "", "measurement": "fs_space_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_used\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -1685,6 +1756,7 @@ "groupByTags": [], "interval": "", "measurement": "fs_space_reserved", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_reserved\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -1739,6 +1811,7 @@ "groupByTags": [], "interval": "", "measurement": "fs_space_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_space_free\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -1777,16 +1850,31 @@ "timezone": "browser", "title": "Disk usage on $mount partition", "tooltip": { + "msResolution": false, "query_as_alias": true, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -1802,6 +1890,13 @@ "editable": true, "error": false, "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 28, "interval": ">60s", "links": [], @@ -1840,6 +1935,7 @@ ], "groupByTags": [], "measurement": "fs_inodes_percent_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_inodes_percent_free\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", @@ -1872,7 +1968,7 @@ ] } ], - "thresholds": "5,10,15", + "thresholds": "10,15", "title": "Free inodes", "type": "singlestat", "valueFontSize": "80%", @@ -1894,14 +1990,8 @@ "datasource": null, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, "max": null, "min": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -1910,7 +2000,6 @@ "id": 18, "interactive": true, "interval": ">60s", - "leftYAxisLabel": "", "legend": { "avg": false, "current": false, @@ -1960,6 +2049,7 @@ "groupByTags": [], "interval": "", "measurement": "fs_inodes_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_inodes_used\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2014,6 +2104,7 @@ "groupByTags": [], "interval": "", "measurement": "fs_inodes_reserved", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_inodes_reserved\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2068,6 +2159,7 @@ "groupByTags": [], "interval": "", "measurement": "fs_inodes_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"fs_inodes_free\" WHERE \"hostname\" = '$server' AND \"fs\" = '$mount' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -2106,16 +2198,31 @@ "timezone": "browser", "title": "inodes on $mount partition", "tooltip": { + "msResolution": false, "query_as_alias": true, "shared": true, "value_type": "individual" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2135,12 +2242,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2148,7 +2249,6 @@ }, "id": 23, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -2192,6 +2292,7 @@ ], "groupByTags": [], "measurement": "disk_merged_read", + "policy": "default", "query": "SELECT max(\"value\") FROM \"disk_merged_read\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2244,6 +2345,7 @@ ], "groupByTags": [], "measurement": "disk_merged_write", + "policy": "default", "query": "SELECT max(\"value\") FROM \"disk_merged_write\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2280,15 +2382,30 @@ "timeShift": null, "title": "Merged operations on $disk", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2299,12 +2416,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2312,7 +2423,6 @@ }, "id": 21, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -2356,6 +2466,7 @@ ], "groupByTags": [], "measurement": "disk_ops_read", + "policy": "default", "query": "SELECT max(\"value\") FROM \"disk_ops_read\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2408,6 +2519,7 @@ ], "groupByTags": [], "measurement": "disk_ops_write", + "policy": "default", "query": "SELECT max(\"value\") FROM \"disk_ops_write\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2444,15 +2556,30 @@ "timeShift": null, "title": "Operations on $disk", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2463,12 +2590,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2476,7 +2597,6 @@ }, "id": 22, "interval": ">60s", - "leftYAxisLabel": "Bytes/s", "legend": { "avg": false, "current": false, @@ -2520,6 +2640,7 @@ ], "groupByTags": [], "measurement": "disk_octets_read", + "policy": "default", "query": "SELECT max(\"value\") FROM \"disk_octets_read\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2572,6 +2693,7 @@ ], "groupByTags": [], "measurement": "disk_octets_write", + "policy": "default", "query": "SELECT max(\"value\") FROM \"disk_octets_write\" WHERE \"hostname\" = '$server' AND \"device\" = '$disk' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2608,15 +2730,30 @@ "timeShift": null, "title": "Traffic on $disk", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "Bytes/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -2636,12 +2773,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2649,7 +2780,6 @@ }, "id": 17, "interval": ">60s", - "leftYAxisLabel": "Bytes/s", "legend": { "avg": false, "current": false, @@ -2693,6 +2823,7 @@ ], "groupByTags": [], "measurement": "if_octets_rx", + "policy": "default", "query": "SELECT max(\"value\") FROM \"if_octets_rx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2745,6 +2876,7 @@ ], "groupByTags": [], "measurement": "if_octets_tx", + "policy": "default", "query": "SELECT max(\"value\") FROM \"if_octets_tx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2781,15 +2913,30 @@ "timeShift": null, "title": "Network traffic on $interface", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "Bytes/s", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2800,12 +2947,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2813,7 +2954,6 @@ }, "id": 19, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -2857,6 +2997,7 @@ ], "groupByTags": [], "measurement": "if_packets_rx", + "policy": "default", "query": "SELECT max(\"value\") FROM \"if_packets_rx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -2909,6 +3050,7 @@ ], "groupByTags": [], "measurement": "if_packets_tx", + "policy": "default", "query": "SELECT max(\"value\") FROM \"if_packets_tx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -2945,15 +3087,30 @@ "timeShift": null, "title": "Packets on $interface", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -2964,12 +3121,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -2977,7 +3128,6 @@ }, "id": 20, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -3021,6 +3171,7 @@ ], "groupByTags": [], "measurement": "if_errors_rx", + "policy": "default", "query": "SELECT max(\"value\") FROM \"if_errors_rx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3073,6 +3224,7 @@ ], "groupByTags": [], "measurement": "if_errors_tx", + "policy": "default", "query": "SELECT max(\"value\") FROM \"if_errors_tx\" WHERE \"hostname\" = '$server' AND \"interface\" = '$interface' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -3109,15 +3261,30 @@ "timeShift": null, "title": "Errors on $interface", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "short", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -3137,12 +3304,6 @@ "error": false, "fill": 1, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3193,6 +3354,7 @@ ], "groupByTags": [], "measurement": "swap_used", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"swap_used\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3240,6 +3402,7 @@ ], "groupByTags": [], "measurement": "swap_cached", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"swap_cached\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -3287,6 +3450,7 @@ ], "groupByTags": [], "measurement": "swap_free", + "policy": "default", "query": "SELECT mean(\"value\") FROM \"swap_free\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "C", @@ -3318,15 +3482,29 @@ "timeShift": null, "title": "Swap memory", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bytes", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] }, { @@ -3337,12 +3515,6 @@ "error": false, "fill": 0, "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, "threshold1": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, @@ -3350,7 +3522,6 @@ }, "id": 25, "interval": ">60s", - "leftYAxisLabel": "per second", "legend": { "avg": false, "current": false, @@ -3394,6 +3565,7 @@ ], "groupByTags": [], "measurement": "swap_io_out", + "policy": "default", "query": "SELECT max(\"value\") FROM \"swap_io_out\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "A", @@ -3416,6 +3588,7 @@ "tags": [ { "key": "hostname", + "operator": "=", "value": "$server" } ] @@ -3441,6 +3614,7 @@ ], "groupByTags": [], "measurement": "swap_io_in", + "policy": "default", "query": "SELECT max(\"value\") FROM \"swap_io_in\" WHERE \"hostname\" = '$server' AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "refId": "B", @@ -3463,6 +3637,7 @@ "tags": [ { "key": "hostname", + "operator": "=", "value": "$server" } ] @@ -3472,15 +3647,30 @@ "timeShift": null, "title": "Swap page operations", "tooltip": { + "msResolution": false, "shared": true, "value_type": "cumulative" }, "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" + "xaxis": { + "show": true + }, + "yaxes": [ + { + "format": "Bps", + "label": "per second", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } ] } ], @@ -3488,7 +3678,7 @@ "title": "Swap" } ], - "schemaVersion": 8, + "schemaVersion": 12, "sharedCrosshair": true, "style": "dark", "tags": [], @@ -3499,11 +3689,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "environment", "options": [], "query": "show tag values from cpu_idle with key = environment_label", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3512,11 +3703,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "server", "options": [], "query": "show tag values from cpu_idle with key=\"hostname\" where environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3525,11 +3717,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "disk", "options": [], "query": "show tag values from disk_merged_read with key=\"device\" where hostname = '$server' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "/^[a-z]+$/", "type": "query" @@ -3538,11 +3731,12 @@ "allFormat": "glob", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "mount", "options": [], "query": "show tag values from fs_inodes_free with key=\"fs\" where hostname = '$server' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3551,11 +3745,12 @@ "allFormat": "regex values", "current": {}, "datasource": null, + "hide": 0, "includeAll": false, "name": "interface", "options": [], "query": "show tag values from if_errors_rx with key=\"interface\" where hostname = '$server' and environment_label = '$environment'", - "refresh": true, + "refresh": 1, "refresh_on_load": true, "regex": "", "type": "query" @@ -3600,4 +3795,4 @@ "timezone": "browser", "title": "System", "version": 3 -} +} \ No newline at end of file