Merge pull request #125 from stackhpc/feature/support_configuring_grafana

Feature/support configuring grafana

ansible/group_vars/all/kolla

@@ -295,6 +295,9 @@ kolla_enable_ironic: "yes"
 kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool else 'no' }}"
 kolla_enable_magnum: "no"
 kolla_enable_manila: "no"
+# Support for Monasca in Kolla is a work in progress. This currently relies
+# on an out-of-band Monasca installation.
+kolla_enable_monasca: "no"
 kolla_enable_murano: "no"
 kolla_enable_neutron: "yes"
 kolla_enable_nova: "yes"

ansible/overcloud-grafana-configure.yml

@@ -8,6 +8,33 @@
       group_by:
         key: "monitoring_with_grafana_enabled_{{ kolla_enable_grafana | bool }}"
 
+- name: Set the Monasca control plane project ID
+  hosts: monitoring_with_grafana_enabled_True[0]
+  gather_facts: False
+  tags:
+    - grafana
+  vars:
+    venv: "{{ virtualenv_path }}/shade"
+  roles:
+    - role: stackhpc.os-openstackclient
+      os_openstackclient_venv: "{{ venv }}"
+      when: kolla_enable_monasca | bool
+
+  tasks:
+    - name: Look up Monasca control plane project ID
+      shell: >
+        source {{ venv }}/bin/activate &&
+        openstack project show monasca --format json --column id
+      register: monasca_project_show
+      changed_when: False
+      environment: "{{ openstack_auth_env }}"
+      when: kolla_enable_monasca | bool
+
+    - name: Set Monasca control plane ID
+      set_fact:
+        monasca_control_plane_project_id:  "{{ (monasca_project_show.stdout | from_json).get('id') }}"
+      when: kolla_enable_monasca | bool
+
 - name: Configure control plane monitoring for Grafana
   # Only required to run on a single host.
   hosts: monitoring_with_grafana_enabled_True[0]

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

@@ -207,6 +207,7 @@ kolla_openstack_logging_debug:
 #kolla_enable_magnum:
 #kolla_enable_manila:
 #kolla_enable_mistral:
+#kolla_enable_monasca:
 #kolla_enable_mongodb:
 #kolla_enable_murano:
 #kolla_enable_multipathd:

ansible/roles/kolla-ansible/templates/globals.yml.j2

@@ -279,6 +279,19 @@ tempest_floating_network_name:
 bifrost_deploy_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-source-bifrost-deploy{% endraw %}"
 
 
+############################################
+# Grafana - Data visualisation & Monitoring
+############################################
+
+# When using the Monasca fork of Grafana if an OpenStack user with the
+# same name as the admin user logs into Grafana it overwrites user data
+# in the Grafana database, breaking the local admin account, and
+# preventing admin API calls to Grafana. To reduce the chance of this
+# happening the local admin account is renamed here.
+{% if kolla_enable_grafana and grafana_local_admin_user_name is defined %}
+grafana_admin_username: "{{ grafana_local_admin_user_name }}"
+{% endif %}
+
 {% if kolla_extra_globals %}
 #######################
 # Extra configuration

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -45,6 +45,7 @@
             kolla_provision_interface: "eth9"
             kolla_inspector_dnsmasq_interface: "eth10"
             kolla_enable_tls_external: False
+            kolla_enable_grafana: False
             kolla_external_fqdn_cert: "fake-cert"
             kolla_openstack_logging_debug: False
 
@@ -117,6 +118,7 @@
               - enable_ironic
               - enable_neutron
               - enable_nova
+              - grafana_admin_username
 
         - name: Check whether inventory files exist
           stat:

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -58,6 +58,7 @@
             kolla_enable_tls_external: False
             kolla_external_fqdn_cert: "fake-cert"
             kolla_openstack_logging_debug: True
+            grafana_local_admin_user_name: "grafana-admin"
             # Enable everything.
             kolla_enable_aodh: True
             kolla_enable_barbican: True
@@ -92,6 +93,7 @@
             kolla_enable_manila_backend_generic: True
             kolla_enable_manila_backend_hnas: True
             kolla_enable_mistral: True
+            kolla_enable_monasca: True
             kolla_enable_mongodb: True
             kolla_enable_murano: True
             kolla_enable_multipathd: True
@@ -186,6 +188,7 @@
               kolla_enable_tls_external: False
               kolla_external_fqdn_cert: "fake-cert"
               openstack_logging_debug: True
+              grafana_admin_username: "grafana-admin"
               # NOTE: The following options are not present in globals.yml.
               # It's possible this is related to the use of hostvars and
               # include_role, caused by something like

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

@@ -91,6 +91,7 @@ kolla_feature_flags:
   - manila_backend_hnas
   - mistral
   - mongodb
+  - monasca
   - murano
   - multipathd
   - neutron_dvr

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

@@ -237,6 +237,15 @@ kolla_enable_magnum:
 # Free form extra configuration to append to magnum.conf.
 kolla_extra_magnum:
 
+###############################################################################
+# Monasca configuration.
+
+# NOTE: Support for Monasca in Kolla is a work in progress. This currently
+# relies on an out-of-band Monasca installation.
+
+# Whether to enable Monasca.
+kolla_enable_monasca:
+
 ###############################################################################
 # Murano configuration.
 

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

@@ -1,14 +1,5 @@
 # {{ ansible_managed }}
 
-[security]
-; If an OpenStack user with the same name as the admin user logs into
-; Grafana it overwrites user data in the Grafana database, breaking
-; the local admin account, and preventing admin API calls to Grafana. To
-; reduce the chance of this happening we rename the local admin user here.
-; Note that this only affects the Monasca fork of Grafana.
-;admin_user = admin
-admin_user = {{ grafana_local_admin_user_name }}
-
 {% if kolla_extra_grafana %}
 #######################
 # Extra configuration

etc/kayobe/kolla.yml

@@ -180,6 +180,7 @@
 #kolla_enable_manila_backend_generic:
 #kolla_enable_manila_backend_hnas:
 #kolla_enable_mistral:
+#kolla_enable_monasca:
 #kolla_enable_mongodb:
 #kolla_enable_multipathd:
 #kolla_enable_murano: