From ec45dad6e4674137312908ac58022e10bd22a9f8 Mon Sep 17 00:00:00 2001
From: Ilia Lazebnik <Ilia.lazebnik@gmail.com>
Date: Tue, 12 Sep 2023 23:32:14 +0300
Subject: [PATCH] [prometheus-elasticsearch-exporter]  bump elastic-exporter to
 1.6.0 (#3781)

* bump elasticexporter to 1.6.0

Signed-off-by: drfaust92 <ilia.lazebnik@gmail.com>

* revert lint changes

Signed-off-by: drfaust92 <ilia.lazebnik@gmail.com>

---------

Signed-off-by: drfaust92 <ilia.lazebnik@gmail.com>
---
 charts/prometheus-elasticsearch-exporter/Chart.yaml           | 4 ++--
 .../templates/deployment.yaml                                 | 4 ++--
 charts/prometheus-elasticsearch-exporter/values.yaml          | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml
index e5a29cd2aa10..10cc69ac72eb 100644
--- a/charts/prometheus-elasticsearch-exporter/Chart.yaml
+++ b/charts/prometheus-elasticsearch-exporter/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 5.2.0
+version: 5.3.0
 kubeVersion: ">=1.10.0-0"
-appVersion: 1.5.0
+appVersion: "v1.6.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter
 sources:
   - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter
diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
index acb6131fbd87..05e6573631ff 100644
--- a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
+++ b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
           - secretRef:
               name: {{ .Values.envFromSecret }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["elasticsearch_exporter",
                     {{- with .Values.log.format }}
@@ -109,7 +109,7 @@ spec:
                     "--es.snapshots",
                     {{- end }}
                     {{- if .Values.es.cluster_settings }}
-                    "--es.cluster_settings",
+                    "--collector.clustersettings",
                     {{- end }}
                     {{- if .Values.es.slm }}
                     "--es.slm",
diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml
index 720070e3f11c..ce15680ce103 100644
--- a/charts/prometheus-elasticsearch-exporter/values.yaml
+++ b/charts/prometheus-elasticsearch-exporter/values.yaml
@@ -14,7 +14,8 @@ restartPolicy: Always
 
 image:
   repository: quay.io/prometheuscommunity/elasticsearch-exporter
-  tag: v1.5.0
+  # if not set appVersion field from Chart.yaml is used
+  tag: ""
   pullPolicy: IfNotPresent
   pullSecret: ""