From 6e2ea01ae0b8adc719fac5ea990c301a78294263 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 4 Feb 2019 06:23:33 -0600
Subject: [PATCH] Mariadb: Use correct credentials for exporter in secret
This updates the mariadb chart to use the correct auth values for
the mariadb prometheus exporter. The correct credentials to use
are the credentials in the oslo_db endpoint
Change-Id: I2d325167d7ffdf911a56fe97b879cb13b0d4c195
---
.../monitoring/prometheus/secrets/_exporter_user.cnf.tpl | 4 ++--
tools/deployment/multinode/045-mariadb.sh | 1 +
tools/deployment/osh-infra-monitoring/045-mariadb.sh | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl b/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
index f3d03afa9..7ca986b98 100644
--- a/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
+++ b/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
@@ -15,7 +15,7 @@ limitations under the License.
*/}}
[client]
-user = {{ .Values.endpoints.prometheus_mysql_exporter.auth.user.username }}
-password = {{ .Values.endpoints.prometheus_mysql_exporter.auth.user.password }}
+user = {{ .Values.endpoints.oslo_db.auth.exporter.username }}
+password = {{ .Values.endpoints.oslo_db.auth.exporter.password }}
host = {{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
port = {{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
diff --git a/tools/deployment/multinode/045-mariadb.sh b/tools/deployment/multinode/045-mariadb.sh
index 4464122f9..9fb417aa7 100755
--- a/tools/deployment/multinode/045-mariadb.sh
+++ b/tools/deployment/multinode/045-mariadb.sh
@@ -23,6 +23,7 @@ make mariadb
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
helm upgrade --install mariadb ./mariadb \
--namespace=osh-infra \
+ --set monitoring.prometheus.enabled=true \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB}
diff --git a/tools/deployment/osh-infra-monitoring/045-mariadb.sh b/tools/deployment/osh-infra-monitoring/045-mariadb.sh
index be0fad2b4..1f76966a2 100755
--- a/tools/deployment/osh-infra-monitoring/045-mariadb.sh
+++ b/tools/deployment/osh-infra-monitoring/045-mariadb.sh
@@ -24,6 +24,7 @@ make mariadb
helm upgrade --install mariadb ./mariadb \
--namespace=osh-infra \
--set pod.replicas.server=1 \
+ --set monitoring.prometheus.enabled=true \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB}