From 31e22dcff49149557b565df265fa6fec9d91c7ae Mon Sep 17 00:00:00 2001 From: Warren <5959690+wrn14897@users.noreply.github.com> Date: Mon, 9 Jun 2025 09:45:23 -0700 Subject: [PATCH] feat: introduce clickhouse db init script (#843) Ref: HDX-1777 This shouldn't have any impact on users --- .changeset/quiet-singers-fry.md | 7 ++ docker-compose.ci.yml | 1 + docker-compose.dev.yml | 2 + docker/clickhouse/local/init-db.sh | 127 +++++++++++++++++++++++++++++ docker/otel-collector/config.yaml | 4 +- 5 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 .changeset/quiet-singers-fry.md create mode 100755 docker/clickhouse/local/init-db.sh diff --git a/.changeset/quiet-singers-fry.md b/.changeset/quiet-singers-fry.md new file mode 100644 index 00000000..b5cda020 --- /dev/null +++ b/.changeset/quiet-singers-fry.md @@ -0,0 +1,7 @@ +--- +"@hyperdx/api": patch +"@hyperdx/app": patch +"@hyperdx/common-utils": patch +--- + +feat: introduce clickhouse db init script diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 9365e984..03e640ea 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -29,6 +29,7 @@ services: volumes: - ./docker/clickhouse/local/config.xml:/etc/clickhouse-server/config.xml - ./docker/clickhouse/local/users.xml:/etc/clickhouse-server/users.xml + - ./docker/clickhouse/local/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh restart: on-failure ports: - 8123:8123 # http api diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index e7743156..2dc19f6f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -53,9 +53,11 @@ services: environment: # default settings CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 + HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE: ${HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE} volumes: - ./docker/clickhouse/local/config.xml:/etc/clickhouse-server/config.xml - ./docker/clickhouse/local/users.xml:/etc/clickhouse-server/users.xml + - ./docker/clickhouse/local/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh - .volumes/ch_data_dev:/var/lib/clickhouse - .volumes/ch_logs_dev:/var/log/clickhouse-server restart: on-failure diff --git a/docker/clickhouse/local/init-db.sh b/docker/clickhouse/local/init-db.sh new file mode 100755 index 00000000..17995751 --- /dev/null +++ b/docker/clickhouse/local/init-db.sh @@ -0,0 +1,127 @@ +#!/bin/bash +set -e + +DATABASE=${HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE:-default} + +clickhouse client -n <