openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix to configure RABBIT_CAPABILITIES"

Browse Source
This commit is contained in:
Zuul 2018-07-29 18:06:06 +00:00 committed by Gerrit Code Review
commit 98463fa37f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ spec:
- name: RABBIT_PASSWORD
value: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.password | quote }}
- name: RABBIT_CAPABILITIES
value: {{ tuple $envAll.Values.conf.prometheus_exporter.capabilities $envAll | include "helm-toolkit.utils.joinListWithComma" | quote }}
value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}
- name: PUBLISH_PORT
value: {{ $envAll.Values.network.prometheus_rabbitmq_exporter.port | quote }}
- name: LOG_LEVEL

3
rabbitmq/values.yaml
View File

@ -30,7 +30,7 @@ labels:
images:
tags:
prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0
prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.28.0
prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:newton
rabbitmq: docker.io/rabbitmq:3.7.4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
@ -106,6 +106,7 @@ conf:
prometheus_exporter:
capabilities:
- no_sort
- bert
log_level: info
skipverify: 1
rabbitmq: