feat: inject otel.clickhouseUser and clickhouse.config.users.otelUserName

Author: wrn14897

charts/hdx-oss-v2/data/users.xml

@@ -42,7 +42,7 @@
                 <query>GRANT SELECT ON default.*</query>
             </grants>
         </app>
-        <otelcollector>
+        <{{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}>
             <password>{{ .Values.otel.clickhousePassword | default .Values.clickhouse.config.users.otelUserPassword }}</password>
             <networks>
                 {{- if .Values.clickhouse.config.clusterCidrs }}
@@ -59,7 +59,7 @@
             <grants>
                 <query>GRANT SELECT,INSERT,CREATE,SHOW ON default.*</query>
             </grants>
-        </otelcollector>
+        </{{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}>
     </users>
 
     <quotas>

charts/hdx-oss-v2/templates/otel-collector-deployment.yaml

@@ -48,7 +48,7 @@ spec:
                   name: {{ include "hdx-oss.fullname" . }}-app-secrets
                   key: api-key
             - name: CLICKHOUSE_USER
-              value: {{ .Values.otel.clickhouseUser | default "otelcollector" }}
+              value: {{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}
             - name: CLICKHOUSE_PASSWORD
               value: {{ .Values.otel.clickhousePassword | default .Values.clickhouse.config.users.otelUserPassword }}
 ---

charts/hdx-oss-v2/values.yaml

@@ -173,6 +173,7 @@ clickhouse:
     users:
       appUserPassword: "hyperdx"
       otelUserPassword: "otelcollectorpass"
+      otelUserName: "otelcollector"
     # Network CIDRs for Kubernetes cluster access control
     # These CIDRs ensure ClickHouse connections are locked down to intra-cluster only
     # For PRODUCTION: Remove development CIDRs and keep only your cluster's specific CIDR
@@ -198,7 +199,7 @@ otel:
   # Leave empty if you want to use the chart's Clickhouse service.
   # Example: clickhouseEndpoint: "tcp://custom-clickhouse-service:9000"
   clickhouseEndpoint:
-  clickhouseUser: "otelcollector"
+  clickhouseUser:
   clickhousePassword:
   # Clickhouse Prometheus endpoint - defaults to chart's Clickhouse prometheus service. Customize if you want to use a different Clickhouse prometheus service. 
   # Leave empty if prometheus is disabled.