From cf2fe6793efda7678b89cedd2cb5a22dec6ffab7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalashnik Date: Wed, 13 Nov 2019 17:09:00 +0400 Subject: [PATCH] Add extra settings for rabbitmq_exporter This adds three new variables: - skip_queues is for ability to skip metrics for some queues - include_queues is the opposite parameter for presice setup - rabbit_exporters is for ability to enable/disable exporter modules Change-Id: Ia81a9921be6c14ec2035009fd164aab4c912f328 --- .../monitoring/prometheus/exporter-deployment.yaml | 6 ++++++ rabbitmq/values.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml index a10884e0b..74f5c46ba 100644 --- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml @@ -78,4 +78,10 @@ spec: value: {{ $envAll.Values.conf.prometheus_exporter.log_level | quote }} - name: SKIPVERIFY value: {{ $envAll.Values.conf.prometheus_exporter.skipverify | quote }} + - name: SKIP_QUEUES + value: {{ $envAll.Values.conf.prometheus_exporter.skip_queues | default "^$" | quote }} + - name: INCLUDE_QUEUES + value: {{ $envAll.Values.conf.prometheus_exporter.include_queues | default ".*" | quote }} + - name: RABBIT_EXPORTERS + value: {{ $envAll.Values.conf.prometheus_exporter.rabbit_exporters | default "overview,exchange,node,queue" | quote }} {{- end }} diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index d46330d43..94d1e850d 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -168,6 +168,9 @@ conf: - no_sort log_level: info skipverify: 1 + skip_queues: "^$" + include_queues: ".*" + rabbit_exporters: "overview,exchange,node,queue" rabbitmq: listeners: tcp: