From 5b58e698cfb00183ed31edec4b2b46972815b87b Mon Sep 17 00:00:00 2001 From: Aaron Layfield Date: Tue, 12 Nov 2019 10:22:05 +0900 Subject: [PATCH] [stable/redis-ha] Updating Prometheus exporter support in for HAProxy (#18500) * Updating exporting support in for HAProxy Signed-off-by: Aaron Layfield * Bumping chart version Signed-off-by: Aaron Layfield --- stable/redis-ha/Chart.yaml | 2 +- stable/redis-ha/templates/redis-haproxy-deployment.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml index 8ca9c5742b..a2a5819c34 100644 --- a/stable/redis-ha/Chart.yaml +++ b/stable/redis-ha/Chart.yaml @@ -6,7 +6,7 @@ keywords: - redis - keyvalue - database -version: 3.11.3 +version: 3.11.4 appVersion: 5.0.5 description: Highly available Kubernetes implementation of Redis icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png diff --git a/stable/redis-ha/templates/redis-haproxy-deployment.yaml b/stable/redis-ha/templates/redis-haproxy-deployment.yaml index 0b3d63a73f..85a3938995 100644 --- a/stable/redis-ha/templates/redis-haproxy-deployment.yaml +++ b/stable/redis-ha/templates/redis-haproxy-deployment.yaml @@ -21,9 +21,11 @@ spec: app: {{ template "redis-ha.name" . }}-haproxy release: {{ .Release.Name }} annotations: + {{- if .Values.haproxy.exporter.enabled }} prometheus.io/path: /metrics - prometheus.io/port: "9101" + prometheus.io/port: {{ default 9101 .Values.haproxy.exporter.port | toString }} prometheus.io/scrape: "true" + {{- end }} checksum/config: {{ print (include "config-haproxy.cfg" .) (include "config-haproxy_init.sh" .) | sha256sum }} {{- if .Values.haproxy.annotations }} {{ toYaml .Values.haproxy.annotations | indent 8 }}