Skip to content

Commit 6b5c777

Browse files
Kinue72Kinue72
committed
feat: properly handle secure and verify on clickhouse dsn
1 parent 39d31b5 commit 6b5c777

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

‎charts/signoz/templates/_clickhouse.tpl‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Common ClickHouse ENV variables and helpers used by SigNoz
44

55
{{- define "schemamigrator.url" -}}
66
{{- if .Values.clickhouse.enabled -}}
7-
{{- printf "%v:%v" ( include "clickhouse.servicename" . ) ( include "clickhouse.tcpPort" . ) -}}
7+
{{- printf "%v:%v?%v" ( include "clickhouse.servicename" . ) ( include "clickhouse.tcpPort" . ) ( include "clickhouse.clickHouseDsnParams" . ) -}}
88
{{- else -}}
9-
{{- printf "%v:%v" ( required "externalClickhouse.host is required if not clickhouse.enabled" .Values.externalClickhouse.host ) ( default 9000 .Values.externalClickhouse.tcpPort ) -}}
9+
{{- printf "%v:%v?%v" ( required "externalClickhouse.host is required if not clickhouse.enabled" .Values.externalClickhouse.host ) ( default 9000 .Values.externalClickhouse.tcpPort ) ( include "clickhouse.clickHouseDsnParams" . ) -}}
1010
{{- end -}}
1111
{{- end -}}
1212

@@ -36,6 +36,8 @@ Common ClickHouse ENV variables and helpers used by SigNoz
3636
value: {{ .Values.clickhouse.secure | quote }}
3737
- name: CLICKHOUSE_VERIFY
3838
value: {{ .Values.clickhouse.verify | quote }}
39+
- name: CLICKHOUSE_SKIP_VERIFY
40+
value: {{ not .Values.clickhouse.verify | quote }}
3941
{{- else -}}
4042
- name: CLICKHOUSE_HOST
4143
value: {{ required "externalClickhouse.host is required if not clickhouse.enabled" .Values.externalClickhouse.host | quote }}
@@ -67,6 +69,8 @@ Common ClickHouse ENV variables and helpers used by SigNoz
6769
value: {{ .Values.externalClickhouse.secure | quote }}
6870
- name: CLICKHOUSE_VERIFY
6971
value: {{ .Values.externalClickhouse.verify | quote }}
72+
- name: CLICKHOUSE_SKIP_VERIFY
73+
value: {{ not .Values.externalClickhouse.verify | quote }}
7074
{{- end }}
7175
{{- end }}
7276

@@ -229,9 +233,17 @@ Return the ClickHouse Traces URL
229233

230234
{{- define "clickhouse.clickHouseUrl" -}}
231235
{{- if .Values.clickhouse.enabled -}}
232-
{{- include "clickhouse.servicename" . }}:{{ include "clickhouse.tcpPort" . }}/?username=$(CLICKHOUSE_USER)&password=$(CLICKHOUSE_PASSWORD)
236+
{{- include "clickhouse.servicename" . }}:{{ include "clickhouse.tcpPort" . }}/?username=$(CLICKHOUSE_USER)&password=$(CLICKHOUSE_PASSWORD)&{{ include "clickhouse.clickHouseDsnParams" . }}
233237
{{- else -}}
234-
{{- required "externalClickhouse.host is required if using external clickhouse" .Values.externalClickhouse.host }}:{{ include "clickhouse.tcpPort" . }}/?username=$(CLICKHOUSE_USER)&password=$(CLICKHOUSE_PASSWORD)
238+
{{- required "externalClickhouse.host is required if using external clickhouse" .Values.externalClickhouse.host }}:{{ include "clickhouse.tcpPort" . }}/?username=$(CLICKHOUSE_USER)&password=$(CLICKHOUSE_PASSWORD)&{{ include "clickhouse.clickHouseDsnParams" . }}
239+
{{- end -}}
240+
{{- end -}}
241+
242+
{{- define "clickhouse.clickHouseDsnParams" -}}
243+
{{- if .Values.clickhouse.enabled -}}
244+
{{- trimSuffix "&" (printf "secure=%v&skip_verify=%v&%v" ( default false .Values.clickhouse.secure ) ( not ( default false .Values.clickhouse.verify ) ) ( default "" .Values.clickhouse.dsnParams )) -}}
245+
{{- else -}}
246+
{{- trimSuffix "&" (printf "secure=%v&skip_verify=%v&%v" ( default false .Values.externalClickhouse.secure ) ( not ( default false .Values.externalClickhouse.verify ) ) ( default "" .Values.externalClickhouse.dsnParams )) -}}
235247
{{- end -}}
236248
{{- end -}}
237249

