From 141a1a98df657bc06274462ed286f090e4e56cad Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 30 Jul 2018 12:49:49 -0500 Subject: [PATCH] Fix to configure RABBIT_CAPABILITIES 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: I2a763b6730bcbef1900f7cd4c5a05066bfffadf2 co-authored-by: DaeSeong Kim Signed-off-by: Pete Birley --- .../templates/monitoring/prometheus/exporter-deployment.yaml | 2 +- rabbitmq/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml index 363b73bd..bf471e5d 100644 --- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml @@ -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 diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index a8b03ecc..6ce2bea9 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -106,6 +106,7 @@ conf: prometheus_exporter: capabilities: - no_sort + - bert log_level: info skipverify: 1 rabbitmq: