Merge pull request #180 from langchain-ai/angus/create-clickhouse-clu…

…ster-variable feat(dev): expose clickhouse cluster env var
langchain-ai · Nov 14, 2024 · cf15b12 · cf15b12
2 parents 4963b8a + 7711c19
commit cf15b12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/charts/langsmith/docker-compose/.env.example b/charts/langsmith/docker-compose/.env.example
@@ -17,6 +17,7 @@ CLICKHOUSE_USER=default # Change to your Clickhouse user if needed
 CLICKHOUSE_DB=default # Change to your Clickhouse database if needed
 CLICKHOUSE_PORT=8123 # Change to your Clickhouse port if needed
 CLICKHOUSE_TLS=false # Change to true if you are using TLS to connect to Clickhouse. Otherwise, leave it as is
+CLICKHOUSE_CLUSTER=none # Change to your Clickhouse cluster if using a replicated cluster. Otherwise, leave it as is
 CLICKHOUSE_PASSWORD=password # Change to your Clickhouse password if needed
 CLICKHOUSE_NATIVE_PORT=9000 # Change to your Clickhouse native port if needed
 ORG_CREATION_DISABLED=false # Set to true if you want to disable org creation

diff --git a/charts/langsmith/docker-compose/docker-compose.yaml b/charts/langsmith/docker-compose/docker-compose.yaml
@@ -60,6 +60,7 @@ services:
       - CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
       - CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
       - CLICKHOUSE_TLS=${CLICKHOUSE_TLS:-false}
+      - CLICKHOUSE_CLUSTER=${CLICKHOUSE_CLUSTER:-none}
       - FF_ORG_CREATION_DISABLED=${ORG_CREATION_DISABLED:-false}
       - FF_TRACE_TIERS_ENABLED=${TTL_ENABLED:-true}
       - FF_UPGRADE_TRACE_TIER_ENABLED=${TTL_ENABLED:-true}
@@ -139,6 +140,7 @@ services:
       - CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
       - CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
       - CLICKHOUSE_TLS=${CLICKHOUSE_TLS:-false}
+      - CLICKHOUSE_CLUSTER=${CLICKHOUSE_CLUSTER:-none}
       - FF_ORG_CREATION_DISABLED=${ORG_CREATION_DISABLED:-false}
       - FF_TRACE_TIERS_ENABLED=${TTL_ENABLED:-true}
       - FF_UPGRADE_TRACE_TIER_ENABLED=${TTL_ENABLED:-true}
@@ -232,6 +234,7 @@ services:
       - CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
       - CLICKHOUSE_NATIVE_PORT=${CLICKHOUSE_NATIVE_PORT:-9000}
       - CLICKHOUSE_TLS=${CLICKHOUSE_TLS:-false}
+      - CLICKHOUSE_CLUSTER=${CLICKHOUSE_CLUSTER:-none}
     command:
       [
         "bash",
@@ -262,6 +265,7 @@ services:
       - CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
       - CLICKHOUSE_NATIVE_PORT=${CLICKHOUSE_NATIVE_PORT:-9000}
       - CLICKHOUSE_TLS=${CLICKHOUSE_TLS:-false}
+      - CLICKHOUSE_CLUSTER=${CLICKHOUSE_CLUSTER:-none}
     restart: "on-failure:10"
     command:
       [

diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl
@@ -200,6 +200,8 @@ Template containing common environment variables that are used by several servic
     secretKeyRef:
       name: {{ include "langsmith.clickhouseSecretsName" . }}
       key: clickhouse_tls
+- name: CLICKHOUSE_CLUSTER
+  value: {{ .Values.clickhouse.external.clickhouseCluster }}
 - name: LOG_LEVEL
   value: {{ .Values.config.logLevel }}
 {{- if .Values.config.oauth.enabled }}

diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml
@@ -394,6 +394,7 @@ clickhouse:
     password: "password"
     database: "default"
     tls: false
+    clickhouseCluster: ""
     existingSecretName: ""
   containerHttpPort: 8123
   containerNativePort: 9000