diff --git a/.changeset/quiet-singers-fry.md b/.changeset/quiet-singers-fry.md new file mode 100644 index 000000000..b5cda020b --- /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 9365e9843..03e640eaf 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 e77431560..2dc19f6f1 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 000000000..17995751b --- /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 <