From 29916435a6c1b157b5372a3a398808a87dca9517 Mon Sep 17 00:00:00 2001 From: Robert Wood Date: Thu, 12 Oct 2023 09:09:38 -0500 Subject: [PATCH 1/2] Add support for RABBIT_CONNECTION (#3859) Signed-off-by: Robert Wood --- charts/prometheus-rabbitmq-exporter/Chart.yaml | 2 +- charts/prometheus-rabbitmq-exporter/templates/configmap.yaml | 4 +++- charts/prometheus-rabbitmq-exporter/values.yaml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-rabbitmq-exporter/Chart.yaml b/charts/prometheus-rabbitmq-exporter/Chart.yaml index 3c4cbd801721..056901f6c9b8 100644 --- 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 index 082fd0801768..bdbbb092dec2 100644 --- 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 }} \ No newline at end of file + EXCLUDE_METRICS: {{ .Values.rabbitmq.excludeMetrics | quote }} + RABBIT_CONNECTION: {{ .Values.rabbitmq.connection | quote }} + \ No newline at end of file diff --git a/charts/prometheus-rabbitmq-exporter/values.yaml b/charts/prometheus-rabbitmq-exporter/values.yaml index c653598b141e..31f6f2b5c2d2 100644 --- 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: "" From 9d3a0d6f6d7d29f88eded90c5addad6f78b24d95 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 12 Oct 2023 23:26:25 +0300 Subject: [PATCH 2/2] bump thanos to 0.32.4 (#3885) Signed-off-by: drfaust92 --- charts/kube-prometheus-stack/Chart.yaml | 2 +- charts/kube-prometheus-stack/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 103e34d9902d..eaa01743d06e 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -21,7 +21,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 51.6.0 +version: 51.6.1 appVersion: v0.68.0 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index ba4aadd7a4f0..c6592604ad0e 100644 --- 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