feat: add distributed cluster name config (#1780)

* feat: add distributed cluster name helper function

Add new helper function sentry.clickhouse.distributed.cluster.name that allows
separate configuration of distributed cluster name for external ClickHouse.

- Maintains backward compatibility (defaults to clusterName)
- Enables advanced ClickHouse cluster configurations

* feat: use separate helper for distributed cluster name

Update Snuba configuration to use the new distributed cluster name helper

* docs: add distributedClusterName documentation in values.yaml

Add documentation and example for the new distributedClusterName option

Author: brewle

charts/sentry/templates/_helper.tpl

@@ -412,6 +412,17 @@ Set ClickHouse cluster name
 {{- end -}}
 {{- end -}}
 
+{{/*
+Set ClickHouse distributed cluster name
+*/}}
+{{- define "sentry.clickhouse.distributed.cluster.name" -}}
+{{- if .Values.clickhouse.enabled -}}
+{{ .Release.Name | printf "%s-clickhouse" }}
+{{- else -}}
+{{ default .Values.externalClickhouse.clusterName .Values.externalClickhouse.distributedClusterName }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Set ClickHouse secure setting
 */}}

charts/sentry/templates/snuba/_helper-snuba.tpl

@@ -81,7 +81,7 @@ settings.py: |
       {{- end }}
       {{- if or .Values.clickhouse.enabled (not .Values.externalClickhouse.singleNode) }}
       "cluster_name": {{ include "sentry.clickhouse.cluster.name" . | quote }},
-      "distributed_cluster_name": {{ include "sentry.clickhouse.cluster.name" . | quote }},
+      "distributed_cluster_name": {{ include "sentry.clickhouse.distributed.cluster.name" . | quote }},
       {{- end }}
     },
   ]

charts/sentry/values.yaml

@@ -2268,6 +2268,10 @@ externalClickhouse:
   ## or by executing `select * from system.clusters`
   ##
   # clusterName: test_shard_localhost
+  ## Optional: separate distributed cluster name (defaults to clusterName)
+  ## Use this when your ClickHouse distributed queries need a different cluster name
+  ##
+  # distributedClusterName: distributed_test_shard_localhost
 
 # Settings for Zookeeper.
 # See https://github.com/bitnami/charts/tree/master/bitnami/zookeeper