From d7107a5c5c221afca539ed3884a8b3cb9848200a Mon Sep 17 00:00:00 2001 From: Gayathri Devi Kathiri Date: Wed, 2 Dec 2020 09:24:06 +0000 Subject: [PATCH] Rabbitmq-exporter: Add configurable RABBIT_TIMEOUT parameter This PS adds RABBIT_TIMEOUT parameter as configurable with kbudde/rabbitmq-exporter:v1.0.0-RC7.1 version Change-Id: I8faf8cd706863f65afb5137d93a7627d421270e9 --- rabbitmq/Chart.yaml | 2 +- .../templates/monitoring/prometheus/exporter-deployment.yaml | 2 ++ rabbitmq/values.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml index 3b073f602..1ae14ccd9 100644 --- a/rabbitmq/Chart.yaml +++ b/rabbitmq/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v3.7.26 description: OpenStack-Helm RabbitMQ name: rabbitmq -version: 0.1.2 +version: 0.1.4 home: https://github.com/rabbitmq/rabbitmq-server ... diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml index 1b46be5ff..362188404 100644 --- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml @@ -64,6 +64,8 @@ spec: - name: metrics containerPort: {{ tuple "prometheus_rabbitmq_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} env: + - name: RABBIT_TIMEOUT + value: "{{ .Values.conf.rabbitmq_exporter.rabbit_timeout }}" - name: RABBIT_URL value: http://{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}:15672 - name: RABBIT_USER diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 20130203f..8f949d4aa 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -190,6 +190,8 @@ conf: management.load_definitions: "/var/lib/rabbitmq/definitions.json" management.listener.ip: "::" management.listener.port: null + rabbitmq_exporter: + rabbit_timeout: 30 dependencies: dynamic: