From c723529bafea163d27d9fc3e986ccae7153af1ad Mon Sep 17 00:00:00 2001 From: akrzos Date: Tue, 11 Apr 2017 11:54:59 -0400 Subject: [PATCH] Instance Distribution Graph + Total Memory usage Graphs Change-Id: Iede6683c3e6bf1a6e5847eaa45444523012bb176 --- ansible/install/grafana-dashboards.yml | 1 + .../files/cloud_instance_count.json | 99 +++- .../files/cloud_total_memory_usage.json | 487 ++++++++++++++++++ 3 files changed, 576 insertions(+), 11 deletions(-) create mode 100644 ansible/install/roles/grafana-dashboards/files/cloud_total_memory_usage.json diff --git a/ansible/install/grafana-dashboards.yml b/ansible/install/grafana-dashboards.yml index 02a611e76..7e7365628 100644 --- a/ansible/install/grafana-dashboards.yml +++ b/ansible/install/grafana-dashboards.yml @@ -20,6 +20,7 @@ - cloud_keystone_token_count - cloud_rabbitmq_monitoring - cloud_system_performance_comparsion + - cloud_total_memory_usage - three_node_performance_food_groups - openstack_ironic_metrics cloud_specific_dashboards: diff --git a/ansible/install/roles/grafana-dashboards/files/cloud_instance_count.json b/ansible/install/roles/grafana-dashboards/files/cloud_instance_count.json index fd91a7ac3..fae7cfcdc 100644 --- a/ansible/install/roles/grafana-dashboards/files/cloud_instance_count.json +++ b/ansible/install/roles/grafana-dashboards/files/cloud_instance_count.json @@ -5,13 +5,13 @@ }, "editable": true, "gnetId": null, + "graphTooltip": 0, "hideControls": false, "id": null, "links": [], "rows": [ { "collapse": false, - "editable": true, "height": "250px", "panels": [ { @@ -21,14 +21,8 @@ "editable": true, "error": false, "fill": 0, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 1, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -59,9 +53,10 @@ "textEditor": false } ], + "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Instances Hosted on Computes for $Cloud", + "title": "Total Instances Hosted on Computes for $Cloud", "tooltip": { "msResolution": false, "shared": true, @@ -70,7 +65,85 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "id": 2, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode($Cloud.overcloud-*compute-*.processes-qemu-kvm.ps_count.processes, 1)", + "textEditor": false + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Instances Hosted on Each Compute for $Cloud", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -92,8 +165,12 @@ ] } ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, "showTitle": true, - "title": "Instance Count" + "title": "Instance Count", + "titleSize": "h6" } ], "schemaVersion": 12, diff --git a/ansible/install/roles/grafana-dashboards/files/cloud_total_memory_usage.json b/ansible/install/roles/grafana-dashboards/files/cloud_total_memory_usage.json new file mode 100644 index 000000000..885034dde --- /dev/null +++ b/ansible/install/roles/grafana-dashboards/files/cloud_total_memory_usage.json @@ -0,0 +1,487 @@ +{ + "dashboard": { + "annotations": { + "list": [] + }, + "editable": true, + "gnetId": null, + "graphTooltip": 0, + "hideControls": false, + "id": null, + "links": [], + "refresh": "1m", + "rows": [ + { + "collapse": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": {}, + "id": 1, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias($Cloud.undercloud.memory.memory-slab_unrecl, 'Slab Unrecl')" + }, + { + "refId": "B", + "target": "alias($Cloud.undercloud.memory.memory-used, 'Used')" + }, + { + "refId": "C", + "target": "alias($Cloud.undercloud.memory.memory-buffered, 'Buffered')" + }, + { + "refId": "D", + "target": "alias($Cloud.undercloud.memory.memory-slab_recl, 'Slab Recl')" + }, + { + "refId": "E", + "target": "alias($Cloud.undercloud.memory.memory-cached, 'Cached')" + }, + { + "refId": "F", + "target": "alias($Cloud.undercloud.memory.memory-free, 'Free')" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "undercloud Memory Usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bits", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "undercloud Memory Usage", + "titleSize": "h6" + }, + { + "collapse": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": {}, + "id": 2, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.overcloud-controller-*.memory.memory-slab_unrecl), 'Slab Unrecl')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.overcloud-controller-*.memory.memory-used), 'Used')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.overcloud-controller-*.memory.memory-buffered), 'Buffered')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.overcloud-controller-*.memory.memory-slab_recl), 'Slab Recl')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.overcloud-controller-*.memory.memory-cached), 'Cached')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.overcloud-controller-*.memory.memory-free), 'Free')" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Total Controller Memory Usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bits", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Controller Total Memory Usage", + "titleSize": "h6" + }, + { + "collapse": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": {}, + "id": 5, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.overcloud-cephstorage-*.memory.memory-slab_unrecl), 'Slab Unrecl')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.overcloud-cephstorage-*.memory.memory-used), 'Used')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.overcloud-cephstorage-*.memory.memory-buffered), 'Buffered')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.overcloud-cephstorage-*.memory.memory-slab_recl), 'Slab Recl')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.overcloud-cephstorage-*.memory.memory-cached), 'Cached')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.overcloud-cephstorage-*.memory.memory-free), 'Free')" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Total CephStorage Memory Usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bits", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "CephStorage Total Memory Usage", + "titleSize": "h6" + }, + { + "collapse": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 1, + "grid": {}, + "id": 9, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": true, + "min": true, + "rightSide": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": true, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "alias(sumSeries($Cloud.overcloud-compute-*.memory.memory-slab_unrecl), 'Slab Unrecl')" + }, + { + "refId": "B", + "target": "alias(sumSeries($Cloud.overcloud-compute-*.memory.memory-used), 'Used')" + }, + { + "refId": "C", + "target": "alias(sumSeries($Cloud.overcloud-compute-*.memory.memory-buffered), 'Buffered')" + }, + { + "refId": "D", + "target": "alias(sumSeries($Cloud.overcloud-compute-*.memory.memory-slab_recl), 'Slab Recl')" + }, + { + "refId": "E", + "target": "alias(sumSeries($Cloud.overcloud-compute-*.memory.memory-cached), 'Cached')" + }, + { + "refId": "F", + "target": "alias(sumSeries($Cloud.overcloud-compute-*.memory.memory-free), 'Free')" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Total Compute Memory Usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bits", + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Compute Total Memory Usage", + "titleSize": "h6" + } + ], + "schemaVersion": 12, + "sharedCrosshair": false, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "allFormat": "glob", + "current": { + "text": "", + "value": "" + }, + "datasource": null, + "hide": 0, + "includeAll": false, + "multi": false, + "multiFormat": "glob", + "name": "Cloud", + "options": [], + "query": "*", + "refresh": 1, + "regex": "/^(?!stats[d]*[_counts]*$).*$/", + "type": "query" + } + ] + }, + "time": { + "from": "now-1h", + "to": "now" + }, + "timepicker": { + "now": true, + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "utc", + "title": "Cloud Total Memory Usage", + "version": 7 + } +}