Merge pull request #109 from stackhpc/feature/support_grafana

Add support for configuring Grafana

ansible/group_vars/all/kolla

@@ -130,6 +130,8 @@ overcloud_container_image_regex_map:
     enabled: True
   - regex: glance
     enabled: "{{ kolla_enable_glance | bool }}"
+  - regex: grafana
+    enabled: "{{ kolla_enable_grafana | bool }}"
   - regex: gnocchi
     enabled: "{{ kolla_enable_gnocchi | bool }}"
   - regex: ^haproxy$
@@ -281,6 +283,7 @@ kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or
 kolla_enable_etcd: "no"
 kolla_enable_freezer: "no"
 kolla_enable_glance: "yes"
+kolla_enable_grafana: "no"
 kolla_enable_gnocchi: "no"
 kolla_enable_haproxy: "yes"
 kolla_enable_heat: "yes"

ansible/kolla-openstack.yml

@@ -99,6 +99,7 @@
             - { name: ceph, file: ceph.conf }
             - { name: cinder, file: cinder.conf }
             - { name: glance, file: glance.conf }
+            - { name: grafana, file: grafana.ini }
             - { name: heat, file: heat.conf }
             - { name: inspector, file: ironic-inspector.conf }
             - { name: ironic, file: ironic.conf }
@@ -197,6 +198,7 @@
       kolla_extra_ceph: "{{ kolla_extra_config.ceph | default }}"
       kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"
       kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
+      kolla_extra_grafana: "{{ kolla_extra_config.grafana | default }}"
       kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"
       kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"
       kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"

ansible/roles/kolla-openstack/defaults/main.yml

@@ -33,6 +33,15 @@ kolla_enable_glance:
 # glance-registry.conf.
 kolla_extra_glance:
 
+###############################################################################
+# Grafana configuration.
+
+# Whether to enable Grafana.
+kolla_enable_grafana:
+
+# Free form extra configuration to append to grafana.ini.
+kolla_extra_grafana:
+
 ###############################################################################
 # Heat configuration.
 

ansible/roles/kolla-openstack/tasks/config.yml

@@ -16,6 +16,7 @@
     - { src: ceph.conf.j2, dest: ceph.conf, enabled: "{{ kolla_enable_ceph }}" }
     - { src: cinder.conf.j2, dest: cinder.conf, enabled: "{{ kolla_enable_cinder }}" }
     - { src: glance.conf.j2, dest: glance.conf, enabled: "{{ kolla_enable_glance }}" }
+    - { src: grafana.ini.j2, dest: grafana.ini, enabled: "{{ kolla_enable_grafana }}" }
     - { src: heat.conf.j2, dest: heat.conf, enabled: "{{ kolla_enable_heat }}" }
     - { src: ironic.conf.j2, dest: ironic.conf, enabled: "{{ kolla_enable_ironic }}" }
     - { src: ironic-dnsmasq.conf.j2, dest: ironic/ironic-dnsmasq.conf, enabled: "{{ kolla_enable_ironic }}" }

ansible/roles/kolla-openstack/templates/grafana.ini.j2

+# {{ ansible_managed }}
+
+{% if kolla_extra_grafana %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_grafana }}
+{% endif %}

ansible/roles/kolla-openstack/vars/main.yml

@@ -34,6 +34,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/glance"
     patterns: "*"
     enabled: "{{ kolla_enable_glance }}"
+  # Grafana.
+  - src: "{{ kolla_extra_config_path }}/grafana"
+    dest: "{{ kolla_node_custom_config_path }}/grafana"
+    patterns: "*"
+    enabled: "{{ kolla_enable_grafana }}"
   # Heat.
   - src: "{{ kolla_extra_config_path }}/heat"
     dest: "{{ kolla_node_custom_config_path }}/heat"