Permalink
Browse files

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
  • Loading branch information...
akrzos committed Jul 14, 2016
1 parent e25530a commit 966106905edddb6515391d82e3e7ab73257603de
Showing with 1,145 additions and 7,312 deletions.
  1. +0 −18 ansible/install/collectd-generic.yml
  2. +0 −23 ansible/install/dashboards-generic.yml
  3. +0 −28 ansible/install/dashboards-openstack.yml
  4. +40 −0 ansible/install/grafana-dashboards.yml
  5. +0 −7 ansible/install/roles/collectd-generic/handlers/main.yml
  6. +0 −32 ansible/install/roles/collectd-generic/tasks/main.yml
  7. +0 −23 ansible/install/roles/collectd-generic/templates/ose-metrics.py.j2
  8. +0 −91 ansible/install/roles/collectd-generic/templates/ose.collectd.conf.j2
  9. +0 −161 ansible/install/roles/collectd-generic/templates/satellite6.collectd.conf.j2
  10. +0 −7 ansible/install/roles/collectd-generic/vars/main.yml
  11. +9 −11 ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2
  12. +21 −95 ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2
  13. +112 −95 ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
  14. +95 −86 ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2
  15. +0 −26 ansible/install/roles/dashboard-generic/tasks/main.yml
  16. +0 −2,731 ansible/install/roles/dashboard-generic/templates/ose_general_system_performance.json.j2
  17. +0 −3,338 ansible/install/roles/dashboard-generic/templates/satellite6_general_system_performance.json.j2
  18. +0 −165 ansible/install/roles/dashboard-generic/vars/main.yml
  19. +725 −313 ...l/roles/{dashboard-openstack → grafana-dashboards}/files/cloud_system_performance_comparsion.json
  20. +1 −2 ansible/install/roles/{dashboard-openstack → grafana-dashboards}/fix-ids.py
  21. +32 −12 ansible/install/roles/{dashboard-openstack → grafana-dashboards}/tasks/main.yml
  22. 0 ansible/install/roles/{dashboard-openstack → grafana-dashboards}/templates/all_cpu_graphs.json.j2
  23. 0 ansible/install/roles/{dashboard-openstack → grafana-dashboards}/templates/all_disk_graphs.json.j2
  24. 0 ansible/install/roles/{dashboard-openstack → grafana-dashboards}/templates/all_memory_graphs.json.j2
  25. 0 ...ble/install/roles/{dashboard-openstack → grafana-dashboards}/templates/all_network_graphs.json.j2
  26. +2 −10 ...s/{dashboard-generic → grafana-dashboards}/templates/baremetal_general_system_performance.json.j2
  27. +2 −10 ...es/{dashboard-generic → grafana-dashboards}/templates/graphite_general_system_performance.json.j2
  28. +2 −10 ...roles/{dashboard-generic → grafana-dashboards}/templates/guest_general_system_performance.json.j2
  29. +4 −4 ...{dashboard-openstack → grafana-dashboards}/templates/openstack_general_system_performance.json.j2
  30. +100 −14 ansible/install/roles/{dashboard-openstack → grafana-dashboards}/vars/main.yml
@@ -7,8 +7,6 @@
# ansible-playbook -i hosts install/collectd-generic.yml --tags="baremetal"
# ansible-playbook -i hosts install/collectd-generic.yml --tags="guest"
# ansible-playbook -i hosts install/collectd-generic.yml --tags="graphite"
# ansible-playbook -i hosts install/collectd-generic.yml --tags="ose"
# ansible-playbook -i hosts install/collectd-generic.yml --tags="satellite6"
# ansible-playbook -i hosts install/collectd-generic.yml --tags="baremetal,guest"
#
@@ -35,19 +33,3 @@
roles:
- collectd-generic
tags: graphite
- hosts: ose
remote_user: root
vars:
config_type: ose
roles:
- collectd-generic
tags: ose
- hosts: satellite6
remote_user: root
vars:
config_type: satellite6
roles:
- collectd-generic
tags: satellite6

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,40 @@
---
#
# Uploads and Builds Dashboards for Browbeat analysis of System Performance Metrics
#
# You can upload just the Static and Generated Generic Dashboards with:
# ansible-playbook -i hosts install/grafana-dashboards.yml -e 'cloud_dashboards=false'
#
#
- hosts: localhost
gather_facts: false
vars:
ansible_connection: local
cloud_dashboards: true
overwrite_existing: true
dashboards:
- template_name: OpenStack
template_node_type: undercloud
process_list_name: OpenStack-Undercloud
- template_name: OpenStack
template_node_type: controller
process_list_name: OpenStack-Controller
- template_name: OpenStack
template_node_type: compute
process_list_name: OpenStack-Compute
- template_name: OpenStack
template_node_type: ceph
process_list_name: OpenStack-Ceph
- template_name: OpenStack
template_node_type: "*"
process_list_name: OpenStack
# Non-OpenStack specific dashboards that are included:
- template_name: baremetal
process_list_name: Baremetal
- template_name: guest
process_list_name: Guest
- template_name: graphite
process_list_name: Graphite
roles:
- grafana-dashboards

This file was deleted.

Oops, something went wrong.
@@ -26,38 +26,6 @@
become: true
with_items: "{{collectd_packages[config_type]}}"
#
# Satellite6 specific configuration steps
#
- name: Get Candlepin PostgresDB Password
command: grep "jpa.config.hibernate.connection.password" /etc/candlepin/candlepin.conf
register: satellite_candlepin_password
when: "'{{config_type}}' == 'satellite6'"
- name: Get Foreman PostgresDB Password
shell: grep "password" /etc/foreman/database.yml | awk '{print $2}' | tr -d '"'
register: satellite_foreman_password
when: "'{{config_type}}' == 'satellite6'"
#
# OSE specific configuration
#
# - name: Copy ose-metrics.py
# template:
# src=ose-metrics.py.j2
# dest=/usr/local/bin/ose-metrics.py
# owner=root
# group=root
# mode=0755
# become: true
# when: "'{{config_type}}' == 'ose'"
# - name: Allow group read to /etc/origin/master/admin.key
# file: path=/etc/origin/master/admin.key mode=0640
# when: "'{{config_type}}' == 'ose'"
- name: Configure collectd.conf
template:
src={{config_type}}.collectd.conf.j2

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 9661069

Please sign in to comment.