From f35fb1097ff1239a65d16c818697dc691068ab5e Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Wed, 17 Sep 2025 05:56:50 +0000 Subject: [PATCH 01/38] ci(bump): bump notification image version for alpha to snapshot-be2acb5 --- freeleaps/helm-pkg/notification/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 45feb8c5..8e3fdb42 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -15,7 +15,7 @@ notification: registry: docker.io repository: null name: notification - tag: snapshot-3301aec + tag: snapshot-be2acb5 imagePullPolicy: IfNotPresent ports: - name: http From c766c9ccd1d87763162ff6d2465fb792302bd549 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Wed, 17 Sep 2025 06:05:37 +0000 Subject: [PATCH 02/38] ci(bump): bump chat image version for alpha to snapshot-cc66272 --- freeleaps/helm-pkg/chat/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index 83b6e262..ac84201a 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/freeleaps/helm-pkg/chat/values.alpha.yaml @@ -16,7 +16,7 @@ chat: registry: docker.io repository: null name: chat - tag: snapshot-72ca055 + tag: snapshot-cc66272 imagePullPolicy: IfNotPresent ports: - name: http From 319f7c09b0c2e7ac0935901dc0af82048b07a492 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Wed, 17 Sep 2025 06:16:41 +0000 Subject: [PATCH 03/38] ci(bump): bump freeleaps image version for alpha to snapshot-cc66272 --- freeleaps/helm-pkg/freeleaps/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index a83e9b89..3a226d5b 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml @@ -16,7 +16,7 @@ freeleaps: registry: docker.io repository: null name: backend - tag: snapshot-72ca055 + tag: snapshot-cc66272 imagePullPolicy: IfNotPresent ports: - name: http From 15bc2cb93d1652d4691505f05370edc52e908036 Mon Sep 17 00:00:00 2001 From: icecheng Date: Wed, 17 Sep 2025 14:32:45 +0800 Subject: [PATCH 04/38] feat: increase initialDelaySeconds for notification service probes --- freeleaps/helm-pkg/notification/values.alpha.yaml | 4 ++-- freeleaps/helm-pkg/notification/values.prod.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 8e3fdb42..513e7ef5 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -34,7 +34,7 @@ notification: config: path: /api/_/readyz port: 8003 - initialDelaySeconds: 5 + initialDelaySeconds: 30 periodSeconds: 30 timeoutSeconds: 3 successThreshold: 1 @@ -44,7 +44,7 @@ notification: config: path: /api/_/livez port: 8003 - initialDelaySeconds: 5 + initialDelaySeconds: 30 periodSeconds: 15 timeoutSeconds: 3 successThreshold: 1 diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml index d21c4943..676c1857 100644 --- a/freeleaps/helm-pkg/notification/values.prod.yaml +++ b/freeleaps/helm-pkg/notification/values.prod.yaml @@ -32,7 +32,7 @@ notification: config: path: /api/_/readyz port: 8003 - initialDelaySeconds: 5 + initialDelaySeconds: 30 periodSeconds: 30 timeoutSeconds: 3 successThreshold: 1 @@ -42,7 +42,7 @@ notification: config: path: /api/_/livez port: 8003 - initialDelaySeconds: 5 + initialDelaySeconds: 30 periodSeconds: 15 timeoutSeconds: 3 successThreshold: 1 From 670543559c99d42fc50f0716ea126b18aeba9f98 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Wed, 17 Sep 2025 06:46:59 +0000 Subject: [PATCH 05/38] ci(bump): bump frontend image version for alpha to snapshot-cc66272 --- freeleaps/helm-pkg/frontend/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/frontend/values.alpha.yaml b/freeleaps/helm-pkg/frontend/values.alpha.yaml index 70f5aa30..cb0cfca2 100644 --- a/freeleaps/helm-pkg/frontend/values.alpha.yaml +++ b/freeleaps/helm-pkg/frontend/values.alpha.yaml @@ -8,7 +8,7 @@ frontend: registry: docker.io repository: null name: frontend - tag: snapshot-72ca055 + tag: snapshot-cc66272 imagePullPolicy: IfNotPresent ports: - name: http From 163db34e3da5e3dcbc9a10ad1cf7ce99b2c8e232 Mon Sep 17 00:00:00 2001 From: icecheng Date: Wed, 17 Sep 2025 15:02:08 +0800 Subject: [PATCH 06/38] feat: add authServiceEndpoint to notification config --- .../templates/notification/notification-config.yaml | 1 + freeleaps/helm-pkg/notification/values.alpha.yaml | 1 + freeleaps/helm-pkg/notification/values.prod.yaml | 1 + freeleaps/helm-pkg/notification/values.yaml | 2 ++ 4 files changed, 5 insertions(+) diff --git a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml index 0c04720c..b0fdc90b 100644 --- a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml +++ b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml @@ -10,6 +10,7 @@ data: SERVICE_API_ACCESS_HOST: {{ .Values.notification.configs.serviceApiAccessHost | b64enc | quote }} SERVICE_API_ACCESS_PORT: {{ .Values.notification.configs.serviceApiAccessPort | toString | b64enc }} RABBITMQ_HOST: {{ .Values.notification.configs.rabbitmqHost | b64enc | quote }} + AUTH_SERVICE_ENDPOINT: {{ .Values.notification.configs.authServiceEndpoint | b64enc | quote }} RABBITMQ_PORT: {{ .Values.notification.configs.rabbitmqPort | toString | b64enc }} RABBITMQ_USERNAME: {{ .Values.notification.configs.rabbitmqUsername | b64enc | quote }} RABBITMQ_VRITUAL_HOST: {{ .Values.notification.configs.rabbitmqVritualHost | b64enc | quote }} diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 513e7ef5..970f901b 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -83,6 +83,7 @@ notification: mongodbName: freeleaps2 mongodbPort: 27017 rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster + authServiceEndpoint: http://freeleaps-auth-service.68c0da88a0a7837e84b580eb-alpha.svc.freeleaps.cluster:9000/api/v1/keys/ rabbitmqPort: 5672 rabbitmqUsername: user rabbitmqVritualHost: / diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml index 676c1857..14e3d21d 100644 --- a/freeleaps/helm-pkg/notification/values.prod.yaml +++ b/freeleaps/helm-pkg/notification/values.prod.yaml @@ -69,6 +69,7 @@ notification: mongodbName: freeleaps2 mongodbPort: 27017 rabbitmqHost: freeleaps-prod-rabbitmq-headless.freeleaps-prod.svc.freeleaps.cluster + authServiceEndpoint: http://freeleaps-auth-service.68c0da88a0a7837e84b580eb-prod.svc.freeleaps.cluster:9000/api/v1/keys/ rabbitmqPort: 5672 rabbitmqUsername: user rabbitmqVritualHost: / diff --git a/freeleaps/helm-pkg/notification/values.yaml b/freeleaps/helm-pkg/notification/values.yaml index 783782d3..3ea2aed5 100644 --- a/freeleaps/helm-pkg/notification/values.yaml +++ b/freeleaps/helm-pkg/notification/values.yaml @@ -61,6 +61,8 @@ notification: mongodbPort: "27017" # RABBITMQ_HOST rabbitmqHost: "" + # AUTH_SERVICE_ENDPOINT + authServiceEndpoint: "" # RABBITMQ_PORT rabbitmqPort: "" # RABBITMQ_USERNAME From cd4f8f7ca20e8058533a992d18f6e02a4dd6093f Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 01:48:55 +0000 Subject: [PATCH 07/38] ci(bump): bump notification image version for alpha to snapshot-071694c --- freeleaps/helm-pkg/notification/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 970f901b..ddd875be 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -15,7 +15,7 @@ notification: registry: docker.io repository: null name: notification - tag: snapshot-be2acb5 + tag: snapshot-071694c imagePullPolicy: IfNotPresent ports: - name: http From 3c4c7199df3d99bcdfbdd0299f88f508d181eb4c Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 02:29:36 +0000 Subject: [PATCH 08/38] ci(bump): bump devsvc image version for prod to 1.3.0 --- freeleaps/helm-pkg/devsvc/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/devsvc/values.prod.yaml b/freeleaps/helm-pkg/devsvc/values.prod.yaml index 2d76b3e8..b85aa765 100644 --- a/freeleaps/helm-pkg/devsvc/values.prod.yaml +++ b/freeleaps/helm-pkg/devsvc/values.prod.yaml @@ -18,7 +18,7 @@ devsvc: registry: docker.io repository: null name: devsvc - tag: snapshot-64a4ff7 + tag: 1.3.0 imagePullPolicy: IfNotPresent ports: - name: http From c48d515ab4154a924f62cd4fe098fb3a244d8322 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 04:24:23 +0000 Subject: [PATCH 09/38] ci(bump): bump authentication image version for prod to snapshot-4a5bdb4 --- freeleaps/helm-pkg/authentication/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/authentication/values.prod.yaml b/freeleaps/helm-pkg/authentication/values.prod.yaml index 6dd598ee..be76b182 100644 --- a/freeleaps/helm-pkg/authentication/values.prod.yaml +++ b/freeleaps/helm-pkg/authentication/values.prod.yaml @@ -13,7 +13,7 @@ authentication: registry: docker.io repository: null name: authentication - tag: snapshot-046f9ff + tag: snapshot-4a5bdb4 imagePullPolicy: IfNotPresent ports: - name: http From aab8194c6b56579eb6f84c59c97936af05462994 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 04:29:41 +0000 Subject: [PATCH 10/38] ci(bump): bump centralStorage image version for prod to snapshot-4a5bdb4 --- freeleaps/helm-pkg/centralStorage/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/centralStorage/values.prod.yaml b/freeleaps/helm-pkg/centralStorage/values.prod.yaml index 11964b10..f16806cc 100644 --- a/freeleaps/helm-pkg/centralStorage/values.prod.yaml +++ b/freeleaps/helm-pkg/centralStorage/values.prod.yaml @@ -18,7 +18,7 @@ centralStorage: registry: docker.io repository: null name: central_storage - tag: snapshot-046f9ff + tag: snapshot-4a5bdb4 imagePullPolicy: IfNotPresent ports: - name: http From db85409c43c71511e071f8c9af5eae7907f2c743 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 04:37:32 +0000 Subject: [PATCH 11/38] ci(bump): bump content image version for prod to snapshot-4a5bdb4 --- freeleaps/helm-pkg/content/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/content/values.prod.yaml b/freeleaps/helm-pkg/content/values.prod.yaml index 96850e33..f520c534 100644 --- a/freeleaps/helm-pkg/content/values.prod.yaml +++ b/freeleaps/helm-pkg/content/values.prod.yaml @@ -13,7 +13,7 @@ content: registry: docker.io repository: null name: content - tag: snapshot-046f9ff + tag: snapshot-4a5bdb4 imagePullPolicy: IfNotPresent ports: - name: http From 4d1860f7a1ab1c38a075d14e38ff5463a7626abe Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 04:42:59 +0000 Subject: [PATCH 12/38] ci(bump): bump notification image version for prod to snapshot-4a5bdb4 --- freeleaps/helm-pkg/notification/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml index 14e3d21d..f7d39a66 100644 --- a/freeleaps/helm-pkg/notification/values.prod.yaml +++ b/freeleaps/helm-pkg/notification/values.prod.yaml @@ -13,7 +13,7 @@ notification: registry: docker.io repository: null name: notification - tag: snapshot-046f9ff + tag: snapshot-4a5bdb4 imagePullPolicy: IfNotPresent ports: - name: http From 5918ab5b50d6853f651066222817ba97dac2ffb7 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 04:48:49 +0000 Subject: [PATCH 13/38] ci(bump): bump payment image version for prod to snapshot-4a5bdb4 --- freeleaps/helm-pkg/payment/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/payment/values.prod.yaml b/freeleaps/helm-pkg/payment/values.prod.yaml index 755cd8bb..d70f86b3 100644 --- a/freeleaps/helm-pkg/payment/values.prod.yaml +++ b/freeleaps/helm-pkg/payment/values.prod.yaml @@ -13,7 +13,7 @@ payment: registry: docker.io repository: null name: payment - tag: snapshot-046f9ff + tag: snapshot-4a5bdb4 imagePullPolicy: IfNotPresent ports: - name: http From d5663a97eb02d5c6c6d7848168e88e672969c25d Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 05:08:29 +0000 Subject: [PATCH 14/38] ci(bump): bump devops image version for prod to snapshot-4a5bdb4 --- freeleaps/helm-pkg/devops/values.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/devops/values.prod.yaml b/freeleaps/helm-pkg/devops/values.prod.yaml index 9c918915..949df872 100644 --- a/freeleaps/helm-pkg/devops/values.prod.yaml +++ b/freeleaps/helm-pkg/devops/values.prod.yaml @@ -10,7 +10,7 @@ devops: registry: docker.io repository: null name: devops - tag: snapshot-046f9ff + tag: snapshot-4a5bdb4 imagePullPolicy: IfNotPresent ports: - name: http From cc77fc2127d55a4453ae0cdcb1e2dea41f99d88f Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 05:31:55 +0000 Subject: [PATCH 15/38] ci(bump): bump chat image version for alpha to snapshot-1213863 --- freeleaps/helm-pkg/chat/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index ac84201a..a666cf20 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/freeleaps/helm-pkg/chat/values.alpha.yaml @@ -16,7 +16,7 @@ chat: registry: docker.io repository: null name: chat - tag: snapshot-cc66272 + tag: snapshot-1213863 imagePullPolicy: IfNotPresent ports: - name: http From a47892c34c0047adbcf58d7cd11c6a79e83044b1 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 05:42:07 +0000 Subject: [PATCH 16/38] ci(bump): bump freeleaps image version for alpha to snapshot-1213863 --- freeleaps/helm-pkg/freeleaps/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index 3a226d5b..604a2a82 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml @@ -16,7 +16,7 @@ freeleaps: registry: docker.io repository: null name: backend - tag: snapshot-cc66272 + tag: snapshot-1213863 imagePullPolicy: IfNotPresent ports: - name: http From bb1da229fb5e0baa4242f0f7a85d714b7dc25798 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 13:46:24 +0800 Subject: [PATCH 17/38] feat: add metrics chart and update freeleaps-service-hub Jenkinsfile --- .../ci/freeleaps-service-hub/Jenkinsfile | 23 ++++- freeleaps/helm-pkg/metrics/Chart.yaml | 6 ++ .../metrics/templates/metrics/deployment.yaml | 97 +++++++++++++++++++ .../templates/metrics/metrics-config.yaml | 13 +++ .../metrics/templates/metrics/service.yaml | 26 +++++ .../metrics/templates/metrics/vpa.yaml | 32 ++++++ freeleaps/helm-pkg/metrics/values.alpha.yaml | 71 ++++++++++++++ freeleaps/helm-pkg/metrics/values.prod.yaml | 95 ++++++++++++++++++ freeleaps/helm-pkg/metrics/values.yaml | 71 ++++++++++++++ .../prod/ci/freeleaps-service-hub/Jenkinsfile | 21 ++++ 10 files changed, 454 insertions(+), 1 deletion(-) create mode 100644 freeleaps/helm-pkg/metrics/Chart.yaml create mode 100644 freeleaps/helm-pkg/metrics/templates/metrics/deployment.yaml create mode 100644 freeleaps/helm-pkg/metrics/templates/metrics/metrics-config.yaml create mode 100644 freeleaps/helm-pkg/metrics/templates/metrics/service.yaml create mode 100644 freeleaps/helm-pkg/metrics/templates/metrics/vpa.yaml create mode 100644 freeleaps/helm-pkg/metrics/values.alpha.yaml create mode 100644 freeleaps/helm-pkg/metrics/values.prod.yaml create mode 100644 freeleaps/helm-pkg/metrics/values.yaml diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 5b0fef1c..9a866d0e 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -4,7 +4,7 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'alpha' // Ensure this branch exists in the freeleaps-service-hub repository - serviceGitBranch = 'dev' + serviceGitBranch = 'freeleaps/icecheng/metrics' serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' @@ -136,6 +136,27 @@ executeFreeleapsPipeline { imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', semanticReleaseEnabled: true + ], + [ + name: 'metrics', + root: 'apps/metrcis', + language: 'python', + dependenciesManager: 'pip', + requirementsFile: 'requirements.txt', + buildCacheEnabled: true, + buildAgentImage: 'python:3.12-slim', + buildArtifacts: ['.'], + lintEnabled: false, + sastEnabled: false, + imageRegistry: 'docker.io', + imageRepository: 'freeleaps', + imageName: 'devops', + imageBuilder: 'dind', + dockerfilePath: 'Dockerfile', + imageBuildRoot: '.', + imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], + registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', + semanticReleaseEnabled: true ] ] } \ No newline at end of file diff --git a/freeleaps/helm-pkg/metrics/Chart.yaml b/freeleaps/helm-pkg/metrics/Chart.yaml new file mode 100644 index 00000000..3c66e7ce --- /dev/null +++ b/freeleaps/helm-pkg/metrics/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: metrics +description: A Helm Chart of metrics, which part of Freeleaps Platform, powered by Freeleaps. +type: application +version: 0.0.1 +appVersion: "0.0.1" diff --git a/freeleaps/helm-pkg/metrics/templates/metrics/deployment.yaml b/freeleaps/helm-pkg/metrics/templates/metrics/deployment.yaml new file mode 100644 index 00000000..e81c2178 --- /dev/null +++ b/freeleaps/helm-pkg/metrics/templates/metrics/deployment.yaml @@ -0,0 +1,97 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + app.kubernetes.io/name: "metrics" + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + name: "metrics" + namespace: {{ .Release.Namespace | quote }} +spec: + selector: + matchLabels: + app.kubernetes.io/name: "metrics" + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + replicas: {{ .Values.metrics.replicas }} + template: + metadata: + labels: + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + app.kubernetes.io/name: "metrics" + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + annotations: + app.kubernetes.io/config-checksum: {{ include (print $.Template.BasePath "/metrics/metrics-config.yaml") . | sha256sum }} + spec: + containers: + - name: "metrics" + image: "{{ coalesce .Values.metrics.image.registry .Values.global.registry "docker.io"}}/{{ coalesce .Values.metrics.image.repository .Values.global.repository }}/{{ .Values.metrics.image.name }}:{{ .Values.metrics.image.tag | default "latest" }}" + imagePullPolicy: {{ .Values.metrics.image.imagePullPolicy | default "IfNotPresent" }} + ports: + {{- range $port := .Values.metrics.ports }} + - containerPort: {{ $port.containerPort }} + name: {{ $port.name }} + protocol: {{ $port.protocol }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: + {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + {{- if .Values.metrics.probes }} + {{- if and (.Values.metrics.probes.liveness) (eq .Values.metrics.probes.liveness.type "httpGet") }} + livenessProbe: + httpGet: + path: {{ .Values.metrics.probes.liveness.config.path }} + port: {{ .Values.metrics.probes.liveness.config.port }} + {{- if .Values.metrics.probes.liveness.config.initialDelaySeconds }} + initialDelaySeconds: {{ .Values.metrics.probes.liveness.config.initialDelaySeconds }} + {{- end }} + {{- if .Values.metrics.probes.liveness.config.periodSeconds }} + periodSeconds: {{ .Values.metrics.probes.liveness.config.periodSeconds }} + {{- end }} + {{- if .Values.metrics.probes.liveness.config.timeoutSeconds }} + timeoutSeconds: {{ .Values.metrics.probes.liveness.config.timeoutSeconds }} + {{- end }} + {{- if .Values.metrics.probes.liveness.config.successThreshold }} + successThreshold: {{ .Values.metrics.probes.liveness.config.successThreshold }} + {{- end }} + {{- if .Values.metrics.probes.liveness.config.failureThreshold }} + failureThreshold: {{ .Values.metrics.probes.liveness.config.failureThreshold }} + {{- end }} + {{- if .Values.metrics.probes.liveness.config.terminationGracePeriodSeconds }} + terminationGracePeriodSeconds: {{ .Values.metrics.probes.liveness.config.terminationGracePeriodSeconds }} + {{- end }} + {{- end }} + {{- if and (.Values.metrics.probes.readiness) (eq .Values.metrics.probes.readiness.type "httpGet") }} + readinessProbe: + httpGet: + path: {{ .Values.metrics.probes.readiness.config.path }} + port: {{ .Values.metrics.probes.readiness.config.port }} + {{- if .Values.metrics.probes.readiness.config.initialDelaySeconds }} + initialDelaySeconds: {{ .Values.metrics.probes.readiness.config.initialDelaySeconds }} + {{- end }} + {{- if .Values.metrics.probes.readiness.config.periodSeconds }} + periodSeconds: {{ .Values.metrics.probes.readiness.config.periodSeconds }} + {{- end }} + {{- if .Values.metrics.probes.readiness.config.timeoutSeconds }} + timeoutSeconds: {{ .Values.metrics.probes.readiness.config.timeoutSeconds }} + {{- end }} + {{- if .Values.metrics.probes.readiness.config.successThreshold }} + successThreshold: {{ .Values.metrics.probes.readiness.config.successThreshold }} + {{- end }} + {{- if .Values.metrics.probes.readiness.config.failureThreshold }} + failureThreshold: {{ .Values.metrics.probes.readiness.config.failureThreshold }} + {{- end }} + {{- end }} + {{- end}} + env: + {{- range $key, $value := .Values.metrics.configs }} + - name: {{ $key | snakecase | upper }} + valueFrom: + secretKeyRef: + name: metrics-config + key: {{ $key | snakecase | upper }} + {{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/metrics/templates/metrics/metrics-config.yaml b/freeleaps/helm-pkg/metrics/templates/metrics/metrics-config.yaml new file mode 100644 index 00000000..dd43d201 --- /dev/null +++ b/freeleaps/helm-pkg/metrics/templates/metrics/metrics-config.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Secret +metadata: + name: metrics-config + namespace: {{ .Release.Namespace }} +type: Opaque +data: + STARROCKS_HOST: {{ .Values.metrics.configs.starrocksHost | b64enc | quote }} + STARROCKS_PORT: {{ .Values.metrics.configs.starrocksPort | toString | b64enc | quote }} + STARROCKS_USER: {{ .Values.metrics.configs.starrocksUser | b64enc | quote }} + STARROCKS_PASSWORD: {{ .Values.metrics.configs.starrocksPassword | b64enc | quote }} + STARROCKS_DATABASE: {{ .Values.metrics.configs.starrocksDatabase | b64enc | quote }} + PROMETHEUS_ENDPOINT: {{ .Values.metrics.configs.prometheusEndpoint | b64enc | quote }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/metrics/templates/metrics/service.yaml b/freeleaps/helm-pkg/metrics/templates/metrics/service.yaml new file mode 100644 index 00000000..50b615eb --- /dev/null +++ b/freeleaps/helm-pkg/metrics/templates/metrics/service.yaml @@ -0,0 +1,26 @@ +{{ $namespace := .Release.Namespace }} +{{ $appVersion := .Chart.AppVersion | quote }} +{{ $releaseService := .Release.Service }} +{{ $releaseName := .Release.Name }} +{{- range $service := .Values.metrics.services }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ $service.name }} + namespace: {{ $namespace }} + labels: + app.kubernetes.io/version: {{ $appVersion }} + app.kubernetes.io/name: {{ $service.name | quote }} + app.kubernetes.io/managed-by: {{ $releaseService }} + app.kubernetes.io/instance: {{ $releaseName }} +spec: + ports: + - port: {{ $service.port }} + targetPort: {{ $service.targetPort }} + selector: + app.kubernetes.io/version: {{ $appVersion }} + app.kubernetes.io/name: "metrics" + app.kubernetes.io/managed-by: {{ $releaseService }} + app.kubernetes.io/instance: {{ $releaseName }} +{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/metrics/templates/metrics/vpa.yaml b/freeleaps/helm-pkg/metrics/templates/metrics/vpa.yaml new file mode 100644 index 00000000..bc3efdc3 --- /dev/null +++ b/freeleaps/helm-pkg/metrics/templates/metrics/vpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.metrics.vpa }} +--- +apiVersion: autoscaling.k8s.io/v1 +kind: VerticalPodAutoscaler +metadata: + name: {{ .Release.Name }}-vpa + namespace: {{ .Release.Namespace }} +spec: + targetRef: + apiVersion: apps/v1 + kind: Deployment + name: metrics + resourcePolicy: + containerPolicies: + - containerName: '*' + {{- if .Values.metrics.vpa.minAllowed.enabled }} + minAllowed: + cpu: {{ .Values.metrics.vpa.minAllowed.cpu }} + memory: {{ .Values.metrics.vpa.minAllowed.memory }} + {{- end }} + {{- if .Values.metrics.vpa.maxAllowed.enabled }} + maxAllowed: + cpu: {{ .Values.metrics.vpa.maxAllowed.cpu }} + memory: {{ .Values.metrics.vpa.maxAllowed.memory }} + {{- end }} + {{- if .Values.metrics.vpa.controlledResources }} + controlledResources: + {{- range .Values.metrics.vpa.controlledResources }} + - {{ . }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/metrics/values.alpha.yaml b/freeleaps/helm-pkg/metrics/values.alpha.yaml new file mode 100644 index 00000000..35a2bb76 --- /dev/null +++ b/freeleaps/helm-pkg/metrics/values.alpha.yaml @@ -0,0 +1,71 @@ +global: + registry: docker.io + repository: freeleaps + nodeSelector: {} +logIngest: + enabled: false +metrics: + replicas: 1 + image: + registry: docker.io + repository: null + name: metrics + tag: "1.0.0" + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 8009 + protocol: TCP + resources: + requests: + cpu: '0.1' + memory: 64Mi + limits: + cpu: '0.2' + memory: 128Mi + probes: + liveness: + type: httpGet + config: + path: /api/_/livez + port: 8009 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 5 + terminationGracePeriodSeconds: 30 + readiness: + type: httpGet + config: + path: /api/_/readyz + port: 8009 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 5 + services: + - name: metrics-service + type: ClusterIP + port: 8009 + targetPort: 8009 + configs: + starrocksHost: UTC + starrocksPort: 8009 + starrocksUser: user + starrocksPassword: password + starrocksDatabase: metrics + prometheusEndpoint: http://prometheus-gateway.freeleaps-monitoring-system:9090 + vpa: + minAllowed: + enabled: false + cpu: 100m + memory: 64Mi + maxAllowed: + enabled: true + cpu: 100m + memory: 128Mi + controlledResources: + - cpu + - memory diff --git a/freeleaps/helm-pkg/metrics/values.prod.yaml b/freeleaps/helm-pkg/metrics/values.prod.yaml new file mode 100644 index 00000000..9c918915 --- /dev/null +++ b/freeleaps/helm-pkg/metrics/values.prod.yaml @@ -0,0 +1,95 @@ +global: + registry: docker.io + repository: freeleaps + nodeSelector: {} +logIngest: + enabled: false +devops: + replicas: 1 + image: + registry: docker.io + repository: null + name: devops + tag: snapshot-046f9ff + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 8014 + protocol: TCP + resources: + requests: + cpu: '0.1' + memory: 64Mi + limits: + cpu: '0.2' + memory: 128Mi + probes: {} + services: + - name: devops-service + type: ClusterIP + port: 8014 + targetPort: 8014 + serviceMonitor: + enabled: false + labels: + release: kube-prometheus-stack + namespace: freeleaps-monitoring-system + interval: 30s + scrapeTimeout: '' + ingresses: {} + configs: + tz: UTC + appName: devops + jwtSecretKey: '' + jwtAlgorithm: HS256 + accessTokenExpireMinutes: '3600' + refreshTokenExpireDays: '1' + appMongodbName: freeleaps2 + appMongodbPort: '27017' + metricsEnabled: 'false' + probesEnabled: 'true' + baseGiteaUrl: https://gitea.freeleaps.mathmast.com + baseReconcileUrl: http://freeleaps-prod-devops-reconciler-freeleaps-devops-reconciler.freeleaps-prod.svc.freeleaps.cluster:5000 + baseLokiUrl: http://loki-gateway.freeleaps-logging-system + logBasePath: /app/log/devops + logRetention: 30 days + logRotation: 00:00 + logBackupFiles: '5' + logRotationBytes: '10485760' + mockMode: 'false' + mockResponseDelay: '1000' + rabbitmqHost: freeleaps-prod-rabbitmq-headless.freeleaps-prod.svc.freeleaps.cluster + rabbitmqPort: 5672 + rabbitmqUsername: user + rabbitmqVirtualHost: / + rabbitmqOutputQueueName: freeleaps.devops.reconciler.output + rabbitmqInputQueueName: freeleaps.devops.reconciler.input + secrets: + secretStoreRef: + kind: FreeleapsSecretStore + name: freeleaps-main-secret-store + target: + name: freeleaps-devops-prod-secrets + creationPolicy: Owner + refreshInterval: 30s + data: + - key: appMongodbUri + remoteRef: + key: freeleaps-prod-mongodb-uri + type: Secret + - key: rabbitmqPassword + remoteRef: + key: freeleaps-prod-rabbitmq-password + type: Secret + vpa: + minAllowed: + enabled: false + cpu: 100m + memory: 64Mi + maxAllowed: + enabled: true + cpu: 100m + memory: 128Mi + controlledResources: + - cpu + - memory diff --git a/freeleaps/helm-pkg/metrics/values.yaml b/freeleaps/helm-pkg/metrics/values.yaml new file mode 100644 index 00000000..c00438b8 --- /dev/null +++ b/freeleaps/helm-pkg/metrics/values.yaml @@ -0,0 +1,71 @@ +global: + registry: docker.io + repository: freeleaps + nodeSelector: {} +logIngest: + enabled: false +metrics: + replicas: 1 + image: + registry: docker.io + repository: null + name: metrics + tag: "1.0.0" + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 8009 + protocol: TCP + resources: + requests: + cpu: '0.1' + memory: 64Mi + limits: + cpu: '0.2' + memory: 128Mi + probes: + liveness: + type: httpGet + config: + path: /api/_/livez + port: 8009 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 5 + terminationGracePeriodSeconds: 30 + readiness: + type: httpGet + config: + path: /api/_/readyz + port: 8009 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 5 + services: + - name: metrics-service + type: ClusterIP + port: 8009 + targetPort: 8009 + configs: + starrocksHost: "" + starrocksPort: 8009 + starrocksUser: "" + starrocksPassword: "" + starrocksDatabase: "" + prometheusEndpoint: "" + vpa: + minAllowed: + enabled: false + cpu: 100m + memory: 64Mi + maxAllowed: + enabled: true + cpu: 100m + memory: 128Mi + controlledResources: + - cpu + - memory diff --git a/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile index 8c2d5678..a5f8ec5c 100644 --- a/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile @@ -135,6 +135,27 @@ executeFreeleapsPipeline { imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', semanticReleaseEnabled: true + ], + [ + name: 'metrics', + root: 'apps/metrcis', + language: 'python', + dependenciesManager: 'pip', + requirementsFile: 'requirements.txt', + buildCacheEnabled: true, + buildAgentImage: 'python:3.12-slim', + buildArtifacts: ['.'], + lintEnabled: false, + sastEnabled: false, + imageRegistry: 'docker.io', + imageRepository: 'freeleaps', + imageName: 'devops', + imageBuilder: 'dind', + dockerfilePath: 'Dockerfile', + imageBuildRoot: '.', + imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], + registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', + semanticReleaseEnabled: true ] ] } \ No newline at end of file From 232b40f24ece6cd664a8d69bea20548ea7653225 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:03:19 +0800 Subject: [PATCH 18/38] feat: update metrics values for alpha and prod --- freeleaps/helm-pkg/metrics/values.alpha.yaml | 12 ++++---- freeleaps/helm-pkg/metrics/values.prod.yaml | 32 ++++---------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/freeleaps/helm-pkg/metrics/values.alpha.yaml b/freeleaps/helm-pkg/metrics/values.alpha.yaml index 35a2bb76..7aff0edc 100644 --- a/freeleaps/helm-pkg/metrics/values.alpha.yaml +++ b/freeleaps/helm-pkg/metrics/values.alpha.yaml @@ -51,12 +51,12 @@ metrics: port: 8009 targetPort: 8009 configs: - starrocksHost: UTC - starrocksPort: 8009 - starrocksUser: user - starrocksPassword: password - starrocksDatabase: metrics - prometheusEndpoint: http://prometheus-gateway.freeleaps-monitoring-system:9090 + starrocksHost: freeleaps-starrocks-cluster-fe-service.freeleaps-data-platform.svc + starrocksPort: 9030 + starrocksUser: freeleaps_dw_admin + starrocksPassword: r7Y@QTb*7BQN@hDGsN + starrocksDatabase: freeleaps + prometheusEndpoint: http://kube-prometheus-stack-prometheus.freeleaps-monitoring-system:9090 vpa: minAllowed: enabled: false diff --git a/freeleaps/helm-pkg/metrics/values.prod.yaml b/freeleaps/helm-pkg/metrics/values.prod.yaml index 9c918915..a516b0c0 100644 --- a/freeleaps/helm-pkg/metrics/values.prod.yaml +++ b/freeleaps/helm-pkg/metrics/values.prod.yaml @@ -38,32 +38,12 @@ devops: scrapeTimeout: '' ingresses: {} configs: - tz: UTC - appName: devops - jwtSecretKey: '' - jwtAlgorithm: HS256 - accessTokenExpireMinutes: '3600' - refreshTokenExpireDays: '1' - appMongodbName: freeleaps2 - appMongodbPort: '27017' - metricsEnabled: 'false' - probesEnabled: 'true' - baseGiteaUrl: https://gitea.freeleaps.mathmast.com - baseReconcileUrl: http://freeleaps-prod-devops-reconciler-freeleaps-devops-reconciler.freeleaps-prod.svc.freeleaps.cluster:5000 - baseLokiUrl: http://loki-gateway.freeleaps-logging-system - logBasePath: /app/log/devops - logRetention: 30 days - logRotation: 00:00 - logBackupFiles: '5' - logRotationBytes: '10485760' - mockMode: 'false' - mockResponseDelay: '1000' - rabbitmqHost: freeleaps-prod-rabbitmq-headless.freeleaps-prod.svc.freeleaps.cluster - rabbitmqPort: 5672 - rabbitmqUsername: user - rabbitmqVirtualHost: / - rabbitmqOutputQueueName: freeleaps.devops.reconciler.output - rabbitmqInputQueueName: freeleaps.devops.reconciler.input + starrocksHost: freeleaps-starrocks-cluster-fe-service.freeleaps-data-platform.svc + starrocksPort: 9030 + starrocksUser: freeleaps_dw_admin + starrocksPassword: r7Y@QTb*7BQN@hDGsN + starrocksDatabase: freeleaps + prometheusEndpoint: http://kube-prometheus-stack-prometheus.freeleaps-monitoring-system:9090 secrets: secretStoreRef: kind: FreeleapsSecretStore From dc9bbb07ebe2967839fdc22058282c4accbab206 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:07:13 +0800 Subject: [PATCH 19/38] feat: update metrics branch name in Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 9a866d0e..aa06af29 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -4,7 +4,7 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'alpha' // Ensure this branch exists in the freeleaps-service-hub repository - serviceGitBranch = 'freeleaps/icecheng/metrics' + serviceGitBranch = 'feature/icecheng/metrics' serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' From 281bca314a4d2c1b205ec4816fd225a0469ad78e Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 06:11:06 +0000 Subject: [PATCH 20/38] ci(bump): bump frontend image version for alpha to snapshot-1213863 --- freeleaps/helm-pkg/frontend/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/frontend/values.alpha.yaml b/freeleaps/helm-pkg/frontend/values.alpha.yaml index cb0cfca2..c268c87a 100644 --- a/freeleaps/helm-pkg/frontend/values.alpha.yaml +++ b/freeleaps/helm-pkg/frontend/values.alpha.yaml @@ -8,7 +8,7 @@ frontend: registry: docker.io repository: null name: frontend - tag: snapshot-cc66272 + tag: snapshot-1213863 imagePullPolicy: IfNotPresent ports: - name: http From 223f78c3a41746871cd000c7c9c2fc0f934c0213 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:12:50 +0800 Subject: [PATCH 21/38] feat: update executeMode in Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index aa06af29..5b2dff5e 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -8,7 +8,7 @@ executeFreeleapsPipeline { serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' - executeMode = 'on-demand' + executeMode = 'fully' commitMessageLintEnabled = false components = [ [ From d366d25091b4ea22f2a1f84d6eb30f1dad25fd3c Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 06:19:22 +0000 Subject: [PATCH 22/38] ci(bump): bump authentication image version for alpha to snapshot-1baf906 --- freeleaps/helm-pkg/authentication/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/authentication/values.alpha.yaml b/freeleaps/helm-pkg/authentication/values.alpha.yaml index e63682bf..2c6b2586 100644 --- a/freeleaps/helm-pkg/authentication/values.alpha.yaml +++ b/freeleaps/helm-pkg/authentication/values.alpha.yaml @@ -15,7 +15,7 @@ authentication: registry: docker.io repository: null name: authentication - tag: snapshot-c406f6d + tag: snapshot-1baf906 imagePullPolicy: IfNotPresent ports: - name: http From b6fc60eafd13095e780de7ac7b0355c369bb6f4f Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 06:24:16 +0000 Subject: [PATCH 23/38] ci(bump): bump centralStorage image version for alpha to snapshot-1baf906 --- .../helm-pkg/centralStorage/values.alpha.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml index 6636a925..851291c9 100644 --- a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml +++ b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml @@ -15,7 +15,7 @@ centralStorage: registry: docker.io repository: null name: central_storage - tag: snapshot-12a0d9a + tag: snapshot-1baf906 imagePullPolicy: IfNotPresent ports: - name: http @@ -90,22 +90,22 @@ centralStorage: kind: FreeleapsSecretStore name: freeleaps-main-secret-store target: - name: "freeleaps-central-storage-secrets" - creationPolicy: "Owner" + name: freeleaps-central-storage-secrets + creationPolicy: Owner refreshInterval: 30s data: - - key: mongodbUri - remoteRef: - key: "freeleaps-alpha-mongodb-uri" - type: Secret - - key: azureStorageDocumentApiKey - remoteRef: - key: "freeleaps-alpha-azure-storage-document-api-key" - type: Secret - - key: azureStorageDocumentApiEndpoint - remoteRef: - key: "freeleaps-alpha-azure-storage-document-api-endpoint" - type: Secret + - key: mongodbUri + remoteRef: + key: freeleaps-alpha-mongodb-uri + type: Secret + - key: azureStorageDocumentApiKey + remoteRef: + key: freeleaps-alpha-azure-storage-document-api-key + type: Secret + - key: azureStorageDocumentApiEndpoint + remoteRef: + key: freeleaps-alpha-azure-storage-document-api-endpoint + type: Secret vpa: minAllowed: enabled: false From 12a54572ae6cd9290116f2b85a75f464114169a9 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:28:50 +0800 Subject: [PATCH 24/38] feat: update Jenkinsfile --- .../ci/freeleaps-service-hub/Jenkinsfile | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 5b2dff5e..043f8429 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -8,9 +8,30 @@ executeFreeleapsPipeline { serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' - executeMode = 'fully' + executeMode = 'on-demand' commitMessageLintEnabled = false components = [ + [ + name: 'metrics', + root: 'apps/metrcis', + language: 'python', + dependenciesManager: 'pip', + requirementsFile: 'requirements.txt', + buildCacheEnabled: true, + buildAgentImage: 'python:3.12-slim', + buildArtifacts: ['.'], + lintEnabled: false, + sastEnabled: false, + imageRegistry: 'docker.io', + imageRepository: 'freeleaps', + imageName: 'devops', + imageBuilder: 'dind', + dockerfilePath: 'Dockerfile', + imageBuildRoot: '.', + imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], + registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', + semanticReleaseEnabled: true + ], [ name: 'authentication', root: 'apps/authentication', @@ -136,27 +157,6 @@ executeFreeleapsPipeline { imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', semanticReleaseEnabled: true - ], - [ - name: 'metrics', - root: 'apps/metrcis', - language: 'python', - dependenciesManager: 'pip', - requirementsFile: 'requirements.txt', - buildCacheEnabled: true, - buildAgentImage: 'python:3.12-slim', - buildArtifacts: ['.'], - lintEnabled: false, - sastEnabled: false, - imageRegistry: 'docker.io', - imageRepository: 'freeleaps', - imageName: 'devops', - imageBuilder: 'dind', - dockerfilePath: 'Dockerfile', - imageBuildRoot: '.', - imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], - registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', - semanticReleaseEnabled: true ] ] } \ No newline at end of file From c5e86e805633aa4bd84c789a8c0e68875f8d1db9 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 14:31:19 +0800 Subject: [PATCH 25/38] feat: update executeMode in Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 043f8429..7661f333 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -8,7 +8,7 @@ executeFreeleapsPipeline { serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' - executeMode = 'on-demand' + executeMode = 'fully' commitMessageLintEnabled = false components = [ [ From 78b23aa18d9b19625074201d698d3f3879d9df92 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 15:47:33 +0800 Subject: [PATCH 26/38] feat: update Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 7661f333..37d92b70 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -13,7 +13,7 @@ executeFreeleapsPipeline { components = [ [ name: 'metrics', - root: 'apps/metrcis', + root: 'apps/metrics', language: 'python', dependenciesManager: 'pip', requirementsFile: 'requirements.txt', From 59b1f131405169464e9d346451b489f4d03608e7 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 16:23:06 +0800 Subject: [PATCH 27/38] feat: update Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 37d92b70..da8401c7 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -24,7 +24,7 @@ executeFreeleapsPipeline { sastEnabled: false, imageRegistry: 'docker.io', imageRepository: 'freeleaps', - imageName: 'devops', + imageName: 'metrics', imageBuilder: 'dind', dockerfilePath: 'Dockerfile', imageBuildRoot: '.', From 9a3490b01f475ffb93dc393a1fecf9068934e2a7 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 08:45:31 +0000 Subject: [PATCH 28/38] ci(bump): bump metrics image version for alpha to snapshot-a42ba38 --- freeleaps/helm-pkg/metrics/values.alpha.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeleaps/helm-pkg/metrics/values.alpha.yaml b/freeleaps/helm-pkg/metrics/values.alpha.yaml index 7aff0edc..a073aae0 100644 --- a/freeleaps/helm-pkg/metrics/values.alpha.yaml +++ b/freeleaps/helm-pkg/metrics/values.alpha.yaml @@ -10,7 +10,7 @@ metrics: registry: docker.io repository: null name: metrics - tag: "1.0.0" + tag: snapshot-a42ba38 imagePullPolicy: IfNotPresent ports: - name: http @@ -23,7 +23,7 @@ metrics: limits: cpu: '0.2' memory: 128Mi - probes: + probes: liveness: type: httpGet config: From 16c05fa74e84a36b0c715eae3dcb05106c701445 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 08:52:23 +0000 Subject: [PATCH 29/38] ci(bump): bump authentication image version for alpha to snapshot-a42ba38 --- freeleaps/helm-pkg/authentication/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/authentication/values.alpha.yaml b/freeleaps/helm-pkg/authentication/values.alpha.yaml index 2c6b2586..ce8f148f 100644 --- a/freeleaps/helm-pkg/authentication/values.alpha.yaml +++ b/freeleaps/helm-pkg/authentication/values.alpha.yaml @@ -15,7 +15,7 @@ authentication: registry: docker.io repository: null name: authentication - tag: snapshot-1baf906 + tag: snapshot-a42ba38 imagePullPolicy: IfNotPresent ports: - name: http From 361245c58fdcaed07b97be26da0120ed6e69d68a Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 09:16:31 +0000 Subject: [PATCH 30/38] ci(bump): bump metrics image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/metrics/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/metrics/values.alpha.yaml b/freeleaps/helm-pkg/metrics/values.alpha.yaml index a073aae0..8348b3fc 100644 --- a/freeleaps/helm-pkg/metrics/values.alpha.yaml +++ b/freeleaps/helm-pkg/metrics/values.alpha.yaml @@ -10,7 +10,7 @@ metrics: registry: docker.io repository: null name: metrics - tag: snapshot-a42ba38 + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http From 654e6c9fbc234abec3b63eec13c71666a3268c67 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 09:22:17 +0000 Subject: [PATCH 31/38] ci(bump): bump authentication image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/authentication/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/authentication/values.alpha.yaml b/freeleaps/helm-pkg/authentication/values.alpha.yaml index ce8f148f..e31bc359 100644 --- a/freeleaps/helm-pkg/authentication/values.alpha.yaml +++ b/freeleaps/helm-pkg/authentication/values.alpha.yaml @@ -15,7 +15,7 @@ authentication: registry: docker.io repository: null name: authentication - tag: snapshot-a42ba38 + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http From 08881ceb32fa3d7ceb4da91b76784352b34241dd Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 17:23:08 +0800 Subject: [PATCH 32/38] feat: update Jenkinsfile --- freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- freeleaps/helm-pkg/metrics/values.alpha.yaml | 2 +- freeleaps/helm-pkg/metrics/values.prod.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index da8401c7..716f0640 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -4,7 +4,7 @@ executeFreeleapsPipeline { serviceName = 'freeleaps' environmentSlug = 'alpha' // Ensure this branch exists in the freeleaps-service-hub repository - serviceGitBranch = 'feature/icecheng/metrics' + serviceGitBranch = 'dev' serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-ops-git-credentials' diff --git a/freeleaps/helm-pkg/metrics/values.alpha.yaml b/freeleaps/helm-pkg/metrics/values.alpha.yaml index 7aff0edc..a74e2902 100644 --- a/freeleaps/helm-pkg/metrics/values.alpha.yaml +++ b/freeleaps/helm-pkg/metrics/values.alpha.yaml @@ -10,7 +10,7 @@ metrics: registry: docker.io repository: null name: metrics - tag: "1.0.0" + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http diff --git a/freeleaps/helm-pkg/metrics/values.prod.yaml b/freeleaps/helm-pkg/metrics/values.prod.yaml index a516b0c0..9649d101 100644 --- a/freeleaps/helm-pkg/metrics/values.prod.yaml +++ b/freeleaps/helm-pkg/metrics/values.prod.yaml @@ -10,7 +10,7 @@ devops: registry: docker.io repository: null name: devops - tag: snapshot-046f9ff + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http From 97633502fb62f8538280cfa28f121e3562addebb Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 09:27:12 +0000 Subject: [PATCH 33/38] ci(bump): bump centralStorage image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/centralStorage/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml index 851291c9..df325163 100644 --- a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml +++ b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml @@ -15,7 +15,7 @@ centralStorage: registry: docker.io repository: null name: central_storage - tag: snapshot-1baf906 + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http From 518a67cea358cfcbee0c0fa27bbfcad120145f14 Mon Sep 17 00:00:00 2001 From: icecheng Date: Thu, 18 Sep 2025 17:30:39 +0800 Subject: [PATCH 34/38] feat: update metrics values for alpha and prod --- freeleaps/helm-pkg/metrics/values.prod.yaml | 60 ++++++++++----------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/freeleaps/helm-pkg/metrics/values.prod.yaml b/freeleaps/helm-pkg/metrics/values.prod.yaml index 9649d101..a74e2902 100644 --- a/freeleaps/helm-pkg/metrics/values.prod.yaml +++ b/freeleaps/helm-pkg/metrics/values.prod.yaml @@ -4,17 +4,17 @@ global: nodeSelector: {} logIngest: enabled: false -devops: +metrics: replicas: 1 image: registry: docker.io repository: null - name: devops + name: metrics tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8014 + containerPort: 8009 protocol: TCP resources: requests: @@ -23,20 +23,33 @@ devops: limits: cpu: '0.2' memory: 128Mi - probes: {} + probes: + liveness: + type: httpGet + config: + path: /api/_/livez + port: 8009 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 5 + terminationGracePeriodSeconds: 30 + readiness: + type: httpGet + config: + path: /api/_/readyz + port: 8009 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 + successThreshold: 1 + failureThreshold: 5 services: - - name: devops-service + - name: metrics-service type: ClusterIP - port: 8014 - targetPort: 8014 - serviceMonitor: - enabled: false - labels: - release: kube-prometheus-stack - namespace: freeleaps-monitoring-system - interval: 30s - scrapeTimeout: '' - ingresses: {} + port: 8009 + targetPort: 8009 configs: starrocksHost: freeleaps-starrocks-cluster-fe-service.freeleaps-data-platform.svc starrocksPort: 9030 @@ -44,23 +57,6 @@ devops: starrocksPassword: r7Y@QTb*7BQN@hDGsN starrocksDatabase: freeleaps prometheusEndpoint: http://kube-prometheus-stack-prometheus.freeleaps-monitoring-system:9090 - secrets: - secretStoreRef: - kind: FreeleapsSecretStore - name: freeleaps-main-secret-store - target: - name: freeleaps-devops-prod-secrets - creationPolicy: Owner - refreshInterval: 30s - data: - - key: appMongodbUri - remoteRef: - key: freeleaps-prod-mongodb-uri - type: Secret - - key: rabbitmqPassword - remoteRef: - key: freeleaps-prod-rabbitmq-password - type: Secret vpa: minAllowed: enabled: false From 36e54f9d5b6398bbd07b7d1d5b52ce921e54b2a8 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 09:35:04 +0000 Subject: [PATCH 35/38] ci(bump): bump content image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/content/values.alpha.yaml | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/freeleaps/helm-pkg/content/values.alpha.yaml b/freeleaps/helm-pkg/content/values.alpha.yaml index edfb1b09..2a8a5a03 100644 --- a/freeleaps/helm-pkg/content/values.alpha.yaml +++ b/freeleaps/helm-pkg/content/values.alpha.yaml @@ -15,7 +15,7 @@ content: registry: docker.io repository: null name: content - tag: snapshot-12a0d9a + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http @@ -90,18 +90,18 @@ content: kind: FreeleapsSecretStore name: freeleaps-main-secret-store target: - name: "freeleaps-content-alpha-secrets" - creationPolicy: "Owner" + name: freeleaps-content-alpha-secrets + creationPolicy: Owner refreshInterval: 30s data: - - key: mongodbUri - remoteRef: - key: "freeleaps-alpha-mongodb-uri" - type: Secret - - key: freeleapsWwwAsAzureClientSecret - remoteRef: - key: "freeleaps-alpha-www-as-azure-client-secret" - type: Secret + - key: mongodbUri + remoteRef: + key: freeleaps-alpha-mongodb-uri + type: Secret + - key: freeleapsWwwAsAzureClientSecret + remoteRef: + key: freeleaps-alpha-www-as-azure-client-secret + type: Secret vpa: minAllowed: enabled: false From 5b326e6b6d14d8ad7cf7d27cafc9678bd7b760f1 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 09:40:18 +0000 Subject: [PATCH 36/38] ci(bump): bump notification image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/notification/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index ddd875be..d85e677f 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -15,7 +15,7 @@ notification: registry: docker.io repository: null name: notification - tag: snapshot-071694c + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http From 648629bd9a67b6ba0b14f25bbe404f2a7a19ad4a Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 09:45:46 +0000 Subject: [PATCH 37/38] ci(bump): bump payment image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/payment/values.alpha.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/freeleaps/helm-pkg/payment/values.alpha.yaml b/freeleaps/helm-pkg/payment/values.alpha.yaml index 9891f280..6a57c7c2 100644 --- a/freeleaps/helm-pkg/payment/values.alpha.yaml +++ b/freeleaps/helm-pkg/payment/values.alpha.yaml @@ -15,7 +15,7 @@ payment: registry: docker.io repository: null name: payment - tag: snapshot-12a0d9a + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http @@ -94,14 +94,14 @@ payment: creationPolicy: Owner refreshInterval: 30s data: - - key: mongodbUri - remoteRef: - key: "freeleaps-alpha-mongodb-uri" - type: Secret - - key: stripeApiKey - remoteRef: - key: "freeleaps-alpha-stripe-api-key" - type: Secret + - key: mongodbUri + remoteRef: + key: freeleaps-alpha-mongodb-uri + type: Secret + - key: stripeApiKey + remoteRef: + key: freeleaps-alpha-stripe-api-key + type: Secret vpa: minAllowed: enabled: false From bd74c1cd8d06f3e8385f2dd53542ef67ebcf8b8e Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 18 Sep 2025 10:01:46 +0000 Subject: [PATCH 38/38] ci(bump): bump devops image version for alpha to snapshot-38ff0ae --- freeleaps/helm-pkg/devops/values.alpha.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/devops/values.alpha.yaml b/freeleaps/helm-pkg/devops/values.alpha.yaml index 0670e183..a6994a8c 100644 --- a/freeleaps/helm-pkg/devops/values.alpha.yaml +++ b/freeleaps/helm-pkg/devops/values.alpha.yaml @@ -10,7 +10,7 @@ devops: registry: docker.io repository: null name: devops - tag: snapshot-45b4ebd + tag: snapshot-38ff0ae imagePullPolicy: IfNotPresent ports: - name: http