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

ansible/install/collectd-generic.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

ansible/install/grafana-dashboards.yml

@@ -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

ansible/install/roles/collectd-generic/tasks/main.yml

@@ -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