feat: Change redis metrics to redis-exporter (#2345)

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

Author: dongjiang1989

addons/redis/templates/_helpers.tpl

@@ -129,13 +129,6 @@ Define redis cluster component script template name
 redis-cluster-scripts-template-{{ .Chart.Version }}
 {{- end -}}
 
-{{/*
-Define redis metrics config name
-*/}}
-{{- define "redis.metricsConfiguration" -}}
-redis-metrics-config
-{{- end -}}
-
 {{- define "redis7.image" -}}
 {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag.major7.minor72 }}
 {{- end }}

addons/redis/templates/cmpd-redis-cluster.yaml

@@ -85,11 +85,6 @@ spec:
       namespace: {{ $.Release.Namespace }}
       volumeName: redis-cluster-config
       externalManaged: true
-    - name: redis-metrics-config
-      template: {{ include "redis.metricsConfiguration" $ }}
-      namespace: {{ $.Release.Namespace }}
-      volumeName: redis-metrics-config
-      defaultMode: 0444
   scripts:
     - name: redis-cluster-scripts
       template: {{ include "redisCluster.scriptsTemplate" $ }}
@@ -586,26 +581,20 @@ spec:
           runAsNonRoot: true
           runAsUser: 1001
         env:
-          - name: ENDPOINT
-            value: "localhost:$(SERVICE_PORT)"
-          - name: METRICS_HTTP_PORT
-            value: $(REDIS_METRICS_HTTP_PORT)
-          - name: METRICS_SERVER_PORT
-            value: $(REDIS_METRICS_SERVER_PORT)
+          - name: REDIS_ADDR
+            value: "redis://localhost:$(SERVICE_PORT)"
+          - name: REDIS_EXPORTER_WEB_LISTEN_ADDRESS
+            value: "0.0.0.0:$(REDIS_METRICS_HTTP_PORT)"
           - name: REDIS_USER
             value: $(REDIS_DEFAULT_USER)
           - name: REDIS_PASSWORD
             value: $(REDIS_DEFAULT_PASSWORD)
-        command:
-          - "/bin/agamotto"
-          - "--config=/opt/conf/metrics-config.yaml"
+          - name: REDIS_EXPORTER_IS_CLUSTER
+            value: true
         ports:
           - name: http-metrics
             containerPort: {{ $.Values.metrics.service.port }}
           - name: server-metrics
             containerPort: {{ $.Values.metrics.service.serverPort }}
-        volumeMounts:
-          - name: redis-metrics-config
-            mountPath: /opt/conf
   {{- end }}
 {{- end }}

addons/redis/templates/cmpd-redis.yaml

@@ -85,11 +85,6 @@ spec:
       namespace: {{ $.Release.Namespace }}
       volumeName: redis-config
       externalManaged: true
-    - name: redis-metrics-config
-      template: {{ include "redis.metricsConfiguration" $ }}
-      namespace: {{ $.Release.Namespace }}
-      volumeName: redis-metrics-config
-      defaultMode: 0444
   scripts:
     - name: redis-scripts
       template: {{ include "redis.scriptsTemplate" $ }}
@@ -495,26 +490,20 @@ spec:
           runAsNonRoot: true
           runAsUser: 1001
         env:
-          - name: ENDPOINT
-            value: "localhost:$(SERVICE_PORT)"
-          - name: METRICS_HTTP_PORT
-            value: $(REDIS_METRICS_HTTP_PORT)
-          - name: METRICS_SERVER_PORT
-            value: $(REDIS_METRICS_SERVER_PORT)
+          - name: REDIS_ADDR
+            value: "redis://localhost:$(SERVICE_PORT)"
+          - name: REDIS_EXPORTER_WEB_LISTEN_ADDRESS
+            value: "0.0.0.0:$(REDIS_METRICS_HTTP_PORT)"
           - name: REDIS_USER
             value: $(REDIS_DEFAULT_USER)
           - name: REDIS_PASSWORD
             value: $(REDIS_DEFAULT_PASSWORD)
-        command:
-          - "/bin/agamotto"
-          - "--config=/opt/conf/metrics-config.yaml"
+          - name: REDIS_EXPORTER_IS_CLUSTER
+            value: false
         ports:
           - name: http-metrics
             containerPort: {{ $.Values.metrics.service.port }}
           - name: server-metrics
             containerPort: {{ $.Values.metrics.service.serverPort }}
-        volumeMounts:
-          - name: redis-metrics-config
-            mountPath: /opt/conf
   {{- end }}
 {{- end }}

addons/redis/templates/cmpv-redis-cluster.yaml

@@ -33,7 +33,7 @@ spec:
       switchover: {{ $redisRepository }}:{{ .imageTag }}
       preTerminate: {{ $redisRepository }}:{{ .imageTag }}
       memberLeave: {{ $redisRepository }}:{{ .imageTag }}
-      metrics: {{ include "metrics.repository" $ }}:0.1.2-beta.1
+      metrics: {{ include "metrics.repository" $ }}:v1.80.1
       memberJoin: {{ $redisRepository }}:{{ .imageTag }}
       init-dbctl: {{ $.Values.dbctlImage.registry | default ( $.Values.image.registry | default "docker.io" ) }}/{{ $.Values.dbctlImage.repository }}:{{ $.Values.dbctlImage.tag }}
   {{- end }}

addons/redis/templates/cmpv-redis.yaml

@@ -28,7 +28,7 @@ spec:
     serviceVersion: {{ .version }}
     images:
       redis: {{ $redisRepository }}:{{ .imageTag }}
-      metrics: {{ include "metrics.repository" $ }}:0.1.2-beta.1
+      metrics: {{ include "metrics.repository" $ }}:v1.80.1
       init-dbctl: {{ $.Values.dbctlImage.registry | default ( $.Values.image.registry | default "docker.io" ) }}/{{ $.Values.dbctlImage.repository }}:{{ $.Values.dbctlImage.tag }}
       postProvision: {{ $redisRepository }}:{{ .imageTag }}
       accountProvision: {{ $redisRepository }}:{{ .imageTag }}

addons/redis/templates/metrics-configmap.yaml

@@ -150,8 +150,9 @@ metrics:
   image:
     # if the value of metrics.image.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
     registry: ""
-    repository: apecloud/agamotto
-    tag: 0.1.2-beta.1
+    # Supports Valkey and Redis 2.x, 3.x, 4.x, 5.x, 6.x, and 7.x
+    repository: oliver006/redis_exporter
+    tag: v1.80.1
     pullPolicy: IfNotPresent
   service:
     port: 9121