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}