feat: Enable haproxy metrics through helm Chart (argoproj#15459)

Signed-off-by: Mathias Petermann <mathias.petermann@swisscom.com>
jannfis · Sep 12, 2023 · 43c5905 · 43c5905
1 parent dd727e7
commit 43c5905
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 5 deletions.
diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml
@@ -686,6 +686,13 @@ data:
       server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise 1
       use-server R2 if { srv_is_up(R2) } { nbsrv(check_if_redis_is_master_2) ge 2 }
       server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1
+    frontend stats
+      mode http
+      bind :9101 
+      http-request use-service prometheus-exporter if { path /metrics }
+      stats enable
+      stats uri /stats
+      stats refresh 10s
   haproxy_init.sh: |
     HAPROXY_CONF=/data/haproxy.cfg
     cp /readonly/haproxy.cfg "$HAPROXY_CONF"
@@ -1015,6 +1022,10 @@ spec:
     port: 6379
     protocol: TCP
     targetPort: redis
+  - name: http-exporter-port
+    port: 9101
+    protocol: TCP
+    targetPort: metrics-port
   selector:
     release: argocd
     app: redis-ha-haproxy
@@ -1047,7 +1058,10 @@ spec:
         release: argocd
         revision: "1"
       annotations:
-        checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321
+        prometheus.io/port: "9101"
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "/metrics"
+        checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae
     spec:
       # Needed when using unmodified rbac-setup.yml
 
@@ -1108,6 +1122,8 @@ spec:
         ports:
         - name: redis
           containerPort: 6379
+        - name: metrics-port
+          containerPort: 9101
         resources:
           {}
         volumeMounts:

diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml
@@ -17,6 +17,8 @@ redis-ha:
       server: 6m
       client: 6m
     checkInterval: 3s
+    metrics:
+      enabled: true
   image:
     tag: 7.0.11-alpine
   containerSecurityContext: null

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -19292,7 +19292,9 @@ data:
     check inter 3s fall 1 rise 1\n  use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)
     ge 2 }\n  server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise
     1\n  use-server R2 if { srv_is_up(R2) } { nbsrv(check_if_redis_is_master_2) ge
-    2 }\n  server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1\n"
+    2 }\n  server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1\nfrontend
+    stats\n  mode http\n  bind :9101 \n  http-request use-service prometheus-exporter
+    if { path /metrics }\n  stats enable\n  stats uri /stats\n  stats refresh 10s\n"
   haproxy_init.sh: |
     HAPROXY_CONF=/data/haproxy.cfg
     cp /readonly/haproxy.cfg "$HAPROXY_CONF"
@@ -19940,6 +19942,10 @@ spec:
     port: 6379
     protocol: TCP
     targetPort: redis
+  - name: http-exporter-port
+    port: 9101
+    protocol: TCP
+    targetPort: metrics-port
   selector:
     app.kubernetes.io/name: argocd-redis-ha-haproxy
   type: ClusterIP
@@ -20387,7 +20393,10 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321
+        checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae
+        prometheus.io/path: /metrics
+        prometheus.io/port: "9101"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: argocd-redis-ha-haproxy
       name: argocd-redis-ha-haproxy
@@ -20413,6 +20422,8 @@ spec:
         ports:
         - containerPort: 6379
           name: redis
+        - containerPort: 9101
+          name: metrics-port
         readinessProbe:
           httpGet:
             path: /healthz

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -792,7 +792,9 @@ data:
     check inter 3s fall 1 rise 1\n  use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1)
     ge 2 }\n  server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise
     1\n  use-server R2 if { srv_is_up(R2) } { nbsrv(check_if_redis_is_master_2) ge
-    2 }\n  server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1\n"
+    2 }\n  server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1\nfrontend
+    stats\n  mode http\n  bind :9101 \n  http-request use-service prometheus-exporter
+    if { path /metrics }\n  stats enable\n  stats uri /stats\n  stats refresh 10s\n"
   haproxy_init.sh: |
     HAPROXY_CONF=/data/haproxy.cfg
     cp /readonly/haproxy.cfg "$HAPROXY_CONF"
@@ -1440,6 +1442,10 @@ spec:
     port: 6379
     protocol: TCP
     targetPort: redis
+  - name: http-exporter-port
+    port: 9101
+    protocol: TCP
+    targetPort: metrics-port
   selector:
     app.kubernetes.io/name: argocd-redis-ha-haproxy
   type: ClusterIP
@@ -1887,7 +1893,10 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 718bbb277da8610063a7c0fd810984577c2e8ab215815a71211dfa6e20f67321
+        checksum/config: 492a6adabb741e0cee39be9aa5155c41a4456629f862d0006a2d892dbecfbcae
+        prometheus.io/path: /metrics
+        prometheus.io/port: "9101"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: argocd-redis-ha-haproxy
       name: argocd-redis-ha-haproxy
@@ -1913,6 +1922,8 @@ spec:
         ports:
         - containerPort: 6379
           name: redis
+        - containerPort: 9101
+          name: metrics-port
         readinessProbe:
           httpGet:
             path: /healthz