[prometheus-rabbitmq-exporter] fix connection parameters not passing …

…to the deployment (#3649) * enable passing rabbitmq conection parameters Signed-off-by: Daniel Gotlieb <[email protected]> * Update chart version Signed-off-by: dgotlieb <[email protected]> * Update charts/prometheus-rabbitmq-exporter/Chart.yaml Signed-off-by: André Bauer <[email protected]> --------- Signed-off-by: Daniel Gotlieb <[email protected]> Signed-off-by: dgotlieb <[email protected]> Signed-off-by: André Bauer <[email protected]> Co-authored-by: Daniel Gotlieb <[email protected]> Co-authored-by: MH <[email protected]> Co-authored-by: André Bauer <[email protected]>
prometheus-community · Sep 27, 2023 · b19d9b0 · b19d9b0
1 parent 2413df8
commit b19d9b0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/charts/prometheus-rabbitmq-exporter/Chart.yaml b/charts/prometheus-rabbitmq-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Rabbitmq metrics exporter for prometheus
 name: prometheus-rabbitmq-exporter
-version: 1.8.0
+version: 1.8.1
 appVersion: v0.29.0
 home: https://github.com/kbudde/rabbitmq_exporter
 sources:

diff --git a/charts/prometheus-rabbitmq-exporter/templates/deployment.yaml b/charts/prometheus-rabbitmq-exporter/templates/deployment.yaml
@@ -47,15 +47,27 @@ spec:
           {{- if .Values.rabbitmq.configMapOverrideReference }}
             - configMapRef:
                name: {{ .Values.rabbitmq.configMapOverrideReference }}
-          {{- end }}                
+          {{- end }}
           env:
-            {{- if .Values.rabbitmq.existingPasswordSecret }}
-            - name: RABBIT_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name:  "{{ .Values.rabbitmq.existingPasswordSecret }}"
-                  key: {{ .Values.rabbitmq.existingPasswordSecretKey }}
-            {{- end }}
+           {{- if .Values.rabbitmq.existingPasswordSecret }}
+              - name: RABBIT_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: "{{ .Values.rabbitmq.existingPasswordSecret }}"
+                    key: "{{ .Values.rabbitmq.existingPasswordSecretKey }}"
+           {{- else if .Values.rabbitmq.password  }}
+              - name: RABBIT_PASSWORD
+                value: {{ .Values.rabbitmq.password }}
+           {{- end }}
+
+           {{- if .Values.rabbitmq.user }}
+              - name: RABBIT_USER
+                value: {{ .Values.rabbitmq.user }}
+           {{- end }}
+           {{- if .Values.rabbitmq.url }}
+              - name: RABBIT_URL
+                value: {{ .Values.rabbitmq.url }}
+           {{- end }}
           ports:
             - containerPort: {{ .Values.service.internalPort }}
               name: publish