Merge pull request #24 from AET-DevOps25/feat/improve-monitoring

Feat/improve monitoring

Author: ClaudiaDuenzinger

.github/workflows/cd.yml

@@ -5,13 +5,15 @@ on:
     workflows: [CI Pipeline]
     types:
       - completed
+    conclusion: success
+  workflow_dispatch:
 
 jobs:
   # Check if we should deploy based on the workflow_run event
   evaluate_deployment:
     name: Evaluate Deployment Conditions
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    #if: ${{ github.event.workflow_run.conclusion == 'success' }}
     outputs:
       deploy_environment: ${{ steps.set-env.outputs.environment }}
       should_deploy: ${{ steps.set-env.outputs.should_deploy }}

.github/workflows/ci.yml

@@ -289,9 +289,14 @@ jobs:
         id: build-args
         run: |
           if [[ "${{ matrix.service }}" == "client" ]]; then
-            if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            # Detect target branch for push or pull_request
+            TARGET_BRANCH="${{ github.ref }}"
+            if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+              TARGET_BRANCH="${{ github.base_ref }}"
+            fi
+            if [[ "$TARGET_BRANCH" == "refs/heads/main" || "$TARGET_BRANCH" == "main" ]]; then
               echo "build_env=production" >> $GITHUB_OUTPUT
-            elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+            elif [[ "$TARGET_BRANCH" == "refs/heads/dev" || "$TARGET_BRANCH" == "dev" ]]; then
               echo "build_env=staging" >> $GITHUB_OUTPUT
             else
               echo "build_env=development" >> $GITHUB_OUTPUT

gateway/src/main/java/de/tum/aet/devops25/JwtAuthenticationFilter.java

@@ -25,9 +25,15 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
         String path = exchange.getRequest().getURI().getPath();
         String method = exchange.getRequest().getMethod().toString();
 
-        // Skip authentication for actuator endpoints
-        if (path.startsWith("/actuator/")) {
-            //System.out.println("[AUTH_DEBUG] Skipping authentication for actuator endpoint: " + path);
+        // Skip authentication for endpoints that don't require it
+        if (path.startsWith("/actuator/") ||
+            path.equals("/health") ||
+            path.equals("/api/health") ||
+            path.equals("/auth/register") ||
+            path.equals("/api/auth/register") ||
+            path.equals("/auth/login") ||
+            path.equals("/api/auth/login")) {
+            System.out.println("[AUTH_DEBUG] Skipping authentication for public endpoint: " + path);
             return chain.filter(exchange);
         }
 

genai-svc/requirements.txt

@@ -40,3 +40,6 @@ boto3 >= 1.29.0
 botocore >= 1.32.0
 pypdf >= 3.15.1
 python-docx >= 0.8.11
+
+# Monitoring and metrics
+prometheus_flask_exporter >= 0.20.0

helm/ai-event-concepter/templates/client-service.yaml

@@ -12,4 +12,5 @@ spec:
     - port: {{ .Values.client.service.port }}
       targetPort: {{ .Values.client.service.targetPort }}
       protocol: TCP
+      name: http
   type: {{ .Values.client.service.type }}

helm/ai-event-concepter/templates/concept-svc-service.yaml

@@ -12,4 +12,5 @@ spec:
     - port: {{ .Values.conceptsvc.service.port }}
       targetPort: {{ .Values.conceptsvc.service.targetPort }}
       protocol: TCP
+      name: http
   type: {{ .Values.conceptsvc.service.type }}

helm/ai-event-concepter/templates/gateway-service.yaml

@@ -12,4 +12,5 @@ spec:
     - port: {{ .Values.gateway.service.port }}
       targetPort: {{ .Values.gateway.service.targetPort }}
       protocol: TCP
+      name: http
   type: {{ .Values.gateway.service.type }}

helm/ai-event-concepter/templates/genai-svc-minio-service.yaml

@@ -2,6 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: genai-svc-minio
+  labels:
+    app: genai-svc-minio
+    monitoring: "true"
 spec:
   selector:
     app: ai-event-concepter-genai-svc-minio-selector

helm/ai-event-concepter/templates/genai-svc-service.yaml

@@ -12,4 +12,5 @@ spec:
     - port: {{ .Values.genaisvc.service.port }}
       targetPort: {{ .Values.genaisvc.service.targetPort }}
       protocol: TCP
+      name: http
   type: {{ .Values.genaisvc.service.type }}

helm/ai-event-concepter/templates/genai-svc-t2v-transformers-service.yaml

@@ -2,10 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   name: genai-svc-t2v-transformers
+  labels:
+    app: genai-svc-t2v-transformers
+    monitoring: "true"
 spec:
   selector:
     app: ai-event-concepter-genai-svc-t2v-transformers-selector
   ports:
     - port: {{ .Values.genaisvct2vtransformers.service.port }}
       targetPort: {{ .Values.genaisvct2vtransformers.service.targetPort }}
+      name: http
   type: {{ .Values.genaisvct2vtransformers.service.type }}