Enhance monitoring and endpoint workflows with ingress configurations and shell adjustments

Author: karimzakzouk

.github/workflows/endpoints.yml

@@ -46,6 +46,7 @@ jobs:
           aws eks update-kubeconfig --name ${{ inputs.cluster_name }} --region us-east-1
 
       - name: Print Service Endpoints
+        shell: bash
         run: |
           echo "================= SERVICE ENDPOINTS ================="
 
@@ -132,6 +133,5 @@ jobs:
           if [ "$LB_COUNT" -gt 2 ]; then
             EXCESS=$((LB_COUNT - 2))
             COST=$((EXCESS * 16))
-            echo "   • Potential monthly savings: ~\$COST (reducing $EXCESS extra LoadBalancers)"
-          fi
-        shell: /usr/bin/bash
+            echo "   • Potential monthly savings: ~\$$COST (reducing $EXCESS extra LoadBalancers)"
+          fi

.github/workflows/monitoring.yml

@@ -91,5 +91,5 @@ jobs:
           export MONITORING_NAMESPACE=${{ inputs.monitoring_namespace }}
           export ARGOCD_NAMESPACE=${{ inputs.argocd_namespace }}
           envsubst < ./argocd/monitoring.yml | \
-          sed "s/monitoring\.yourdomain\.com/${{ steps.nginx-lb.outputs.nginx_hostname }}/g" | \
-          kubectl apply -f -
+            sed "s/monitoring\.yourdomain\.com/${{ steps.nginx-lb.outputs.nginx_hostname }}/g" | \
+            kubectl apply -f -

argocd/monitoring.yml

@@ -13,61 +13,52 @@ spec:
       skipCrds: false
       values: |
         crds:
-          enabled: true # Enable CRD installation
+          enabled: true
         
-        # Change all services to ClusterIP instead of LoadBalancer
         prometheus:
           service:
             type: ClusterIP
+          ingress:
+            enabled: true
+            ingressClassName: nginx
+            annotations:
+              nginx.ingress.kubernetes.io/rewrite-target: /
+            hosts:
+              - host: monitoring.yourdomain.com
+                paths:
+                  - path: /prometheus
+                    pathType: Prefix
         
         grafana:
           service:
             type: ClusterIP
           admin:
             existingSecret: grafana-admin-secret
             passwordKey: admin-password
+          ingress:
+            enabled: true
+            ingressClassName: nginx
+            annotations:
+              nginx.ingress.kubernetes.io/rewrite-target: /
+            hosts:
+              - host: monitoring.yourdomain.com
+                paths:
+                  - path: /grafana
+                    pathType: Prefix
         
         alertmanager:
           service:
             type: ClusterIP
-        
-        # Enable ingress for all services
-        ingress:
-          enabled: true
-          ingressClassName: nginx  # or your ingress class
-          annotations:
-            nginx.ingress.kubernetes.io/rewrite-target: /
-            # Add SSL redirect if you have cert-manager
-            # cert-manager.io/cluster-issuer: "letsencrypt-prod"
-          hosts:
-            - host: monitoring.yourdomain.com  # Replace with your domain
-              paths:
-                - path: /prometheus
-                  pathType: Prefix
-                  backend:
-                    service:
-                      name: kube-prometheus-stack-prometheus
-                      port:
-                        number: 9090
-                - path: /grafana
-                  pathType: Prefix  
-                  backend:
-                    service:
-                      name: kube-prometheus-stack-grafana
-                      port:
-                        number: 80
-                - path: /alertmanager
-                  pathType: Prefix
-                  backend:
-                    service:
-                      name: kube-prometheus-stack-alertmanager
-                      port:
-                        number: 9093
-          # Uncomment if using TLS
-          # tls:
-          #   - secretName: monitoring-tls
-          #     hosts:
-          #       - monitoring.yourdomain.com
+          ingress:
+            enabled: true
+            ingressClassName: nginx
+            annotations:
+              nginx.ingress.kubernetes.io/rewrite-target: /
+            hosts:
+              - host: monitoring.yourdomain.com
+                paths:
+                  - path: /alertmanager
+                    pathType: Prefix
 
   destination:
     server: https://kubernetes.default.svc