From a75fff3408d463d30e039ba2bcf96479668e2cc3 Mon Sep 17 00:00:00 2001 From: akrzos Date: Thu, 15 Dec 2016 09:07:57 -0500 Subject: [PATCH] Add Cloud Specific Dashboard that displays all disks Util/IOPs/Throughput on single graph Change-Id: I797ac98357629736957c0dd87f2f28f60953d01c --- ansible/install/grafana-dashboards.yml | 1 + .../roles/grafana-dashboards/tasks/main.yml | 2 +- .../cloud_specific_disks_all.json.j2 | 448 ++++++++++++++++++ 3 files changed, 450 insertions(+), 1 deletion(-) create mode 100644 ansible/install/roles/grafana-dashboards/templates/cloud_specific_disks_all.json.j2 diff --git a/ansible/install/grafana-dashboards.yml b/ansible/install/grafana-dashboards.yml index c1667782b..2bcad42f5 100644 --- a/ansible/install/grafana-dashboards.yml +++ b/ansible/install/grafana-dashboards.yml @@ -19,6 +19,7 @@ - cpu - memory - disk + - disks_all - network - log general_dashboards: diff --git a/ansible/install/roles/grafana-dashboards/tasks/main.yml b/ansible/install/roles/grafana-dashboards/tasks/main.yml index 1a684e75e..cf280c62b 100644 --- a/ansible/install/roles/grafana-dashboards/tasks/main.yml +++ b/ansible/install/roles/grafana-dashboards/tasks/main.yml @@ -38,7 +38,7 @@ with_items: "{{general_dashboards}}" - name: Remove Existing Cloud Specific CPU/Memory/Disk/Network/Log Dashboards - command: "curl -X DELETE -H 'Content-Type: application/json' http://{{grafana_username}}:{{grafana_password}}@{{grafana_host}}:{{grafana_port}}/api/dashboards/db/{{dashboard_cloud_name}}-{{item}}" + command: "curl -X DELETE -H 'Content-Type: application/json' http://{{grafana_username}}:{{grafana_password}}@{{grafana_host}}:{{grafana_port}}/api/dashboards/db/{{dashboard_cloud_name}}-{{item|replace('_', '-')}}" when: overwrite_existing and cloud_dashboards with_items: "{{cloud_specific_dashboards}}" diff --git a/ansible/install/roles/grafana-dashboards/templates/cloud_specific_disks_all.json.j2 b/ansible/install/roles/grafana-dashboards/templates/cloud_specific_disks_all.json.j2 new file mode 100644 index 000000000..93319f9c3 --- /dev/null +++ b/ansible/install/roles/grafana-dashboards/templates/cloud_specific_disks_all.json.j2 @@ -0,0 +1,448 @@ +{% set vars = {'panel_idx': 0, 'initial1': 0, 'initial2': 0, 'initial3': 0} %} +{% set dashboard_groups = ['undercloud', 'controller', 'ceph', 'compute'] %} +{ + "dashboard": { + "id": null, + "title": "{{dashboard_cloud_name}} - Disks - All", + "tags": [ + "{{dashboard_cloud_name}}" + ], + "style": "dark", + "timezone": "utc", + "editable": true, + "hideControls": false, + "sharedCrosshair": false, + "rows": [ +{% for group in dashboard_groups %} + {% if group in groups %} + {% for batched_hosts in groups[group]|hosts_to_dictionary|dictsort|batch(dashboards_batch) %} + {% if vars.initial1 == 0 %} + {% if vars.update({'initial1': (vars.initial1 + 1)}) %} {% endif %} + {% else %} + }, + {% endif %} + { + "collapse": true, + "editable": true, + "height": "250px", + "panels": [ + {% for index, host in batched_hosts %} + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "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, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "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": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode(aliasSub(scale({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_io_time.io_time, 0.1), 'disk-', ''), 2)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "{{host}} - ${{group}}_disk IO Time", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "percent", + "ms" + ] + {% if loop.last %} + } + {% else %} + }, + {% endif %} + {% endfor %} + ], + {% if 'undercloud' in group %} + "title": "{{group}} IO Time", + {% else %} + "title": "{{group}} ({{batched_hosts[0][0]}} - {{batched_hosts[-1][0]}}) IO Time", + {% endif %} + "showTitle": true + {% endfor %} + {% endif %} + {% if loop.last %} + }, + {% endif %} +{% endfor %} +{% for group in dashboard_groups %} + {% if group in groups %} + {% for batched_hosts in groups[group]|hosts_to_dictionary|dictsort|batch(dashboards_batch) %} + {% if vars.initial2 == 0 %} + {% if vars.update({'initial2': (vars.initial2 + 1)}) %} {% endif %} + {% else %} + }, + {% endif %} + { + "collapse": true, + "editable": true, + "height": "250px", + "panels": [ + {% for index, host in batched_hosts %} + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "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, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "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": [ + { + "alias": "/.*write/", + "transform": "negative-Y" + } + ], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode(aliasSub({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_ops.read, 'disk-', ''), 2, 4)" + }, + { + "refId": "B", + "target": "aliasByNode(aliasSub({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_ops.write, 'disk-', ''), 2, 4)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "{{host}} - ${{group}}_disk iops", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "iops", + "short" + ] + {% if loop.last %} + } + {% else %} + }, + {% endif %} + {% endfor %} + ], + {% if 'undercloud' in group %} + "title": "{{group}} Disk iops", + {% else %} + "title": "{{group}} ({{batched_hosts[0][0]}} - {{batched_hosts[-1][0]}}) Disk iops", + {% endif %} + "showTitle": true + {% endfor %} + {% endif %} + {% if loop.last %} + }, + {% endif %} +{% endfor %} +{% for group in dashboard_groups %} + {% if group in groups %} + {% for batched_hosts in groups[group]|hosts_to_dictionary|dictsort|batch(dashboards_batch) %} + {% if vars.initial3 == 0 %} + {% if vars.update({'initial3': (vars.initial3 + 1)}) %} {% endif %} + {% else %} + }, + {% endif %} + { + "collapse": true, + "editable": true, + "height": "250px", + "panels": [ + {% for index, host in batched_hosts %} + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "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, + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + {% if vars.update({'panel_idx': (vars.panel_idx + 1)}) %} {% endif %} + "id": {{vars.panel_idx}}, + "isNew": true, + "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": [ + { + "alias": "/.*write/", + "transform": "negative-Y" + } + ], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "target": "aliasByNode(aliasSub({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_octets.read, 'disk-', ''), 2, 4)" + }, + { + "refId": "B", + "target": "aliasByNode(aliasSub({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_octets.write, 'disk-', ''), 2, 4)" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "{{host}} - ${{group}}_disk Throughput", + "tooltip": { + "shared": true, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "Bps", + "short" + ] + {% if loop.last %} + } + {% else %} + }, + {% endif %} + {% endfor %} + ], + {% if 'undercloud' in group %} + "title": "{{group}} Disk Throughput", + {% else %} + "title": "{{group}} ({{batched_hosts[0][0]}} - {{batched_hosts[-1][0]}}) Disk Throughput", + {% endif %} + "showTitle": true + {% endfor %} + {% endif %} + {% if loop.last %} + } + {% endif %} +{% endfor %} + ], + "time": { + "from": "now-1h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "templating": { + "list": [ + { + "allFormat": "glob", + "current": { + "text": "all", + "value": "all" + }, + "datasource": null, + "includeAll": true, + "multi": true, + "multiFormat": "glob", + "name": "undercloud_disk", + "options": [], + "query": "{{dashboard_cloud_name}}.*undercloud*.disk-*", + "refresh": true, + "type": "query", + "regex": "/disk-[a-z]*$/" + }, + { + "allFormat": "glob", + "current": { + "text": "all", + "value": "all" + }, + "datasource": null, + "includeAll": true, + "multi": true, + "multiFormat": "glob", + "name": "controller_disk", + "options": [], + "query": "{{dashboard_cloud_name}}.*controller*.disk-*", + "refresh": true, + "type": "query", + "regex": "/disk-[a-z]*$/" + }, + { + "allFormat": "glob", + "current": { + "text": "all", + "value": "all" + }, + "datasource": null, + "includeAll": true, + "multi": true, + "multiFormat": "glob", + "name": "ceph_disk", + "options": [], + "query": "{{dashboard_cloud_name}}.*ceph*.disk-*", + "refresh": true, + "type": "query", + "regex": "/disk-[a-z]*$/" + }, + { + "allFormat": "glob", + "current": { + "text": "all", + "value": "all" + }, + "datasource": null, + "includeAll": true, + "multi": true, + "multiFormat": "glob", + "name": "compute_disk", + "options": [], + "query": "{{dashboard_cloud_name}}.*compute*.disk-*", + "refresh": true, + "type": "query", + "regex": "/disk-[a-z]*$/" + } + ] + }, + "annotations": { + "list": [] + }, + "schemaVersion": 8, + "version": 3, + "links": [ + { + "icon": "external link", + "tags": [ + "{{dashboard_cloud_name}}" + ], + "type": "dashboards", + "asDropdown": true, + "title": "{{dashboard_cloud_name}} Dashboards" + } + ], + "overwrite": true + } +}