openstack/openstack-helm
Code Issues Proposed changes

Fix to configure RABBIT_CAPABILITIES

Browse Source 
This PS fixes the rabbitmq exporter configurations.

Now, RABBIT_CAPABILITIES env values can not be set because of dummy
values.

After fix values, it needs to upgrade exporter image version because
of string parsing problem in the exporter.

Additional, bert option is added.

https://github.com/kbudde/rabbitmq_exporter

Change-Id: Ida5fae0697c59023eb8a605a13f0279138929969
This commit is contained in:
DaeSeong Kim 2018-07-22 22:49:10 -07:00 committed by Pete Birley
parent 12d47b8968
commit 4c22bbb7a2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -59,7 +59,7 @@ spec:
- name: RABBIT_PASSWORD
value: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.password | quote }}
- name: RABBIT_CAPABILITIES
value: {{ tuple $envAll.Values.conf.prometheus_exporter.capabilities $envAll | include "helm-toolkit.utils.joinListWithComma" | quote }}
value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}
- name: PUBLISH_PORT
value: {{ $envAll.Values.network.prometheus_rabbitmq_exporter.port | quote }}
- name: LOG_LEVEL

3
rabbitmq/values.yaml
View File

@ -30,7 +30,7 @@ labels:
images:
tags:
prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0
prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.28.0
prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:newton
rabbitmq: docker.io/rabbitmq:3.7.4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
@ -106,6 +106,7 @@ conf:
prometheus_exporter:
capabilities:
- no_sort
- bert
log_level: info
skipverify: 1
rabbitmq: