openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Rabbitmq-exporter: Add configurable RABBIT_TIMEOUT parameter"

Browse Source
This commit is contained in:
Zuul 2020-12-03 20:56:00 +00:00 committed by Gerrit Code Review
commit 9187633822
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rabbitmq/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v3.7.26 appVersion: v3.7.26
description: OpenStack-Helm RabbitMQ description: OpenStack-Helm RabbitMQ
name: rabbitmq name: rabbitmq
version: 0.1.2 version: 0.1.4
home: https://github.com/rabbitmq/rabbitmq-server home: https://github.com/rabbitmq/rabbitmq-server
... ...

2
rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -64,6 +64,8 @@ spec:
- name: metrics - name: metrics
containerPort: {{ tuple "prometheus_rabbitmq_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} containerPort: {{ tuple "prometheus_rabbitmq_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
env: env:
- name: RABBIT_TIMEOUT
value: "{{ .Values.conf.rabbitmq_exporter.rabbit_timeout }}"
- name: RABBIT_URL - name: RABBIT_URL
value: http://{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}:15672 value: http://{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}:15672
- name: RABBIT_USER - name: RABBIT_USER

2
rabbitmq/values.yaml
View File

@ -190,6 +190,8 @@ conf:
management.load_definitions: "/var/lib/rabbitmq/definitions.json" management.load_definitions: "/var/lib/rabbitmq/definitions.json"
management.listener.ip: "::" management.listener.ip: "::"
management.listener.port: null management.listener.port: null
rabbitmq_exporter:
rabbit_timeout: 30
dependencies: dependencies:
dynamic: dynamic: