Merge "Fix Network Cloud Specific Dashboard"

This commit is contained in:
Jenkins 2016-08-02 10:47:47 +00:00 committed by Gerrit Code Review
commit 30d46d2dca
2 changed files with 7 additions and 7 deletions

View File

@ -14,19 +14,19 @@
cloud_dashboards: true
overwrite_existing: true
dashboards:
- template_name: OpenStack
- template_name: openstack
template_node_type: undercloud
process_list_name: OpenStack-Undercloud
- template_name: OpenStack
- template_name: openstack
template_node_type: controller
process_list_name: OpenStack-Controller
- template_name: OpenStack
- template_name: openstack
template_node_type: compute
process_list_name: OpenStack-Compute
- template_name: OpenStack
- template_name: openstack
template_node_type: ceph
process_list_name: OpenStack-Ceph
- template_name: OpenStack
- template_name: openstack
template_node_type: "*"
process_list_name: OpenStack
# Non-OpenStack specific dashboards that are included:

View File

@ -216,7 +216,7 @@
{% endfor %}
],
{% if 'undercloud' in group %}
"title": "{{group}} Disk Throughput",
"title": "{{group}} Network Throughput",
{% else %}
"title": "{{group}} ({{batched_hosts[0][0]}} - {{batched_hosts[-1][0]}}) Network Throughput",
{% endif %}
@ -344,4 +344,4 @@
],
"overwrite": true
}
}
}