From 4c22bbb7a2c2144461d60e78b6aa7eb656d77761 Mon Sep 17 00:00:00 2001
From: DaeSeong Kim <powerds0111@gmail.com>
Date: Sun, 22 Jul 2018 22:49:10 -0700
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: Ida5fae0697c59023eb8a605a13f0279138929969
---
 .../templates/monitoring/prometheus/exporter-deployment.yaml   | 2 +-
 rabbitmq/values.yaml                                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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..15a42d49 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -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: