Merge "Add support for deploying Prometheus"

ansible/group_vars/all/kolla

@@ -185,6 +185,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_neutron | bool }}"
   - regex: rabbitmq
     enabled: True
+  - regex: prometheus
+    enabled: "{{ kolla_enable_prometheus | bool }}"
   - regex: sahara
     enabled: "{{ kolla_enable_sahara | bool }}"
   - regex: skydive
@@ -334,6 +336,7 @@ kolla_enable_neutron_lbaas: "no"
 kolla_enable_neutron_provider_networks: "no"
 kolla_enable_nova: "yes"
 kolla_enable_osprofiler: "no"
+kolla_enable_prometheus: "no"
 kolla_enable_sahara: "no"
 kolla_enable_skydive: "no"
 kolla_enable_swift: "no"

ansible/roles/kolla-ansible/templates/overcloud-components.j2

@@ -167,6 +167,35 @@ control
 [panko:children]
 control
 
+[prometheus:children]
+monitoring
+
+[prometheus-alertmanager:children]
+monitoring
+
+[prometheus-node-exporter:children]
+monitoring
+control
+compute
+network
+storage
+
+[prometheus-mysqld-exporter:children]
+mariadb
+
+[prometheus-haproxy-exporter:children]
+haproxy
+
+[prometheus-memcached-exporter:children]
+memcached
+
+[prometheus-cadvisor:children]
+monitoring
+control
+compute
+network
+storage
+
 [gnocchi:children]
 control
 

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

@@ -120,6 +120,7 @@ kolla_feature_flags:
   - octavia
   - osprofiler
   - panko
+  - prometheus
   - qdrouterd
   - rally
   - sahara