[stable/redis-ha]: Enable relabeling and metricRelabeling on resources: ServiceMonitor (#201)

* Enable relabeling and metricRelabeling on resources kind: ServiceMonitor.

Signed-off-by: lftgl <v.lftgl@gmail.com>

* Increase Cart version

Signed-off-by: lftgl <v.lftgl@gmail.com>

* Fix merge conflict, change chart version.

* chore: update Redis chart version to 4.34.9 and enhance ServiceMonitor configuration

Signed-off-by: Aaron Layfield <aaron.layfield@gmail.com>

* chore: bump Redis chart version to 4.34.10

Signed-off-by: Aaron Layfield <aaron.layfield@gmail.com>

---------

Signed-off-by: lftgl <v.lftgl@gmail.com>
Signed-off-by: Aaron Layfield <aaron.layfield@gmail.com>
Co-authored-by: Veiko Schnabel <v.schnabel@syseleven.de>
Co-authored-by: Aaron Layfield <aaron.layfield@gmail.com>

Author: 3 people

charts/redis-ha/Chart.yaml

@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 4.34.9
+version: 4.34.10
 appVersion: 8.2.1
 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
 icon: https://img.icons8.com/external-tal-revivo-shadow-tal-revivo/24/external-redis-an-in-memory-data-structure-project-implementing-a-distributed-logo-shadow-tal-revivo.png

charts/redis-ha/README.md

@@ -340,7 +340,9 @@ The following table lists the configurable parameters of the Redis chart and the
 | `exporter.serviceMonitor.endpointAdditionalProperties` | Set additional properties for the ServiceMonitor endpoints such as relabeling, scrapeTimeout, tlsConfig, and more. | object | `{}` |
 | `exporter.serviceMonitor.interval` | Set how frequently Prometheus should scrape (default is 30s) | string | `""` |
 | `exporter.serviceMonitor.labels` | Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator | object | `{}` |
+| `exporter.serviceMonitor.metricRelabelings` |  | list | `[]` |
 | `exporter.serviceMonitor.namespace` | Set the namespace the ServiceMonitor should be deployed | string | `.Release.Namespace` |
+| `exporter.serviceMonitor.relabelings` |  | list | `[]` |
 | `exporter.serviceMonitor.telemetryPath` | Set path to redis-exporter telemtery-path (default is /metrics) | string | `""` |
 | `exporter.serviceMonitor.timeout` | Set timeout for scrape (default is 10s) | string | `""` |
 | `exporter.tag` | Exporter image tag | string | `"v1.67.0"` |

charts/redis-ha/templates/redis-ha-servicemonitor.yaml

@@ -26,6 +26,14 @@ spec:
 {{- end }}
 {{- with .Values.exporter.serviceMonitor.endpointAdditionalProperties }}
 {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- if .Values.exporter.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml .Values.exporter.serviceMonitor.metricRelabelings | nindent 6 }}
+{{- end }}
+{{- if .Values.exporter.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml .Values.exporter.serviceMonitor.relabelings | nindent 6 }}
 {{- end }}
   jobLabel: {{ template "redis-ha.fullname" . }}
   namespaceSelector:

charts/redis-ha/values.yaml

@@ -789,6 +789,22 @@ exporter:
     # -- Disable API Check on ServiceMonitor
     disableAPICheck: false
 
+    # RelabelConfigs to apply to samples before scraping.
+    relabelings: []
+    # - sourceLabels: [__meta_kubernetes_pod_node_name]
+    #   separator: ;
+    #   regex: ^(.*)$
+    #   targetLabel: nodename
+    #   replacement: $1
+    #   action: replace
+
+    # MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
+    metricRelabelings: []
+    # - action: keep
+    #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+    #   sourceLabels: [__name__]
+
+
   # prometheus exporter SCANS redis db which can take some time
   # allow different probe settings to not let container crashloop
   livenessProbe: