From 71283aa2da5849038e5274457e4ffc176d56959d Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 8 Aug 2025 10:31:22 +0800 Subject: [PATCH 1/5] feat: enable log ingest for central storage in prod environment --- freeleaps/helm-pkg/centralStorage/values.prod.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/freeleaps/helm-pkg/centralStorage/values.prod.yaml b/freeleaps/helm-pkg/centralStorage/values.prod.yaml index 994956ec..6d22d936 100644 --- a/freeleaps/helm-pkg/centralStorage/values.prod.yaml +++ b/freeleaps/helm-pkg/centralStorage/values.prod.yaml @@ -7,6 +7,11 @@ dashboard: name: freeleaps-prod-central-storage-dashboard title: Central Storage Service Dashboard (PROD) metricsPrefix: freeleaps_central_storage +logIngest: + enabled: true + lokiEndpoint: http://loki-gateway.freeleaps-logging-system + logPathPattern: /app/log/central_storage/*.log + logPath: /app/log/central_storage centralStorage: replicas: 1 image: From 42c531357d8d3c553c8ab9cbc0171069c0db125b Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Fri, 8 Aug 2025 03:37:36 +0000 Subject: [PATCH 2/5] ci(bump): bump devops image version for alpha to snapshot-52ec8f8 --- 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 2c38aad7..ff52d62d 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-aa89bce + tag: snapshot-52ec8f8 imagePullPolicy: IfNotPresent ports: - name: http From 974007809da1574b04409e98eaa7a82ec166ebc4 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 8 Aug 2025 12:09:58 +0800 Subject: [PATCH 3/5] feat: add RabbitMQ queue name environment variables for DevOps service - Add RABBITMQ_OUTPUT_QUEUE_NAME and RABBITMQ_INPUT_QUEUE_NAME environment variables - Configure queue names in values.alpha.yaml and values.prod.yaml - Update devops-config.yaml template to include new environment variables - Set default queue names to 'freeleaps.devops.reconciler.output' and 'freeleaps.devops.reconciler.input' - This enables configurable queue names to fix message consumption issues --- freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml | 4 +++- freeleaps/helm-pkg/devops/values.alpha.yaml | 2 ++ freeleaps/helm-pkg/devops/values.prod.yaml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml b/freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml index 23722c51..3812e16e 100644 --- a/freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml @@ -30,4 +30,6 @@ data: RABBITMQ_PORT: {{ .Values.devops.configs.rabbitmqPort | toString | b64enc | quote }} RABBITMQ_USERNAME: {{ .Values.devops.configs.rabbitmqUsername | b64enc | quote }} RABBITMQ_PASSWORD: {{ .Values.devops.configs.rabbitmqPassword | b64enc | quote }} - RABBITMQ_VIRTUAL_HOST: {{ .Values.devops.configs.rabbitmqVirtualHost | b64enc | quote }} \ No newline at end of file + RABBITMQ_VIRTUAL_HOST: {{ .Values.devops.configs.rabbitmqVirtualHost | b64enc | quote }} + RABBITMQ_OUTPUT_QUEUE_NAME: {{ .Values.devops.configs.rabbitmqOutputQueueName | b64enc | quote }} + RABBITMQ_INPUT_QUEUE_NAME: {{ .Values.devops.configs.rabbitmqInputQueueName | b64enc | quote }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/devops/values.alpha.yaml b/freeleaps/helm-pkg/devops/values.alpha.yaml index 2c38aad7..8eb498fc 100644 --- a/freeleaps/helm-pkg/devops/values.alpha.yaml +++ b/freeleaps/helm-pkg/devops/values.alpha.yaml @@ -64,6 +64,8 @@ devops: rabbitmqUsername: user rabbitmqPassword: NjlhHFvnDuC7K0ir rabbitmqVirtualHost: / + rabbitmqOutputQueueName: freeleaps.devops.reconciler.output + rabbitmqInputQueueName: freeleaps.devops.reconciler.input vpa: minAllowed: enabled: false diff --git a/freeleaps/helm-pkg/devops/values.prod.yaml b/freeleaps/helm-pkg/devops/values.prod.yaml index 2c38aad7..8eb498fc 100644 --- a/freeleaps/helm-pkg/devops/values.prod.yaml +++ b/freeleaps/helm-pkg/devops/values.prod.yaml @@ -64,6 +64,8 @@ devops: rabbitmqUsername: user rabbitmqPassword: NjlhHFvnDuC7K0ir rabbitmqVirtualHost: / + rabbitmqOutputQueueName: freeleaps.devops.reconciler.output + rabbitmqInputQueueName: freeleaps.devops.reconciler.input vpa: minAllowed: enabled: false From d5c50e6eaef48009b59276e94bfeeab1f994a852 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Fri, 8 Aug 2025 04:11:24 +0000 Subject: [PATCH 4/5] ci(bump): bump devops image version for alpha to snapshot-fc4c8e7 --- 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 93584444..1890fa00 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-52ec8f8 + tag: snapshot-fc4c8e7 imagePullPolicy: IfNotPresent ports: - name: http From 62da1ba53ea26018c63023f0218856f3826d1156 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Fri, 8 Aug 2025 05:07:09 +0000 Subject: [PATCH 5/5] ci(bump): bump devops image version for alpha to snapshot-6e1cb59 --- 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 1890fa00..d833a390 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-fc4c8e7 + tag: snapshot-6e1cb59 imagePullPolicy: IfNotPresent ports: - name: http