From 24cb34c1481df86df28b7036643efc3be2e689e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20J=C3=B6rg?= <moritz.jorg@oceanbox.io>
Date: Mon, 6 Jul 2026 09:08:36 +0200
Subject: [PATCH] clickhouse: Use one DS for both logs and traces

---
 .../prometheus/values/prometheus.yaml.gotmpl  | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/values/prometheus/values/prometheus.yaml.gotmpl b/values/prometheus/values/prometheus.yaml.gotmpl
index 874f5963..83e89838 100644
--- a/values/prometheus/values/prometheus.yaml.gotmpl
+++ b/values/prometheus/values/prometheus.yaml.gotmpl
@@ -233,9 +233,9 @@ grafana:
   additionalDataSources:
   {{- end }}
   {{- if .Values.clickhouse.enabled }}
-  - name: ClickHouse logs
+  - name: ClickHouse
     type: grafana-clickhouse-datasource
-    uid: clickhouse-logs
+    uid: clickhouse
     access: proxy
     editable: false
     jsonData:
@@ -249,26 +249,11 @@ grafana:
         defaultTable: otel_logs
         otelEnabled: true
         otelVersion: latest
-    secureJsonData:
-      password: ${CLICKHOUSE_PASSWORD}
-  - name: ClickHouse traces
-    type: grafana-clickhouse-datasource
-    uid: clickhouse-traces
-    access: proxy
-    editable: false
-    jsonData:
-      host: {{ .Values.clickhouse.serviceName }}.clickhouse.svc
-      port: 9000
-      protocol: native
-      username: {{ .Values.clickhouse.user }}
-      defaultDatabase: {{ .Values.clickhouse.database }}
       traces:
         defaultDatabase: {{ .Values.clickhouse.database }}
         defaultTable: otel_traces
         otelEnabled: true
         otelVersion: latest
-      tracesToLogs:
-        datasourceUid: clickhouse-logs
     secureJsonData:
       password: ${CLICKHOUSE_PASSWORD}
   {{- end }}