Merge branch 'main' into main

prometheus-community · Oct 13, 2023 · 1e9733b · 1e9733b
2 parents 033ca4f + 9d3a0d6
commit 1e9733b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -2415,7 +2415,7 @@ prometheusOperator:
   thanosImage:
     registry: quay.io
     repository: thanos/thanos
-    tag: v0.32.3
+    tag: v0.32.4
     sha: ""
 
   ## Set a Label Selector to filter watched prometheus and prometheusAgent

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.1
+version: 1.9.0
 appVersion: v0.29.0
 home: https://github.com/kbudde/rabbitmq_exporter
 sources:

diff --git a/charts/prometheus-rabbitmq-exporter/templates/configmap.yaml b/charts/prometheus-rabbitmq-exporter/templates/configmap.yaml
@@ -25,4 +25,6 @@ data:
     OUTPUT_FORMAT: {{ .Values.rabbitmq.output_format | quote }}
     RABBIT_TIMEOUT: {{ .Values.rabbitmq.timeout | quote }}
     MAX_QUEUES: {{ .Values.rabbitmq.max_queues | quote }}
-    EXCLUDE_METRICS: {{ .Values.rabbitmq.excludeMetrics | quote }}
+    EXCLUDE_METRICS: {{ .Values.rabbitmq.excludeMetrics | quote }}
+    RABBIT_CONNECTION: {{ .Values.rabbitmq.connection | quote }}
+
diff --git a/charts/prometheus-rabbitmq-exporter/values.yaml b/charts/prometheus-rabbitmq-exporter/values.yaml
@@ -51,6 +51,7 @@ rabbitmq:
   timeout: 30
   max_queues: 0
   excludeMetrics: ""
+  connection: "direct"
   # Enables overriding env vars using an external ConfigMap.
   configMapOverrideReference: ""