openstack/openstack-helm-infra
Code Issues Proposed changes

Mariadb: Use correct credentials for exporter in secret

Browse Source 
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
This commit is contained in:
Steve Wilkerson 2019-02-04 06:23:33 -06:00
parent d3531f1fba
commit 6e2ea01ae0
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
View File

@ -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" }}

1
tools/deployment/multinode/045-mariadb.sh
View File

@ -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}

1
tools/deployment/osh-infra-monitoring/045-mariadb.sh
View File

@ -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}