feat: Enable redis metrics through helm Chart (argoproj#16279)

Signed-off-by: Mathias Petermann <[email protected]>
peschmae · Nov 8, 2023 · 6fb5fb2 · 6fb5fb2
1 parent d4dc155
commit 6fb5fb2
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 0 deletions.
diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml
@@ -909,6 +909,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   selector:
     release: argocd
     app: redis-ha
@@ -939,6 +943,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   selector:
     release: argocd
     app: redis-ha
@@ -969,6 +977,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   selector:
     release: argocd
     app: redis-ha
@@ -985,6 +997,7 @@ metadata:
     heritage: "Helm"
     release: "argocd"
     chart: redis-ha-4.22.3
+    exporter: enabled
   annotations:
 spec:
   type: ClusterIP
@@ -998,6 +1011,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter-port
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   selector:
     release: argocd
     app: redis-ha
@@ -1184,6 +1201,9 @@ spec:
     metadata:
       annotations:
         checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75
+        prometheus.io/port: "9121"
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /metrics
       labels:
         release: argocd
         app: redis-ha
@@ -1379,6 +1399,33 @@ spec:
           readOnly: true
         - mountPath: /data
           name: data
+      - name: redis-exporter
+        image: "oliver006/redis_exporter:v1.55.0"
+        imagePullPolicy: IfNotPresent
+        args:
+        env:
+          - name: REDIS_ADDR
+            value: redis://localhost:6379
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: 9121
+          initialDelaySeconds: 15
+          timeoutSeconds: 3
+          periodSeconds: 15
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: 9121
+          initialDelaySeconds: 15
+          timeoutSeconds: 3
+          periodSeconds: 15
+        resources:
+          {}
+        ports:
+          - name: exporter-port
+            containerPort: 9121
+        volumeMounts:
       volumes:
       - name: config
         configMap:

diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml
@@ -6,6 +6,9 @@ redis-ha:
     config:
       save: "\"\""
       bind: "0.0.0.0"
+  exporter:
+    enabled: true
+    tag: v1.55.0
   haproxy:
     enabled: true
     IPv6:

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -21959,6 +21959,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter-port
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   selector:
     app.kubernetes.io/name: argocd-redis-ha
   type: ClusterIP
@@ -21983,6 +21987,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   publishNotReadyAddresses: true
   selector:
     app.kubernetes.io/name: argocd-redis-ha
@@ -22009,6 +22017,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   publishNotReadyAddresses: true
   selector:
     app.kubernetes.io/name: argocd-redis-ha
@@ -22035,6 +22047,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   publishNotReadyAddresses: true
   selector:
     app.kubernetes.io/name: argocd-redis-ha
@@ -23493,6 +23509,9 @@ spec:
     metadata:
       annotations:
         checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75
+        prometheus.io/path: /metrics
+        prometheus.io/port: "9121"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: argocd-redis-ha
     spec:
@@ -23634,6 +23653,32 @@ spec:
           readOnly: true
         - mountPath: /data
           name: data
+      - args: null
+        env:
+        - name: REDIS_ADDR
+          value: redis://localhost:6379
+        image: oliver006/redis_exporter:v1.55.0
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: 9121
+          initialDelaySeconds: 15
+          periodSeconds: 15
+          timeoutSeconds: 3
+        name: redis-exporter
+        ports:
+        - containerPort: 9121
+          name: exporter-port
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: 9121
+          initialDelaySeconds: 15
+          periodSeconds: 15
+          timeoutSeconds: 3
+        resources: {}
+        volumeMounts: null
       initContainers:
       - args:
         - /readonly-config/init.sh

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -1346,6 +1346,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter-port
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   selector:
     app.kubernetes.io/name: argocd-redis-ha
   type: ClusterIP
@@ -1370,6 +1374,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   publishNotReadyAddresses: true
   selector:
     app.kubernetes.io/name: argocd-redis-ha
@@ -1396,6 +1404,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   publishNotReadyAddresses: true
   selector:
     app.kubernetes.io/name: argocd-redis-ha
@@ -1422,6 +1434,10 @@ spec:
     port: 26379
     protocol: TCP
     targetPort: sentinel
+  - name: http-exporter
+    port: 9121
+    protocol: TCP
+    targetPort: exporter-port
   publishNotReadyAddresses: true
   selector:
     app.kubernetes.io/name: argocd-redis-ha
@@ -2880,6 +2896,9 @@ spec:
     metadata:
       annotations:
         checksum/init-config: 69130412bda04eacad3530cb7bcf26cf121401e725e15d0959dd71a7380afe75
+        prometheus.io/path: /metrics
+        prometheus.io/port: "9121"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: argocd-redis-ha
     spec:
@@ -3021,6 +3040,32 @@ spec:
           readOnly: true
         - mountPath: /data
           name: data
+      - args: null
+        env:
+        - name: REDIS_ADDR
+          value: redis://localhost:6379
+        image: oliver006/redis_exporter:v1.55.0
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: 9121
+          initialDelaySeconds: 15
+          periodSeconds: 15
+          timeoutSeconds: 3
+        name: redis-exporter
+        ports:
+        - containerPort: 9121
+          name: exporter-port
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: 9121
+          initialDelaySeconds: 15
+          periodSeconds: 15
+          timeoutSeconds: 3
+        resources: {}
+        volumeMounts: null
       initContainers:
       - args:
         - /readonly-config/init.sh