Merge "Rabbitmq-exporter: Add configurable RABBIT_TIMEOUT parameter"

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
 ...

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

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: