openstack/kolla-ansible
Code Issues Proposed changes

Fix enabled state for some prometheus services

Browse Source 
Some services were enabled by default which, even though they were
never deployed when prometheus wasn't enabled, could cause problems
if the monitoring inventory group was empty.  Changed these services
to be enabled based on whether prometheus is enabled.

Change-Id: I0956a1b65a3577cd57fe3b16a95bc3d64fc142ba
This commit is contained in:
Mark Giles 2018-06-08 13:14:36 -04:00
parent ad3e99f901
commit 18998f2876
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/group_vars/all.yml
View File

@ -819,6 +819,6 @@ use_common_mariadb_user: "no"
############ ############
enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}" enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}"
enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}" enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}"
enable_prometheus_node_exporter: "yes" enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}"
enable_prometheus_memcached_exporter: "{{ enable_memcached | bool }}" enable_prometheus_memcached_exporter: "{{ enable_memcached | bool }}"
enable_prometheus_cadvisor: "yes" enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"

4
etc/kolla/globals.yml
View File

@ -457,5 +457,5 @@ tempest_floating_network_name:
############ ############
#enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}" #enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}"
#enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}" #enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}"
#enable_prometheus_node_exporter: "yes" #enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}"
#enable_prometheus_cadvisor: "yes" #enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"