From 31f959f7a92c8b09c7a29f2604dac161e9c38108 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 13 Aug 2025 09:41:25 +0800 Subject: [PATCH 1/6] feat: enable log collection for prod environment - Enable logIngest for chat and freeleaps services in prod - Add Loki datasource to Grafana for prod environment - Configure Loki log retention policy (30 days) - Enable table manager for automatic log cleanup --- .../freeleaps-logging-system/loki/values.yaml | 14 +++++++------- .../kube-prometheus-stack/values.yaml | 10 +++++++++- freeleaps/helm-pkg/chat/values.prod.yaml | 5 +++++ freeleaps/helm-pkg/freeleaps/values.prod.yaml | 5 +++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/cluster/manifests/freeleaps-logging-system/loki/values.yaml b/cluster/manifests/freeleaps-logging-system/loki/values.yaml index 40a64839..967ad87d 100644 --- a/cluster/manifests/freeleaps-logging-system/loki/values.yaml +++ b/cluster/manifests/freeleaps-logging-system/loki/values.yaml @@ -3760,9 +3760,9 @@ monitoring: # -- DEPRECATED Configuration for the table-manager. The table-manager is only necessary when using a deprecated # index type such as Cassandra, Bigtable, or DynamoDB, it has not been necessary since loki introduced self- # contained index types like 'boltdb-shipper' and 'tsdb'. This will be removed in a future helm chart. -tableManager: - # -- Specifies whether the table-manager should be enabled - enabled: false + tableManager: + # -- Specifies whether the table-manager should be enabled + enabled: true image: # -- The Docker registry for the table-manager image. Overrides `loki.image.registry` registry: null @@ -3816,7 +3816,7 @@ tableManager: nodeSelector: {} # -- Tolerations for table-manager pods tolerations: [] - # -- Enable deletes by retention - retention_deletes_enabled: false - # -- Set retention period - retention_period: 0 + # -- Enable deletes by retention + retention_deletes_enabled: true + # -- Set retention period + retention_period: 30d diff --git a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml index c95f4da1..40e2aff0 100644 --- a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml +++ b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml @@ -1165,7 +1165,15 @@ grafana: ## Configure additional grafana datasources (passed through tpl) ## ref: http://docs.grafana.org/administration/provisioning/#datasources - additionalDataSources: [] + additionalDataSources: + - name: Loki + type: loki + url: http://loki-gateway.freeleaps-logging-system + access: proxy + editable: false + jsonData: + maxLines: 1000 + timeout: 30 # - name: prometheus-sample # access: proxy # basicAuth: true diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml index 9ed898af..f2c1d2f4 100644 --- a/freeleaps/helm-pkg/chat/values.prod.yaml +++ b/freeleaps/helm-pkg/chat/values.prod.yaml @@ -8,6 +8,11 @@ dashboard: name: freeleaps-prod-chat-dashboard title: Chat Service Dashboard (PROD) metricsPrefix: freeleaps_chat +logIngest: + enabled: true + lokiEndpoint: http://loki-gateway.freeleaps-logging-system + logPathPattern: /app/log/chat/*.log + logPath: /app/log/chat chat: replicas: 1 image: diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml index 4bada945..8468d20f 100644 --- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml @@ -8,6 +8,11 @@ dashboard: name: freeleaps-prod-backend-dashboard title: Backend Service Dashboard (PROD) metricsPrefix: freeleaps_backend +logIngest: + enabled: true + lokiEndpoint: http://loki-gateway.freeleaps-logging-system + logPathPattern: /app/log/freeleaps/*.log + logPath: /app/log/freeleaps freeleaps: replicas: 1 image: From fb27f4acec328790bfd7589b9e51aca411ccefe2 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 13 Aug 2025 09:52:06 +0800 Subject: [PATCH 2/6] fix: disable chat service metrics to resolve 404 errors - Set metricsEnabled: false - Disable ServiceMonitor - Preserves log collection functionality --- freeleaps/helm-pkg/chat/values.prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml index f2c1d2f4..3681b5c1 100644 --- a/freeleaps/helm-pkg/chat/values.prod.yaml +++ b/freeleaps/helm-pkg/chat/values.prod.yaml @@ -60,7 +60,7 @@ chat: port: 8012 targetPort: 8012 serviceMonitor: - enabled: true + enabled: false labels: release: kube-prometheus-stack namespace: freeleaps-monitoring-system @@ -97,7 +97,7 @@ chat: certPath: '' redisUrl: redis://:izrZtCmYk8@freeleaps-prod-redis-redis-cluster-headless.freeleaps-prod.svc.freeleaps.cluster:6379/0 redisIsCluster: 'true' - metricsEnabled: 'true' + metricsEnabled: 'false' probesEnabled: 'true' vpa: minAllowed: From 9af8c521d8de19c7c3864c402fa0b767463cd1c1 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 13 Aug 2025 19:30:54 +0800 Subject: [PATCH 3/6] feat: enable log collection for devsvc service in prod environment --- freeleaps/helm-pkg/devsvc/values.prod.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/freeleaps/helm-pkg/devsvc/values.prod.yaml b/freeleaps/helm-pkg/devsvc/values.prod.yaml index 60926f6a..a0b577be 100644 --- a/freeleaps/helm-pkg/devsvc/values.prod.yaml +++ b/freeleaps/helm-pkg/devsvc/values.prod.yaml @@ -7,6 +7,11 @@ dashboard: name: freeleaps-prod-devsvc-dashboard title: Dev Service Dashboard (PROD) metricsPrefix: freeleaps_devsvc +logIngest: + enabled: true + lokiEndpoint: http://loki-gateway.freeleaps-logging-system + logPathPattern: /app/log/devsvc/*.log + logPath: /app/log/devsvc devsvc: replicas: 1 image: From 0768fa715aa28dee6f52ab2080c8372dbde7e0c7 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Mon, 18 Aug 2025 02:10:55 +0000 Subject: [PATCH 4/6] ci(bump): bump chat image version for alpha to snapshot-8e2caa8 --- 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 ceb538ce..f15554f9 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-c0c0aa9 + tag: snapshot-8e2caa8 imagePullPolicy: IfNotPresent ports: - name: http From dc9800a0cdd2aabc25ff3e9fed6fcd6b8a840be2 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Mon, 18 Aug 2025 02:18:41 +0000 Subject: [PATCH 5/6] ci(bump): bump freeleaps image version for alpha to snapshot-8e2caa8 --- 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 0adc892f..1dfa191a 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-c0c0aa9 + tag: snapshot-8e2caa8 imagePullPolicy: IfNotPresent ports: - name: http From 953772d4bbb233870edd25f3163ddbfd53aad78d Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Mon, 18 Aug 2025 02:44:25 +0000 Subject: [PATCH 6/6] ci(bump): bump frontend image version for alpha to snapshot-8e2caa8 --- 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 dd4848a7..960d1b67 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-c0c0aa9 + tag: snapshot-8e2caa8 imagePullPolicy: IfNotPresent ports: - name: http