Add optional ServiceMonitor and values stub with it disabled by default (#12503)

* Add optional ServiceMonitor and vaules stub with it disabled by default

Signed-off-by: Brian Gibbins <brian.eroteme@gmail.com>
Signed-off-by: Brian Gibbins <briangibbins@rentalcars.com>

* bump version and add new optional values to README.md

Signed-off-by: Brian Gibbins <brian.eroteme@gmail.com>
Signed-off-by: Brian Gibbins <briangibbins@rentalcars.com>

* remove trailing space from values for linter

Signed-off-by: Brian Gibbins <briangibbins@rentalcars.com>

stable/prometheus-cloudwatch-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.5.0"
 description: A Helm chart for prometheus cloudwatch-exporter
 name: prometheus-cloudwatch-exporter
-version: 0.4.2
+version: 0.4.3
 home: https://github.com/prometheus/cloudwatch_exporter
 sources:
 - https://github.com/prometheus/cloudwatch_exporter

stable/prometheus-cloudwatch-exporter/README.md

@@ -73,6 +73,11 @@ The following table lists the configurable parameters of the Cloudwatch Exporter
 | `affinity`                  | node/pod affinities                                    | `{}`                       |
 | `livenessProbe`             | Liveness probe settings                                |                            |
 | `readinessProbe`            | Readiness probe settings                               |                            |
+| `servicemonitor.enabled`    | Use servicemonitor from prometheus operator            | `false`                    |
+| `servicemonitor.namespace`  | Namespace thes Servicemonitor  is installed in         |                            |
+| `servicemonitor.interval`   | How frequently Prometheus should scrape                |                            |
+| `servicemonitor.telemetryPath` |  path to cloudwatch-exporter telemtery-path         |                            |
+| `servicemonitor.labels`     |   labels for the ServiceMonitor passed to Prometheus Operator      |  `{}`          |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

stable/prometheus-cloudwatch-exporter/templates/servicemonitor.yaml

@@ -0,0 +1,30 @@
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+{{- if .Values.serviceMonitor.labels }}
+  labels:
+{{ toYaml .Values.serviceMonitor.labels | indent 4}}
+{{- end }}
+  name: {{ template "prometheus-cloudwatch-exporter.fullname" . }}
+{{- if .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace }}
+{{- end }}
+spec:
+  endpoints:
+  - targetPort: {{ .Values.service.port }}
+{{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+{{- end }}
+{{- if .Values.serviceMonitor.telemetryPath }}
+    path: {{ .Values.serviceMonitor.telemetryPath }}
+{{- end }}
+  jobLabel: {{ template "prometheus-cloudwatch-exporter.fullname" . }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: {{ template "prometheus-cloudwatch-exporter.name" . }}
+      release: {{ .Release.Name }}
+{{- end }}

stable/prometheus-cloudwatch-exporter/values.yaml

@@ -106,3 +106,15 @@ readinessProbe:
   timeoutSeconds: 5
   successThreshold: 1
   failureThreshold: 3
+
+serviceMonitor:
+  # When set true then use a ServiceMonitor to configure scraping
+  enabled: false
+  # Set the namespace the ServiceMonitor should be deployed
+  # namespace: monitoring
+  # Set how frequently Prometheus should scrape
+  # interval: 30s
+  # Set path to cloudwatch-exporter telemtery-path
+  # telemetryPath: /metrics
+  # Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator
+  # labels: