Updates for default database and readme

Author: teeohhem

charts/hdx-oss-v2/templates/hyperdx-deployment.yaml

@@ -40,6 +40,8 @@ spec:
               containerPort: {{ .Values.hyperdx.appPort }}
             - name: api-port
               containerPort: {{ .Values.hyperdx.apiPort }}
+            - name: opamp-port
+              containerPort: {{ .Values.hyperdx.opampPort }}
           envFrom:
             - configMapRef:
                 name: {{ include "hdx-oss.fullname" . }}-app-config

charts/hdx-oss-v2/templates/hyperdx-service.yaml

@@ -10,6 +10,9 @@ spec:
     - port: {{ .Values.hyperdx.appPort }}
       targetPort: {{ .Values.hyperdx.appPort }}
       name: app
+    - port: {{ .Values.hyperdx.opampPort }}
+      targetPort: {{ .Values.hyperdx.opampPort }}
+      name: opamp
   selector:
     {{- include "hdx-oss.selectorLabels" . | nindent 4 }}
     app: {{ include "hdx-oss.fullname" . }} 

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

@@ -40,6 +40,8 @@ spec:
               value: {{ .Values.otel.opampServerUrl | default (printf "http://%s-app:%v" (include "hdx-oss.fullname" .) .Values.hyperdx.opampPort ) }}
             - name: HYPERDX_LOG_LEVEL
               value: {{ .Values.hyperdx.logLevel }}
+            - name: HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE
+              value: {{ .Values.hyperdx.clickhouseDatabase | default "default" }}
             - name: HYPERDX_API_KEY
               valueFrom:
                 secretKeyRef:

charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml

@@ -18,6 +18,9 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].ports[1].containerPort
           value: 8000
+      - equal:
+          path: spec.template.spec.containers[0].ports[2].containerPort
+          value: 4320
       - isSubset:
           path: spec.template.spec.containers[0].envFrom[0]
           content:
@@ -85,4 +88,22 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ANOTHER_ENV
-            value: "another-value"
+            value: "another-value"
+
+  - it: should expose OpAMP container port with default values
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].ports[2].containerPort
+          value: 4320
+      - equal:
+          path: spec.template.spec.containers[0].ports[2].name
+          value: opamp-port
+  
+  - it: should use custom OpAMP port when provided
+    set:
+      hyperdx:
+        opampPort: 5320
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].ports[2].containerPort
+          value: 5320

charts/hdx-oss-v2/tests/hyperdx-service_test.yaml

@@ -35,4 +35,28 @@ tests:
     asserts:
       - matchRegex:
           path: spec.selector.app
-          pattern: ^RELEASE-NAME-hdx-oss-v2$
+          pattern: ^RELEASE-NAME-hdx-oss-v2$
+
+  - it: should expose OpAMP port with default values
+    asserts:
+      - equal:
+          path: spec.ports[1].port
+          value: 4320
+      - equal:
+          path: spec.ports[1].targetPort
+          value: 4320
+      - equal:
+          path: spec.ports[1].name
+          value: opamp
+  
+  - it: should use custom OpAMP port when provided
+    set:
+      hyperdx:
+        opampPort: 5320
+    asserts:
+      - equal:
+          path: spec.ports[1].port
+          value: 5320
+      - equal:
+          path: spec.ports[1].targetPort
+          value: 5320

charts/hdx-oss-v2/tests/otel-collector_test.yaml

@@ -307,4 +307,53 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: OPAMP_SERVER_URL
-            value: "https://custom-opamp-server:8080"
+            value: "https://custom-opamp-server:8080"
+
+  - it: should use default clickhouse database when not specified
+    set:
+      otel:
+        enabled: true
+        image: hyperdx/hyperdx-otel-collector:2-beta
+      hyperdx:
+        logLevel: info
+      clickhouse:
+        config:
+          users:
+            otelUserPassword: test-password
+    release:
+      name: test-release
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Deployment
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE
+            value: "default"
+
+  - it: should use custom clickhouse database when specified
+    set:
+      otel:
+        enabled: true
+        image: hyperdx/hyperdx-otel-collector:2-beta
+      hyperdx:
+        logLevel: info
+        clickhouseDatabase: "custom_db"
+      clickhouse:
+        config:
+          users:
+            otelUserPassword: test-password
+    release:
+      name: test-release
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Deployment
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE
+            value: "custom_db"

charts/hdx-oss-v2/values.yaml

@@ -14,6 +14,8 @@ 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 }}
+  # Clickhouse database to send logs/traces/metrics to. Defaults to "default"
+  clickhouseDatabase: "default"
   annotations: {}
     # myAnnotation: "myValue"
   labels: {}