Skip to content

feat: Support custom clickhouse domain for otel collector #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teeohhem merged 2 commits into from
May 22, 2025
Merged

feat: Support custom clickhouse domain for otel collector #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d672366
enhancement: Add ability to specify custom clickhouse domain for coll…
teeohhem May 22, 2025
ef0af40
Update env var name and add tests
teeohhem May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ spec:
- containerPort: {{ .Values.otel.httpPort }}
- containerPort: {{ .Values.otel.healthPort }}
env:
- name: CLICKHOUSE_SERVER_ENDPOINT
value: "{{ include "hdx-oss.fullname" . }}-clickhouse:{{ .Values.clickhouse.nativePort }}"
- name: CLICKHOUSE_ENDPOINT
value: "{{ .Values.otel.clickhouseEndpoint | default (printf "tcp://%s-clickhouse:%v?dial_timeout=10s" (include "hdx-oss.fullname" .) .Values.clickhouse.nativePort) }}"
- name: HYPERDX_LOG_LEVEL
value: {{ .Values.hyperdx.logLevel }}
- name: CLICKHOUSE_USER
Expand Down
2 changes: 1 addition & 1 deletion charts/hdx-oss-v2/tests/__snapshot__/otel-collector-disabled_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ should render OTEL collector with custom ports:
spec:
containers:
- env:
- name: CLICKHOUSE_SERVER_ENDPOINT
- name: CLICKHOUSE_ENDPOINT
value: RELEASE-NAME-hdx-oss-v2-clickhouse:9000
- name: HYPERDX_LOG_LEVEL
value: info
Expand Down
38 changes: 38 additions & 0 deletions charts/hdx-oss-v2/tests/otel-collector-custom-clickhouse_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
suite: test OTEL collector with custom clickhouse endpoint
templates:
- otel-collector-deployment.yaml
tests:
- it: should use default Clickhouse endpoint when not specified
set:
otel:
enabled: true
asserts:
- documentIndex: 0
isKind:
of: Deployment
- documentIndex: 0
equal:
path: spec.template.spec.containers[0].env[0].name
value: CLICKHOUSE_ENDPOINT
- documentIndex: 0
matchRegex:
path: spec.template.spec.containers[0].env[0].value
pattern: "tcp://.*-clickhouse:[0-9]+\\?dial_timeout=10s"

- it: should use custom Clickhouse endpoint when specified
set:
otel:
enabled: true
clickhouseEndpoint: "my-custom-clickhouse:9000"
Copy link
Collaborator

@wrn14897 wrn14897 May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: i know this is just for test. the endpoint needs a protocol specified like tcp://

asserts:
- documentIndex: 0
isKind:
of: Deployment
- documentIndex: 0
equal:
path: spec.template.spec.containers[0].env[0].name
value: CLICKHOUSE_ENDPOINT
- documentIndex: 0
equal:
path: spec.template.spec.containers[0].env[0].value
value: "my-custom-clickhouse:9000"
2 changes: 2 additions & 0 deletions charts/hdx-oss-v2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ otel:
httpPort: 4318
healthPort: 8888
enabled: true
# Clickhouse endpoint - defaults to built-in Clickhouse service
clickhouseEndpoint: ""

persistence:
mongodb:
Expand Down