‎charts/signoz/values.yaml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ clickhouse:
250250
# @section -- ClickHouse Settings
251251
# @default -- false
252252
verify: false
253+
# clickhouse.dsnParams -- Additional DSN parameters for ClickHouse connection.
254+
# @section -- ClickHouse Settings
255+
# @default -- ""
256+
dsnParams: ""
253257
# clickhouse.externalZookeeper -- Configuration for an external Zookeeper.
254258
# @section -- Zookeeper Settings
255259
# @default -- {}
@@ -741,6 +745,10 @@ externalClickhouse:
741745
# externalClickhouse.tcpPort - TCP port of the external ClickHouse instance.
742746
# @default - 9000
743747
tcpPort: 9000
748+
# externalClickhouse.dsnParams -- Additional DSN parameters for external ClickHouse connection.
749+
# @section -- External ClickHouse
750+
# @default -- ""
751+
dsnParams: ""
744752
# signoz -- Default values for SigNoz.
745753
# @section -- SigNoz
746754
# @default -- "Please checkout the default values in values.yml"
@@ -1901,24 +1909,24 @@ otelCollector:
19011909
endpoint: localhost:1777
19021910
exporters:
19031911
clickhousetraces:
1904-
datasource: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_TRACE_DATABASE}
1912+
datasource: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_TRACE_DATABASE}?secure=${env:CLICKHOUSE_SECURE}&skip_verify=${env:CLICKHOUSE_SKIP_VERIFY}
19051913
low_cardinal_exception_grouping: ${env:LOW_CARDINAL_EXCEPTION_GROUPING}
19061914
use_new_schema: true
19071915
signozclickhousemetrics:
1908-
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_DATABASE}
1916+
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_DATABASE}?secure=${env:CLICKHOUSE_SECURE}&skip_verify=${env:CLICKHOUSE_SKIP_VERIFY}
19091917
timeout: 45s
19101918
clickhouselogsexporter:
1911-
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_LOG_DATABASE}
1919+
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_LOG_DATABASE}?secure=${env:CLICKHOUSE_SECURE}&skip_verify=${env:CLICKHOUSE_SKIP_VERIFY}
19121920
timeout: 10s
19131921
use_new_schema: true
19141922
metadataexporter:
1915-
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/signoz_metadata
1923+
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/signoz_metadata?secure=${env:CLICKHOUSE_SECURE}&skip_verify=${env:CLICKHOUSE_SKIP_VERIFY}
19161924
timeout: 10s
19171925
tenant_id: ${env:TENANT_ID}
19181926
cache:
19191927
provider: in_memory
19201928
signozclickhousemeter:
1921-
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_METER_DATABASE}
1929+
dsn: tcp://${env:CLICKHOUSE_USER}:${env:CLICKHOUSE_PASSWORD}@${env:CLICKHOUSE_HOST}:${env:CLICKHOUSE_PORT}/${env:CLICKHOUSE_METER_DATABASE}?secure=${env:CLICKHOUSE_SECURE}&skip_verify=${env:CLICKHOUSE_SKIP_VERIFY}
19221930
timeout: 45s
19231931
sending_queue:
19241932
enabled: false

0 commit comments

Comments
 (0)