From fd899d39236b6e23bd9ea96e4dd19341f55cdf34 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 12 Feb 2018 10:19:10 -0600
Subject: [PATCH] Enable mariadb and rabbitmq exporters for armada deployment

This enables prometheus monitoring for rabbitmq and mariadb in
the armada gate, as the armada gate has deployed prometheus and
can be used to verify functionality

Change-Id: I219a93e934d19470f16fa319df8c3c0d86608416
---
 .../armada/multinode/armada-lma.yaml          |  3 ++
 .../armada/multinode/armada-osh.yaml          | 45 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/tools/deployment/armada/multinode/armada-lma.yaml b/tools/deployment/armada/multinode/armada-lma.yaml
index ef20a41f3e..83ce0ef38f 100644
--- a/tools/deployment/armada/multinode/armada-lma.yaml
+++ b/tools/deployment/armada/multinode/armada-lma.yaml
@@ -168,6 +168,9 @@ data:
       replicas:
         data: 1
         client: 1
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml
index fbfc49d0e1..19dfab0451 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -131,6 +131,9 @@ data:
         auth:
           admin:
             password: ${DB_ADMIN_PASSWORD}
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -193,6 +196,12 @@ data:
             password: ${KEYSTONE_RABBITMQ_PASSWORD}
         hosts:
           default: keystone-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: keystone-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -361,6 +370,12 @@ data:
             password: ${GLANCE_RABBITMQ_PASSWORD}
         hosts:
           default: glance-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: glance-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -476,6 +491,12 @@ data:
             password: ${CINDER_RABBITMQ_PASSWORD}
         hosts:
           default: cinder-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: cinder-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -649,6 +670,12 @@ data:
             password: ${NOVA_RABBITMQ_PASSWORD}
         hosts:
           default: nova-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: nova-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -818,6 +845,12 @@ data:
             password: ${NEUTRON_RABBITMQ_PASSWORD}
         hosts:
           default: neutron-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: neutron-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -970,6 +1003,12 @@ data:
             password: ${HEAT_RABBITMQ_PASSWORD}
         hosts:
           default: heat-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: heat-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -1090,6 +1129,12 @@ data:
             password: ${BARBICAN_RABBITMQ_PASSWORD}
         hosts:
           default: barbican-rabbitmq
+      prometheus_rabbitmq_exporter:
+        hosts:
+          default: barbican-rabbitmq-exporter
+    monitoring:
+      prometheus:
+        enabled: true
     labels:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled