Alex Krzos 966106905e Improve/Consolidate Collectd Configs & Grafana Dashboards
Collectd Configs:
+ Improvements to the maintainability of these config files
  + Versions appended to end of each per-process captured that
    the specific process was used in OpenStack
+ Collect on for Gnocchi, Aodh, and Sahara
+ Remove Satellite6 and OSE collectd configurations
+ Cleaned up Undercloud, Controller, Compute and Ceph Collectd
  Configurations to contain "mostly" processes that exist on
  machines of that type

Dashboards:
+ Add Gnocchi, Aodh, and Sahara per-process graphs
+ s/glance-agent/glance-api/ "bug"
+ Remove non-OpenStack Dashboards (OSE, Satellite 6) from Repo
+ Consolidate Guest, Baremetal, and Graphite Dashboards with OpenStack
  Dashboards in single playbook grafana-dashboards.yml
+ Update the Cloud System Performance Dashboard to allow comparsion
  with timeshifting
+ Add several comments to clarify the three types of dashboards
+ Removed DivideSeries from Graphite, Baremetal, and Guest Dashboards
  to match behavior of the OpenStack Dashboards for per-process
  graphs

Change-Id: I0c5c994324bd202b02a6175b261b84b183499d0e
2016-07-15 16:06:16 -04:00

347 lines
9.9 KiB
Django/Jinja

{% set vars = {'panel_idx': 0, 'initial': 0, 'initial2': 0} %}
{% set dashboard_groups = ['undercloud', 'controller', 'ceph', 'compute'] %}
{
"dashboard": {
"id": null,
"title": "{{dashboard_cloud_name}} - All Nodes Disk",
"tags": [
"{{dashboard_cloud_name}}"
],
"style": "dark",
"timezone": "browser",
"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.initial == 0 %}
{% if vars.update({'initial': (vars.initial + 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": 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,
"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": "alias({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_ops.read, 'Read')"
},
{
"refId": "B",
"target": "alias({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_ops.write, 'Write')"
}
],
"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.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": 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,
"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": "alias({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_octets.read, 'Read')"
},
{
"refId": "B",
"target": "alias({{dashboard_cloud_name}}.{{host}}.${{group}}_disk.disk_octets.write, 'Write')"
}
],
"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": "disk-vda",
"value": "disk-vda"
},
"datasource": null,
"includeAll": false,
"multi": false,
"multiFormat": "glob",
"name": "undercloud_disk",
"options": [],
"query": "{{dashboard_cloud_name}}.*undercloud*.disk-*",
"refresh": true,
"type": "query"
},
{
"allFormat": "glob",
"current": {
"text": "disk-sda",
"value": "disk-sda"
},
"datasource": null,
"includeAll": false,
"multi": false,
"multiFormat": "glob",
"name": "controller_disk",
"options": [],
"query": "{{dashboard_cloud_name}}.*controller*.disk-*",
"refresh": true,
"type": "query"
},
{
"allFormat": "glob",
"current": {
"text": "None",
"value": "",
"isNone": true
},
"datasource": null,
"includeAll": false,
"multi": false,
"multiFormat": "glob",
"name": "ceph_disk",
"options": [],
"query": "{{dashboard_cloud_name}}.*ceph*.disk-*",
"refresh": true,
"type": "query"
},
{
"allFormat": "glob",
"current": {
"text": "disk-sda",
"value": "disk-sda"
},
"datasource": null,
"includeAll": false,
"multi": false,
"multiFormat": "glob",
"name": "compute_disk",
"options": [],
"query": "{{dashboard_cloud_name}}.*compute*.disk-*",
"refresh": true,
"type": "query"
}
]
},
"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
}
}