diff --git a/stable/prometheus-cloudwatch-exporter/Chart.yaml b/stable/prometheus-cloudwatch-exporter/Chart.yaml index 3bb6671d71..03b19acd1d 100644 --- a/stable/prometheus-cloudwatch-exporter/Chart.yaml +++ b/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.9 +version: 0.4.10 home: https://github.com/prometheus/cloudwatch_exporter sources: - https://github.com/prometheus/cloudwatch_exporter diff --git a/stable/prometheus-cloudwatch-exporter/README.md b/stable/prometheus-cloudwatch-exporter/README.md index c95265112d..6c9f7d4b85 100644 --- a/stable/prometheus-cloudwatch-exporter/README.md +++ b/stable/prometheus-cloudwatch-exporter/README.md @@ -80,6 +80,8 @@ The following table lists the configurable parameters of the Cloudwatch Exporter | `serviceMonitor.telemetryPath` | path to cloudwatch-exporter telemtery-path | | | `serviceMonitor.labels` | labels for the ServiceMonitor passed to Prometheus Operator | `{}` | | `serviceMonitor.timeout` | Timeout after which the scrape is ended | | +| `serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping. | | +| `serviceMonitor.metricRelabelings`| MetricRelabelConfigs to apply to samples before ingestion. | | | `ingress.enabled` | Enables Ingress | `false` | | `ingress.annotations` | Ingress annotations | `{}` | | `ingress.labels` | Custom labels | `{}` | diff --git a/stable/prometheus-cloudwatch-exporter/templates/servicemonitor.yaml b/stable/prometheus-cloudwatch-exporter/templates/servicemonitor.yaml index bbc449e72c..ed9234f34f 100644 --- a/stable/prometheus-cloudwatch-exporter/templates/servicemonitor.yaml +++ b/stable/prometheus-cloudwatch-exporter/templates/servicemonitor.yaml @@ -21,6 +21,14 @@ spec: {{- end }} {{- if .Values.serviceMonitor.timeout }} scrapeTimeout: {{ .Values.serviceMonitor.timeout }} +{{- end }} +{{- if .Values.serviceMonitor.relabelings }} + relabelings: +{{ toYaml .Values.serviceMonitor.relabelings | indent 6 }} +{{- end }} +{{- if .Values.serviceMonitor.metricRelabelings }} + metricRelabelings: +{{ toYaml .Values.serviceMonitor.metricRelabelings | indent 6 }} {{- end }} jobLabel: {{ template "prometheus-cloudwatch-exporter.fullname" . }} namespaceSelector: diff --git a/stable/prometheus-cloudwatch-exporter/values.yaml b/stable/prometheus-cloudwatch-exporter/values.yaml index ecf6e51d9e..279be115aa 100644 --- a/stable/prometheus-cloudwatch-exporter/values.yaml +++ b/stable/prometheus-cloudwatch-exporter/values.yaml @@ -134,6 +134,17 @@ serviceMonitor: # labels: # Set timeout for scrape # timeout: 10s + # Set relabelings for the ServiceMonitor, use to apply to samples before scraping + # relabelings: [] + # Set metricRelabelings for the ServiceMonitor, use to apply to samples for ingestion + # metricRelabelings: [] + # + # Example - note the Kubernetes convention of camelCase instead of Prometheus' snake_case + # metricRelabelings: + # - sourceLabels: [dbinstance_identifier] + # action: replace + # replacement: mydbname + # targetLabel: dbname ingress: enabled: false