[elasticsearch-exporter] Update to the latest v1.7.0

The current version of the exporter is outdated, switch to the upstream
+ rename --es.snapshots to --collector.snapshots (v1.7.0) and
  --es.cluster_settings to --collector.clustersettings (v1.6.0)

Change-Id: I4b496d859a4764fbec3271817391667a53286acd

doc/source/logging/elasticsearch.rst

@@ -172,7 +172,7 @@ The configuration keys configure the following behaviors:
 More information about the Elasticsearch exporter can be found on the exporter's
 GitHub_ page.
 
-.. _GitHub: https://github.com/justwatchcom/elasticsearch_exporter
+.. _GitHub: https://github.com/prometheus-community/elasticsearch_exporter
 
 
 Snapshot Repositories

doc/source/monitoring/prometheus.rst

@@ -253,7 +253,7 @@ chart's values.yaml file.  The charts containing exporters include:
 - Fluentd_
 - Postgres_
 
-.. _Elasticsearch: https://github.com/justwatchcom/elasticsearch_exporter
+.. _Elasticsearch: https://github.com/prometheus-community/elasticsearch_exporter
 .. _RabbitMQ: https://github.com/kbudde/rabbitmq_exporter
 .. _MariaDB: https://github.com/prometheus/mysqld_exporter
 .. _Memcached: https://github.com/prometheus/memcached_exporter

elasticsearch/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.9.0
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.30
+version: 0.3.0
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch

elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml

@@ -58,6 +58,8 @@ spec:
             - '--web.telemetry-path={{ .Values.endpoints.prometheus_elasticsearch_exporter.path.default }}'
             - '--web.listen-address=:{{ .Values.endpoints.prometheus_elasticsearch_exporter.port.metrics.default }}'
             - '--es.timeout={{ .Values.conf.prometheus_elasticsearch_exporter.es.timeout }}'
+            - '--log.format={{ .Values.conf.prometheus_elasticsearch_exporter.log.format }}'
+            - '--log.level={{ .Values.conf.prometheus_elasticsearch_exporter.log.level }}'
             {{- if .Values.conf.prometheus_elasticsearch_exporter.es.all }}
             - '--es.all'
             {{- end }}
@@ -67,11 +69,26 @@ spec:
             {{- if .Values.conf.prometheus_elasticsearch_exporter.es.indices_settings }}
             - '--es.indices_settings'
             {{- end }}
+            {{- if .Values.conf.prometheus_elasticsearch_exporter.es.indices_mappings }}
+            - '--es.indices_mappings'
+            {{- end }}
+            {{- if .Values.conf.prometheus_elasticsearch_exporter.es.aliases }}
+            - '--es.aliases'
+            {{- end }}
             {{- if .Values.conf.prometheus_elasticsearch_exporter.es.shards }}
             - '--es.shards'
             {{- end }}
             {{- if .Values.conf.prometheus_elasticsearch_exporter.es.snapshots }}
-            - '--es.snapshots'
+            - '--collector.snapshots'
+            {{- end }}
+            {{- if .Values.conf.prometheus_elasticsearch_exporter.es.cluster_settings }}
+            - '--collector.clustersettings'
+            {{- end }}
+            {{- if .Values.conf.prometheus_elasticsearch_exporter.es.slm }}
+            - '--es.slm'
+            {{- end }}
+            {{- if .Values.conf.prometheus_elasticsearch_exporter.es.data_stream }}
+            - '--es.data_stream'
             {{- end }}
             {{- if .Values.manifests.certificates }}
             - '--es.ca=/tmp/elasticsearch/certs/ca.crt'

elasticsearch/values.yaml

@@ -25,7 +25,7 @@ images:
     s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013
     s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
     helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
-    prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.1.0
+    prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.7.0
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
     elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
@@ -736,12 +736,20 @@ conf:
         master: "-Xms256m -Xmx256m"
   prometheus_elasticsearch_exporter:
     es:
-      timeout: 20s
+      timeout: 30s
       all: true
       indices: true
       indices_settings: true
+      indices_mappings: true
+      aliases: false
       shards: true
       snapshots: true
+      cluster_settings: true
+      slm: true
+      data_stream: false
+    log:
+      format: logfmt
+      level: info
 
   api_objects: {}
     # Fill this map with API objects to create once Elasticsearch is deployed

releasenotes/notes/elasticsearch.yaml

@@ -40,4 +40,5 @@ elasticsearch:
   - 0.2.28 Utilize bucket claim CRD when using with Rook
   - 0.2.29 Make es curator path configurable
   - 0.2.30 Update curator for es v8
+  - 0.3.0 Update elasticsearch_exporter to v1.7.0
 ...