Merge pull request #2 from ClickHouse/main

chore: sync fork with upstream

Author: teeohhem

.github/workflows/chart-test-legacy.yml

@@ -63,7 +63,7 @@ jobs:
 
     - name: Run Helm unit tests
       run: |
-        helm plugin install https://github.com/helm-unittest/helm-unittest.git || true
+        helm plugin install https://github.com/helm-unittest/helm-unittest.git --version v1.0.3 ${{ runner.debug && '--debug' || ''}} || true
         helm unittest charts/hdx-oss-v2
 
     - name: Deploy hdx-oss-v2 chart

.github/workflows/chart-test.yml

@@ -63,7 +63,7 @@ jobs:
 
       - name: Run Helm unit tests
         run: |
-          helm plugin install https://github.com/helm-unittest/helm-unittest.git || true
+          helm plugin install https://github.com/helm-unittest/helm-unittest.git --version v1.0.3 ${{ runner.debug && '--debug' || ''}} || true
           helm unittest charts/clickstack
 
       - name: Deploy ClickStack chart

.github/workflows/helm-test-legacy.yaml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install helm-unittest plugin
         run: |
-          helm plugin install https://github.com/helm-unittest/helm-unittest.git
+          helm plugin install https://github.com/helm-unittest/helm-unittest.git --version v1.0.2 ${{ runner.debug && '--debug' || ''}}
 
       - name: Run helm-unittest
         run: |

.github/workflows/helm-test.yaml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install helm-unittest plugin
         run: |
-          helm plugin install https://github.com/helm-unittest/helm-unittest.git
+          helm plugin install https://github.com/helm-unittest/helm-unittest.git --version v1.0.3 ${{ runner.debug && '--debug' || ''}}
 
       - name: Run helm-unittest
         run: |

CHANGELOG.md

@@ -1,5 +1,11 @@
 # helm-charts
 
+## 1.1.0
+
+### Minor Changes
+
+- 8fcee9a: Supports passing additional arguments to the check-alerts task. This allows setting the concurrency and sourceTimeoutMs through helm.
+
 ## 1.0.1
 
 ### Patch Changes

README.md

@@ -4,7 +4,7 @@
 
 ## Quick Start
 ```bash
-helm repo add clickstack https://hyperdxio.github.io/helm-charts
+helm repo add clickstack https://clickhouse.github.io/ClickStack-helm-charts
 helm repo update
 helm install my-clickstack clickstack/clickstack
 ```
@@ -19,4 +19,4 @@ For configuration, cloud deployment, ingress setup, and troubleshooting, see the
 ## Support
 
 - **[Documentation](https://clickhouse.com/docs/use-cases/observability/clickstack)** - Installation, configuration, guides
-- **[Issues](https://github.com/hyperdxio/helm-charts/issues)** - Report bugs or request features
+- **[Issues](https://github.com/ClickHouse/ClickStack-helm-charts/issues)** - Report bugs or request features

charts/clickstack/Chart.yaml

@@ -15,5 +15,5 @@ annotations:
     - name: Upstream Project
       url: https://github.com/hyperdxio/hyperdx
 type: application
-version: 1.0.1
+version: 1.1.0
 appVersion: 2.8.0

charts/clickstack/templates/cronjobs/task-checkAlerts.yaml

@@ -28,9 +28,23 @@ spec:
               imagePullPolicy: {{ .Values.hyperdx.image.pullPolicy }}
               {{- $tag := .Values.hyperdx.image.tag | default .Chart.AppVersion -}}
               {{- if and (regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+" $tag) (semverCompare "< 2.7.0" $tag) }} # before esbuild revert
-              command: ["node", "/app/packages/api/tasks/index", "check-alerts"]
+              command:
+                - "node"
+                - "/app/packages/api/tasks/index"
+                - "check-alerts"
+                {{- range $key, $value := .Values.tasks.checkAlerts.additionalArgs }}
+                - "--{{ $key }}"
+                - "{{ $value }}"
+                {{- end }}
               {{- else }}
-              command: ["node", "/app/packages/api/build/tasks/index.js", "check-alerts"] # after esbuild revert
+              command: # after esbuild revert
+                - "node"
+                - "/app/packages/api/build/tasks/index.js"
+                - "check-alerts"
+                {{- range $key, $value := .Values.tasks.checkAlerts.additionalArgs }}
+                - "--{{ $key }}"
+                - "{{ $value }}"
+                {{- end }}
               {{- end }}
               envFrom:
                 - configMapRef:

charts/clickstack/tests/task-checkAlerts_test.yaml

@@ -154,3 +154,63 @@ tests:
       - equal:
           path: spec.jobTemplate.spec.template.spec.containers[0].command
           value: ["node", "/app/packages/api/build/tasks/index.js", "check-alerts"]
+
+  - it: should not include additionalArgs when empty
+    set:
+      tasks:
+        enabled: true
+        checkAlerts:
+          additionalArgs: {}
+      hyperdx:
+        image:
+          tag: "2.8.0"
+    asserts:
+      - equal:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          value: ["node", "/app/packages/api/build/tasks/index.js", "check-alerts"]
+
+  - it: should include additionalArgs with -- prefix in command
+    set:
+      tasks:
+        enabled: true
+        checkAlerts:
+          additionalArgs:
+            concurrency: 6
+            sourceTimeoutMs: 90000
+      hyperdx:
+        image:
+          tag: "2.8.0"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "--concurrency"
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "6"
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "--sourceTimeoutMs"
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "90000"
+
+  - it: should include additionalArgs in pre-esbuild command path
+    set:
+      tasks:
+        enabled: true
+        checkAlerts:
+          additionalArgs:
+            concurrency: 4
+      hyperdx:
+        image:
+          tag: "2.6.0"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "/app/packages/api/tasks/index"
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "--concurrency"
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].command
+          content: "4"

charts/clickstack/values.yaml

@@ -467,6 +467,17 @@ tasks:
   enabled: false
   checkAlerts:
     schedule: "*/1 * * * *" # Runs every 1 minute
+
+    additionalArgs:
+      {}
+      # Additional command line arguments can be supplied to the check-alerts
+      # task by defining the param as a key/value pair. These are passed to the
+      # task without validation in the helm chart.
+      #
+      # Examples:
+      # concurrency: 6
+      # sourceTimeoutMs: 90000
+
     resources:
       limits:
         cpu: 200m