From 71cc33e207cdf96254bb3928962581d619b66e3a Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Wed, 4 Jun 2025 17:19:25 +0900 Subject: [PATCH 01/10] use remote mongodb --- charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml | 4 ++++ charts/hdx-oss-v2/templates/hyperdx-deployment.yaml | 4 +++- charts/hdx-oss-v2/values.yaml | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index 0e85f06..d8146dd 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -13,7 +13,11 @@ data: HYPERDX_APP_URL: "{{ .Values.hyperdx.appUrl }}" HYPERDX_LOG_LEVEL: "{{ .Values.hyperdx.logLevel }}" MINER_API_URL: "http://{{ include "hdx-oss.fullname" . }}-miner:5123" + {{- if .Values.persistence.mongodb.remote }} + MONGO_URI: "mongodb://{{ .Values.persistence.mongodb.endpoint }}:{{ .Values.persistence.mongodb.port }}/{{ .Values.persistence.mongodb.database }}" + {{- else }} MONGO_URI: "mongodb://{{ include "hdx-oss.fullname" . }}-mongodb:{{ .Values.mongodb.port }}/hyperdx" + {{- end }} NEXT_PUBLIC_SERVER_URL: "http://localhost:{{ .Values.hyperdx.apiPort }}" OTEL_SERVICE_NAME: "hdx-oss-api" USAGE_STATS_ENABLED: "{{ .Values.hyperdx.usageStatsEnabled | default true }}" diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 45a2d50..6a60a17 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -28,10 +28,12 @@ spec: {{- end -}} {{- end }} spec: + {{- if not .Values.persistence.mongodb.remote }} initContainers: - name: wait-for-mongodb image: busybox command: ['sh', '-c', 'until nc -z {{ include "hdx-oss.fullname" . }}-mongodb {{ .Values.mongodb.port }}; do echo waiting for mongodb; sleep 2; done;'] + {{- end }} containers: - name: app image: "{{ .Values.hyperdx.image }}" @@ -61,4 +63,4 @@ spec: {{- end }} {{- with .Values.hyperdx.env }} {{- toYaml . | nindent 12 }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/hdx-oss-v2/values.yaml b/charts/hdx-oss-v2/values.yaml index 92603f7..1e8c703 100644 --- a/charts/hdx-oss-v2/values.yaml +++ b/charts/hdx-oss-v2/values.yaml @@ -204,10 +204,13 @@ otel: clickhousePrometheusEndpoint: # Clickhouse database to send logs/traces/metrics to. Defaults to "default" clickhouseDatabase: "default" - persistence: mongodb: enabled: true + remote: true + endpoint: hyperdx-mongodb-svc + port: 27017 + database: hyperdx size: 10Gi tasks: From b56a07c51cfc42e8b2495a98da65bb22acbe9249 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Wed, 4 Jun 2025 17:33:41 +0900 Subject: [PATCH 02/10] fix pvc condition --- .../hdx-oss-v2/templates/claims/persistent-volume-claims.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml b/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml index f10d23d..90758ac 100644 --- a/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml +++ b/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml @@ -1,4 +1,4 @@ -{{- if .Values.persistence.mongodb.enabled }} +{{- if .Values.mongodb.enabled }} apiVersion: v1 kind: PersistentVolumeClaim metadata: From c4c5bc36b3c76974703eb612ffecded75aab1762 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Wed, 4 Jun 2025 18:20:33 +0900 Subject: [PATCH 03/10] add auth for mongo --- charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml | 8 ++++++-- charts/hdx-oss-v2/values.yaml | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index d8146dd..e27a9c3 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -14,9 +14,13 @@ data: HYPERDX_LOG_LEVEL: "{{ .Values.hyperdx.logLevel }}" MINER_API_URL: "http://{{ include "hdx-oss.fullname" . }}-miner:5123" {{- if .Values.persistence.mongodb.remote }} - MONGO_URI: "mongodb://{{ .Values.persistence.mongodb.endpoint }}:{{ .Values.persistence.mongodb.port }}/{{ .Values.persistence.mongodb.database }}" + {{- if .Values.persistence.mongodb.auth.enabled }} + MONGO_URI: mongodb://{{ .Values.persistence.mongodb.auth.username }}:{{ .Values.persistence.mongodb.auth.password }}@{{ .Values.persistence.mongodb.endpoint }}:{{ .Values.persistence.mongodb.port }}/{{ .Values.persistence.mongodb.database }}?authSource={{ .Values.persistence.mongodb.auth.authSource }} + {{- else }} + MONGO_URI: mongodb://{{ .Values.persistence.mongodb.endpoint }}:{{ .Values.persistence.mongodb.port }}/{{ .Values.persistence.mongodb.database }} + {{- end }} {{- else }} - MONGO_URI: "mongodb://{{ include "hdx-oss.fullname" . }}-mongodb:{{ .Values.mongodb.port }}/hyperdx" + MONGO_URI: mongodb://{{ include "hdx-oss.fullname" . }}-mongodb:{{ .Values.mongodb.service.port }}/hyperdxv2 {{- end }} NEXT_PUBLIC_SERVER_URL: "http://localhost:{{ .Values.hyperdx.apiPort }}" OTEL_SERVICE_NAME: "hdx-oss-api" diff --git a/charts/hdx-oss-v2/values.yaml b/charts/hdx-oss-v2/values.yaml index 1e8c703..78d8239 100644 --- a/charts/hdx-oss-v2/values.yaml +++ b/charts/hdx-oss-v2/values.yaml @@ -212,6 +212,11 @@ persistence: port: 27017 database: hyperdx size: 10Gi + auth: + enabled: false + username: root + password: password + authSource: admin tasks: enabled: false From e9a3e33a36d8158cc0b6ec667c5ab380491fbd8d Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 09:32:42 +0900 Subject: [PATCH 04/10] apply feedback --- .../templates/claims/persistent-volume-claims.yaml | 2 +- .../hdx-oss-v2/templates/configmaps/app-configmap.yaml | 8 ++------ charts/hdx-oss-v2/templates/hyperdx-deployment.yaml | 2 +- charts/hdx-oss-v2/values.yaml | 10 +--------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml b/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml index 90758ac..f10d23d 100644 --- a/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml +++ b/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml @@ -1,4 +1,4 @@ -{{- if .Values.mongodb.enabled }} +{{- if .Values.persistence.mongodb.enabled }} apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index e27a9c3..ccbc437 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -13,12 +13,8 @@ data: HYPERDX_APP_URL: "{{ .Values.hyperdx.appUrl }}" HYPERDX_LOG_LEVEL: "{{ .Values.hyperdx.logLevel }}" MINER_API_URL: "http://{{ include "hdx-oss.fullname" . }}-miner:5123" - {{- if .Values.persistence.mongodb.remote }} - {{- if .Values.persistence.mongodb.auth.enabled }} - MONGO_URI: mongodb://{{ .Values.persistence.mongodb.auth.username }}:{{ .Values.persistence.mongodb.auth.password }}@{{ .Values.persistence.mongodb.endpoint }}:{{ .Values.persistence.mongodb.port }}/{{ .Values.persistence.mongodb.database }}?authSource={{ .Values.persistence.mongodb.auth.authSource }} - {{- else }} - MONGO_URI: mongodb://{{ .Values.persistence.mongodb.endpoint }}:{{ .Values.persistence.mongodb.port }}/{{ .Values.persistence.mongodb.database }} - {{- end }} + {{- if .Values.hyperdx.mongoUri }} + MONGO_URI: {{ .Values.hyperdx.mongoUri | quote }} {{- else }} MONGO_URI: mongodb://{{ include "hdx-oss.fullname" . }}-mongodb:{{ .Values.mongodb.service.port }}/hyperdxv2 {{- end }} diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 6a60a17..6a4cfd0 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -28,7 +28,7 @@ spec: {{- end -}} {{- end }} spec: - {{- if not .Values.persistence.mongodb.remote }} + {{- if not .Values.hyperdx.mongoUri }} initContainers: - name: wait-for-mongodb image: busybox diff --git a/charts/hdx-oss-v2/values.yaml b/charts/hdx-oss-v2/values.yaml index 78d8239..01bd987 100644 --- a/charts/hdx-oss-v2/values.yaml +++ b/charts/hdx-oss-v2/values.yaml @@ -14,6 +14,7 @@ hyperdx: usageStatsEnabled: true # Endpoint to send hyperdx logs/traces/metrics to.Defaults to the chart's otel collector endpoint. otelExporterEndpoint: http://{{ include "hdx-oss.fullname" . }}-otel-collector:{{ .Values.otel.httpPort }} + mongoUri: mongodb://root:root1234@mongo-uri:27017/hyperdx?authSource=admin annotations: {} # myAnnotation: "myValue" labels: {} @@ -207,16 +208,7 @@ otel: persistence: mongodb: enabled: true - remote: true - endpoint: hyperdx-mongodb-svc - port: 27017 - database: hyperdx size: 10Gi - auth: - enabled: false - username: root - password: password - authSource: admin tasks: enabled: false From 827c06270b1bc9384aa2ec6661588a13780e0881 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 09:36:49 +0900 Subject: [PATCH 05/10] add changeset --- .changeset/metal-queens-give.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/metal-queens-give.md diff --git a/.changeset/metal-queens-give.md b/.changeset/metal-queens-give.md new file mode 100644 index 0000000..52dc026 --- /dev/null +++ b/.changeset/metal-queens-give.md @@ -0,0 +1,5 @@ +--- +"helm-charts": patch +--- + +enable using remote mongodb From 9d0d447f50f32d67313e4a55824777f93d590e8a Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 15:14:02 +0900 Subject: [PATCH 06/10] remove if statement --- charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml | 6 +----- charts/hdx-oss-v2/values.yaml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index ccbc437..141023e 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -13,11 +13,7 @@ data: HYPERDX_APP_URL: "{{ .Values.hyperdx.appUrl }}" HYPERDX_LOG_LEVEL: "{{ .Values.hyperdx.logLevel }}" MINER_API_URL: "http://{{ include "hdx-oss.fullname" . }}-miner:5123" - {{- if .Values.hyperdx.mongoUri }} - MONGO_URI: {{ .Values.hyperdx.mongoUri | quote }} - {{- else }} - MONGO_URI: mongodb://{{ include "hdx-oss.fullname" . }}-mongodb:{{ .Values.mongodb.service.port }}/hyperdxv2 - {{- end }} + MONGO_URI: {{ .Values.hyperdx.mongoUri | default (printf ...) }} NEXT_PUBLIC_SERVER_URL: "http://localhost:{{ .Values.hyperdx.apiPort }}" OTEL_SERVICE_NAME: "hdx-oss-api" USAGE_STATS_ENABLED: "{{ .Values.hyperdx.usageStatsEnabled | default true }}" diff --git a/charts/hdx-oss-v2/values.yaml b/charts/hdx-oss-v2/values.yaml index 01bd987..d84f8ab 100644 --- a/charts/hdx-oss-v2/values.yaml +++ b/charts/hdx-oss-v2/values.yaml @@ -14,7 +14,7 @@ hyperdx: usageStatsEnabled: true # Endpoint to send hyperdx logs/traces/metrics to.Defaults to the chart's otel collector endpoint. otelExporterEndpoint: http://{{ include "hdx-oss.fullname" . }}-otel-collector:{{ .Values.otel.httpPort }} - mongoUri: mongodb://root:root1234@mongo-uri:27017/hyperdx?authSource=admin + mongoUri: mongodb://{{ include "hdx-oss.fullname" . }}-mongodb:{{ .Values.mongodb.port }}/hyperdx annotations: {} # myAnnotation: "myValue" labels: {} From 3a72468da2e8415676bdd95dfb1613009ad65cc7 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 15:49:22 +0900 Subject: [PATCH 07/10] remove useless --- charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index 141023e..2f7bafd 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -13,7 +13,7 @@ data: HYPERDX_APP_URL: "{{ .Values.hyperdx.appUrl }}" HYPERDX_LOG_LEVEL: "{{ .Values.hyperdx.logLevel }}" MINER_API_URL: "http://{{ include "hdx-oss.fullname" . }}-miner:5123" - MONGO_URI: {{ .Values.hyperdx.mongoUri | default (printf ...) }} + MONGO_URI: {{ .Values.hyperdx.mongoUri }} NEXT_PUBLIC_SERVER_URL: "http://localhost:{{ .Values.hyperdx.apiPort }}" OTEL_SERVICE_NAME: "hdx-oss-api" USAGE_STATS_ENABLED: "{{ .Values.hyperdx.usageStatsEnabled | default true }}" From 75a533da12a3b08034099f63bea2515d103dc8c9 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 18:06:49 +0900 Subject: [PATCH 08/10] fix typo --- charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index 2f7bafd..21fddb7 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -13,7 +13,7 @@ data: HYPERDX_APP_URL: "{{ .Values.hyperdx.appUrl }}" HYPERDX_LOG_LEVEL: "{{ .Values.hyperdx.logLevel }}" MINER_API_URL: "http://{{ include "hdx-oss.fullname" . }}-miner:5123" - MONGO_URI: {{ .Values.hyperdx.mongoUri }} + MONGO_URI: "{{ tpl .Values.hyperdx.mongoUri . }}" NEXT_PUBLIC_SERVER_URL: "http://localhost:{{ .Values.hyperdx.apiPort }}" OTEL_SERVICE_NAME: "hdx-oss-api" USAGE_STATS_ENABLED: "{{ .Values.hyperdx.usageStatsEnabled | default true }}" From fad24d9aefbd3420d9fa85912eefdb81d85ad6a5 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 18:23:03 +0900 Subject: [PATCH 09/10] fix typo --- charts/hdx-oss-v2/templates/hyperdx-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 6a4cfd0..4080df6 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -28,7 +28,7 @@ spec: {{- end -}} {{- end }} spec: - {{- if not .Values.hyperdx.mongoUri }} + {{- if not .Values.mongodb.enabled }} initContainers: - name: wait-for-mongodb image: busybox From 73fb24598e174d9af260d7ce4124797b0245e6e1 Mon Sep 17 00:00:00 2001 From: OhJuhun Date: Thu, 5 Jun 2025 18:27:04 +0900 Subject: [PATCH 10/10] remove endl --- charts/hdx-oss-v2/templates/hyperdx-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 4080df6..63445a3 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -63,4 +63,4 @@ spec: {{- end }} {{- with .Values.hyperdx.env }} {{- toYaml . | nindent 12 }} - {{- end }} + {{- end }} \ No newline at end of file