From 5101e6d2cd8d4c7f1fcea3e6f08e60a885e234dc Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 31 Jul 2025 23:08:10 +0800 Subject: [PATCH 1/3] fix: optimize OpenTelemetry configuration to prevent duplicate log collection - Change receivers from [filelog, otlp, k8scluster] to [filelog] only - Prevent duplicate logs from multiple collection sources - Keep only filelog receiver to collect logs from application log files - This eliminates duplicate logs appearing in Grafana for devsvc and central-storage --- .../centralStorage/templates/central-storage/opentelemetry.yaml | 2 +- freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml index c1626c8e..1777e241 100644 --- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml +++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml @@ -122,7 +122,7 @@ spec: level: info pipelines: logs: - receivers: [filelog, otlp, k8scluster] + receivers: [filelog] # 只使用文件日志接收器,避免重复收集 processors: [resource, transform, batch] exporters: [otlphttp/logs] {{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml index e9bab78a..0a12019d 100644 --- a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml +++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml @@ -120,7 +120,7 @@ spec: level: info pipelines: logs: - receivers: [filelog, otlp, k8scluster] + receivers: [filelog] # 只使用文件日志接收器,避免重复收集 processors: [resource, transform, batch] exporters: [otlphttp/logs] {{- end }} \ No newline at end of file From d85f9408e41ed1a815ccd086da18d43dc130036d Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 31 Jul 2025 23:17:45 +0800 Subject: [PATCH 2/3] fix: change Chinese comments to English in OpenTelemetry configs - Replace Chinese comments with English in opentelemetry.yaml files - Maintain consistent English-only comments in freeleaps-ops repository - Keep the same functionality while improving code readability --- .../centralStorage/templates/central-storage/opentelemetry.yaml | 2 +- freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml index 1777e241..4a718bf3 100644 --- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml +++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml @@ -122,7 +122,7 @@ spec: level: info pipelines: logs: - receivers: [filelog] # 只使用文件日志接收器,避免重复收集 + receivers: [filelog] # Only use filelog receiver to prevent duplicate collection processors: [resource, transform, batch] exporters: [otlphttp/logs] {{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml index 0a12019d..21189f74 100644 --- a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml +++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml @@ -120,7 +120,7 @@ spec: level: info pipelines: logs: - receivers: [filelog] # 只使用文件日志接收器,避免重复收集 + receivers: [filelog] # Only use filelog receiver to prevent duplicate collection processors: [resource, transform, batch] exporters: [otlphttp/logs] {{- end }} \ No newline at end of file From 8bb08fd29afa155aecfc12564e062468caedf7a2 Mon Sep 17 00:00:00 2001 From: freeleaps-gitops-bot Date: Thu, 31 Jul 2025 15:20:49 +0000 Subject: [PATCH 3/3] ci(bump): bump authentication image version for alpha to snapshot-12a0d9a --- 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 ee96dd85..5ee95a9a 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-311fd21 + tag: snapshot-12a0d9a imagePullPolicy: IfNotPresent ports: - name: http