[prometheus-elasticsearch-exporter] add ability to customize apiversi…

…on for pod/service monitor (#4388) * Adding support for azure managed prometheus Signed-off-by: Rashmi Chandrashekar <[email protected]> * addressing comments Signed-off-by: Rashmi Chandrashekar <[email protected]> * removing azmon value flag Signed-off-by: Rashmi Chandrashekar <[email protected]> * removing add Signed-off-by: Rashmi Chandrashekar <[email protected]> * removing checks Signed-off-by: Rashmi Chandrashekar <[email protected]> --------- Signed-off-by: Rashmi Chandrashekar <[email protected]>
prometheus-community · Mar 28, 2024 · e908c1a · e908c1a
1 parent b3aa137
commit e908c1a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 5.6.0
+version: 5.7.0
 kubeVersion: ">=1.10.0-0"
 appVersion: "v1.7.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter

diff --git a/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml b/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml
@@ -1,7 +1,7 @@
 {{- if and .Values.podMonitor.enabled .Values.serviceMonitor.enabled }}
 {{- fail "Either .Values.podMonitor.enabled or .Values.serviceMonitor.enabled can be enabled at a time, but not both." }}
 {{- else if .Values.podMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
+apiVersion: {{ .Values.podMonitor.apiVersion }}
 kind: PodMonitor
 metadata:
   name: {{ template "elasticsearch-exporter.fullname" . }}

diff --git a/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml b/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.serviceMonitor.enabled }}
 ---
-apiVersion: monitoring.coreos.com/v1
+apiVersion: {{ .Values.serviceMonitor.apiVersion }}
 kind: ServiceMonitor
 metadata:
   name: {{ template "elasticsearch-exporter.fullname" . }}

diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml
@@ -242,6 +242,7 @@ serviceMonitor:
   ## https://github.com/coreos/prometheus-operator
   ##
   enabled: false
+  apiVersion: "monitoring.coreos.com/v1"
   #  namespace: monitoring
   labels: {}
   interval: 10s
@@ -258,6 +259,7 @@ podMonitor:
   ## https://prometheus-operator.dev/docs/operator/api/#monitoring.coreos.com/v1.PodMonitor
   ##
   enabled: false
+  apiVersion: "monitoring.coreos.com/v1"
   namespace: ""
   labels: {}
   interval: 60s