diff --git a/compose.yaml b/compose.yaml index f0ae5d4..1f4ff61 100644 --- a/compose.yaml +++ b/compose.yaml @@ -12,6 +12,7 @@ x-clickhouse-common: &clickhouse-common # Стенд локальный: нодам нужен общий пользователь без пароля для Distributed. CLICKHOUSE_SKIP_USER_SETUP: "1" CLICKHOUSE_CLUSTER_SECRET: ${CLICKHOUSE_CLUSTER_SECRET:?Скопируйте .env.example в .env} + CLICKHOUSE_DEFAULT_PASSWORD: ${CLICKHOUSE_DEFAULT_PASSWORD:?Скопируйте .env.example в .env} CLICKHOUSE_ETL_PASSWORD: ${CLICKHOUSE_ETL_PASSWORD:?Скопируйте .env.example в .env} CLICKHOUSE_BI_PASSWORD: ${CLICKHOUSE_BI_PASSWORD:?Скопируйте .env.example в .env} CLICKHOUSE_ANALYST_PASSWORD: ${CLICKHOUSE_ANALYST_PASSWORD:?Скопируйте .env.example в .env} @@ -22,7 +23,7 @@ x-clickhouse-common: &clickhouse-common # Гигабайта не хватало: половину съедали страницы самого бинарника (ADR 0004). mem_limit: 4g healthcheck: - test: ["CMD-SHELL", "clickhouse-client --host 127.0.0.1 --query 'SELECT 1' >/dev/null 2>&1"] + test: ["CMD-SHELL", "clickhouse-client --host 127.0.0.1 --user default --password \"$$CLICKHOUSE_DEFAULT_PASSWORD\" --query 'SELECT 1' >/dev/null 2>&1"] interval: 5s timeout: 3s retries: 30 diff --git a/infra/clickhouse/users.d/access.xml b/infra/clickhouse/users.d/access.xml index dc45cff..caa8f6c 100644 --- a/infra/clickhouse/users.d/access.xml +++ b/infra/clickhouse/users.d/access.xml @@ -37,6 +37,9 @@ + + + default diff --git a/scripts/check-clickhouse.sh b/scripts/check-clickhouse.sh index 51423f3..e0c895a 100755 --- a/scripts/check-clickhouse.sh +++ b/scripts/check-clickhouse.sh @@ -18,7 +18,12 @@ compose() { query() { local service="$1" local sql="$2" - compose exec -T "$service" clickhouse-client --query "$sql"