Merge "Fix to configure RABBIT_CAPABILITIES"

2018-07-31 00:10:48 +00:00 · 2018-07-31 00:10:48 +00:00 · 91b83aeabb
commit 91b83aeabb
parent d75b90f32d 141a1a98df
2 changed files with 2 additions and 1 deletions
--- 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
--- 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: