Merge pull request #44 from AET-DevOps25/week8-backend

Week8 backend

Author: DuGuYifei

dashboards/genai.json

@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 12,
+  "id": 4,
   "links": [],
   "panels": [
     {
@@ -38,6 +38,7 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -68,8 +69,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -95,10 +95,12 @@
           "showLegend": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -107,7 +109,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ai_requests_total{instance=\"198.18.199.161:8000\"}",
+          "expr": "ai_requests_created{method=\"ScoreResume\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -117,7 +119,7 @@
           "useBackend": false
         }
       ],
-      "title": "AI requests total",
+      "title": "ScoreResume Requests",
       "type": "timeseries"
     },
     {
@@ -137,6 +139,7 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -167,8 +170,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -194,10 +196,12 @@
           "showLegend": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -206,7 +210,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "ai_requests_created{instance=\"198.18.199.161:8000\"}",
+          "expr": "ai_requests_created{method=\"ScoreInterview\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -216,7 +220,7 @@
           "useBackend": false
         }
       ],
-      "title": "AI request created",
+      "title": "ScoreInterview Requests",
       "type": "timeseries"
     },
     {
@@ -236,6 +240,7 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
+            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -266,8 +271,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -293,10 +297,12 @@
           "showLegend": true
         },
         "tooltip": {
+          "hideZeros": false,
           "mode": "single",
           "sort": "none"
         }
       },
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -305,7 +311,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "python_info{instance=\"198.18.199.161:8000\"}",
+          "expr": "ai_requests_created{method=\"ChatReply\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -315,11 +321,12 @@
           "useBackend": false
         }
       ],
-      "title": "Python Info",
+      "title": "ChatReply Requests",
       "type": "timeseries"
     }
   ],
-  "schemaVersion": 39,
+  "preload": false,
+  "schemaVersion": 41,
   "tags": [],
   "templating": {
     "list": []
@@ -331,7 +338,6 @@
   "timepicker": {},
   "timezone": "browser",
   "title": "GenAI",
-  "uid": "ber4hct3s49a8b",
-  "version": 4,
-  "weekStart": ""
+  "uid": "29aab0c0-b2dc-48a7-8bfa-18cadf563153",
+  "version": 5
 }

helm/aihr/charts/service-auth/templates/deployment.yaml

@@ -65,6 +65,9 @@ spec:
             - name: CORS_ALLOWED_ORIGINS
               value: {{ .Values.env.corsAllowed | default .Values.global.env.corsAllowed | quote }}
 
+            - name: AUTH_COOKIE_DOMAIN
+              value: {{ .Values.env.authCookieDomain | default .Values.global.env.authCookieDomain | quote }}
+
           readinessProbe:
             httpGet:
               path: /actuator/health

helm/aihr/charts/service-auth/values.yaml

@@ -15,6 +15,7 @@ env:
   corsAllowed: ""
   jwtPrivateKey: ""
   jwtPublicKey: ""
+  authCookieDomain: ""
 
 monitoring:
   enabled: true

helm/aihr/templates/loki-rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-loki
+  namespace: {{ .Release.Namespace }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-loki
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: {{ .Release.Name }}-loki
+  apiGroup: rbac.authorization.k8s.io

helm/aihr/templates/lokil-role.yaml

@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-loki
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "pods", "services", "endpoints" ]
+    verbs: [ "get", "list", "watch" ]

helm/aihr/values-common-promtail.yaml

@@ -11,37 +11,6 @@ promtail:
   daemonset:
     enabled: true
 
-  # 日志采集与推送配置
-  config:
-    logLevel: debug
-    snippets:
-      scrapeConfigs: |
-        - job_name: kubernetes-pods
-          kubernetes_sd_configs:
-            - role: pod
-              namespaces:
-                names: [ai-hr-dev]
-          relabel_configs:
-            # 采集所有 namespace/pod/container 的日志并加标签
-            - source_labels: [__meta_kubernetes_namespace]
-              target_label: namespace
-            - source_labels: [__meta_kubernetes_pod_name]
-              target_label: pod
-            - source_labels: [__meta_kubernetes_pod_container_name]
-              target_label: container
-            - source_labels: [__meta_kubernetes_node_name]
-              target_label: node
-            # 日志路径
-            - action: replace
-              source_labels: 
-                - __meta_kubernetes_namespace
-                - __meta_kubernetes_pod_name
-                - __meta_kubernetes_pod_uid
-                - __meta_kubernetes_pod_container_name
-              regex: (.+);(.+);(.+);(.+)
-              replacement: /var/log/pods/*$3/$4/*.log*
-              target_label: __path__
-
   # 资源限制
   resources:
     limits:

helm/aihr/values-dev-grafana.yaml

@@ -18,6 +18,11 @@ grafana:
             httpHeaderName1: 'X-Scope-OrgID'
           secureJsonData:
             httpHeaderValue1: 'promtail'
+        - name: alertmanager-prometheus
+          uid: alertmanager-prometheus
+          type: prometheus
+          url: http://ai-hr-dev-alertmanager:9093
+          access: proxy
   ingress:
     hosts:
       - grafana.ai-hr-dev.student.k8s.aet.cit.tum.de

helm/aihr/values-dev-loki.yaml

@@ -1,4 +1,7 @@
 loki:
+  serviceAccount:
+    create: true
+    name: ai-hr-dev-loki
   gateway:
     ingress:
       enabled: true
@@ -12,4 +15,6 @@ loki:
           hosts:
             - loki.ai-hr-dev.student.k8s.aet.cit.tum.de
       annotations:
-        cert-manager.io/cluster-issuer: letsencrypt-prod
+        cert-manager.io/cluster-issuer: letsencrypt-prod
+        nginx.ingress.kubernetes.io/auth-url: "https://api.ai-hr-dev.student.k8s.aet.cit.tum.de/api/v1/auth/verify"
+        nginx.ingress.kubernetes.io/auth-signin: "https://api.ai-hr-dev.student.k8s.aet.cit.tum.de/api/v1/auth/index.html?redirect=$request_uri"

helm/aihr/values-dev-prometheus.yaml

@@ -13,6 +13,8 @@ prometheus:
             - alertmanager.ai-hr-dev.student.k8s.aet.cit.tum.de
       annotations:
         cert-manager.io/cluster-issuer: letsencrypt-prod
+        nginx.ingress.kubernetes.io/auth-url: "https://api.ai-hr-dev.student.k8s.aet.cit.tum.de/api/v1/auth/verify"
+        nginx.ingress.kubernetes.io/auth-signin: "https://api.ai-hr-dev.student.k8s.aet.cit.tum.de/api/v1/auth/index.html?redirect=$request_uri"
   server:
     ingress:
       enabled: true
@@ -23,4 +25,6 @@ prometheus:
           hosts:
             - prometheus.ai-hr-dev.student.k8s.aet.cit.tum.de
       annotations:
-        cert-manager.io/cluster-issuer: letsencrypt-prod
+        cert-manager.io/cluster-issuer: letsencrypt-prod
+        nginx.ingress.kubernetes.io/auth-url: "https://api.ai-hr-dev.student.k8s.aet.cit.tum.de/api/v1/auth/verify"
+        nginx.ingress.kubernetes.io/auth-signin: "https://api.ai-hr-dev.student.k8s.aet.cit.tum.de/api/v1/auth/index.html?redirect=$request_uri"

helm/aihr/values-dev-promtail.yaml

@@ -1,5 +1,34 @@
 promtail:
+  # 日志采集与推送配置
   config:
+    logLevel: debug
     clients:
       - url: http://ai-hr-dev-loki-gateway/loki/api/v1/push
-        tenant_id: "promtail"
+        tenant_id: "promtail"
+    snippets:
+      scrapeConfigs: |
+        - job_name: kubernetes-pods
+          kubernetes_sd_configs:
+            - role: pod
+              namespaces:
+                names: [ai-hr-dev]
+          relabel_configs:
+            # 采集所有 namespace/pod/container 的日志并加标签
+            - source_labels: [__meta_kubernetes_namespace]
+              target_label: namespace
+            - source_labels: [__meta_kubernetes_pod_name]
+              target_label: pod
+            - source_labels: [__meta_kubernetes_pod_container_name]
+              target_label: container
+            - source_labels: [__meta_kubernetes_node_name]
+              target_label: node
+            # 日志路径
+            - action: replace
+              source_labels: 
+                - __meta_kubernetes_namespace
+                - __meta_kubernetes_pod_name
+                - __meta_kubernetes_pod_uid
+                - __meta_kubernetes_pod_container_name
+              regex: (.+);(.+);(.+);(.+)
+              replacement: /var/log/pods/*$3/$4/*.log*
+              target_label: __path__