Enhance Grafana and Alertmanager ingress configurations with regex support and external URLs

Author: karimzakzouk

.github/workflows/monitoring.yml

@@ -82,6 +82,7 @@ jobs:
         run: |
           kubectl create namespace ${{ inputs.monitoring_namespace }} --dry-run=client -o yaml | kubectl apply -f -
           kubectl create secret generic grafana-admin-secret \
+            --from-literal=admin-user='admin' \
             --from-literal=admin-password='${{ secrets.GRAFANA_ADMIN_PASSWORD }}' \
             --namespace ${{ inputs.monitoring_namespace }} \
             --dry-run=client -o yaml | kubectl apply -f -

argocd/monitoring.yml

@@ -18,43 +18,58 @@ spec:
         prometheus:
           service:
             type: ClusterIP
+          prometheusSpec:
+            externalUrl: http://monitoring.yourdomain.com/prometheus
+            routePrefix: /
           ingress:
             enabled: true
             ingressClassName: nginx
             annotations:
-              nginx.ingress.kubernetes.io/rewrite-target: /
+              nginx.ingress.kubernetes.io/rewrite-target: /$2
+              nginx.ingress.kubernetes.io/use-regex: "true"
             hosts:
               - monitoring.yourdomain.com
             paths:
-              - /prometheus
+              - /prometheus(/|$)(.*)
         
         grafana:
           service:
             type: ClusterIP
           admin:
             existingSecret: grafana-admin-secret
+            userKey: admin-user
             passwordKey: admin-password
+          grafana.ini:
+            server:
+              root_url: http://monitoring.yourdomain.com/grafana
+              serve_from_sub_path: true
           ingress:
             enabled: true
             ingressClassName: nginx
             annotations:
-              nginx.ingress.kubernetes.io/rewrite-target: /
+              nginx.ingress.kubernetes.io/rewrite-target: /$2
+              nginx.ingress.kubernetes.io/use-regex: "true"
             hosts:
               - monitoring.yourdomain.com
-            path: /grafana
-        
+            paths:
+              - /grafana(/|$)(.*)
+
         alertmanager:
           service:
             type: ClusterIP
+          alertmanagerSpec:
+            externalUrl: http://monitoring.yourdomain.com/alertmanager
+            routePrefix: /
           ingress:
             enabled: true
             ingressClassName: nginx
             annotations:
-              nginx.ingress.kubernetes.io/rewrite-target: /
+              nginx.ingress.kubernetes.io/rewrite-target: /$2
+              nginx.ingress.kubernetes.io/use-regex: "true"
             hosts:
               - monitoring.yourdomain.com
             paths:
-              - /alertmanager
+              - /alertmanager(/|$)(.*)
 
   destination:
     server: https://kubernetes.default.svc