From 6ce2dfe391ca8a0813ee74278443b3ddabd89c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Tue, 2 Feb 2021 09:19:13 +0100 Subject: [PATCH] [bitnami/elasticsearch] Change metrics endpoint when no coordinating nodes are used (#5364) --- bitnami/elasticsearch/Chart.yaml | 2 +- bitnami/elasticsearch/templates/metrics-deploy.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index 092608168..5bedaad9b 100644 --- a/bitnami/elasticsearch/Chart.yaml +++ b/bitnami/elasticsearch/Chart.yaml @@ -25,4 +25,4 @@ name: elasticsearch sources: - https://github.com/bitnami/bitnami-docker-elasticsearch - https://www.elastic.co/products/elasticsearch -version: 14.1.1 +version: 14.2.0 diff --git a/bitnami/elasticsearch/templates/metrics-deploy.yaml b/bitnami/elasticsearch/templates/metrics-deploy.yaml index 556af5ad3..73df76c83 100644 --- a/bitnami/elasticsearch/templates/metrics-deploy.yaml +++ b/bitnami/elasticsearch/templates/metrics-deploy.yaml @@ -34,7 +34,13 @@ spec: image: {{ include "elasticsearch.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} args: + {{- if gt .Values.coordinating.replicas 0 }} + # Prefer coordinating only nodes to do the initial metrics query - --es.uri=http://{{ template "elasticsearch.coordinating.fullname" . }}:{{ .Values.coordinating.service.port }} + {{- else }} + # Using master nodes as there are no coordinating only nodes + - --es.uri=http://{{ include "elasticsearch.master.fullname" . }}:{{ .Values.master.service.port }} + {{- end }} - --es.all ports: - name: metrics