diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f09bf88..b061a390 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: ports: - 6379:6379 clickhouse: - image: clickhouse/clickhouse-server:23.3 + image: clickhouse/clickhouse-server:22.8 ports: - 9000:9000 env: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 933353e4..6e671396 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ run tests: alias: kafka - name: bitnami/redis:7.0 alias: redis - - name: clickhouse/clickhouse-server:23.3 + - name: clickhouse/clickhouse-server:22.8 alias: clickhouse script: - time apk add --no-cache git make gcc musl-dev shared-mime-info npm curl diff --git a/common/clickhousedb/root.go b/common/clickhousedb/root.go index 853b317c..ec7345af 100644 --- a/common/clickhousedb/root.go +++ b/common/clickhousedb/root.go @@ -48,9 +48,6 @@ func New(r *reporter.Reporter, config Configuration, dependencies Dependencies) MaxOpenConns: config.MaxOpenConns, MaxIdleConns: config.MaxOpenConns/2 + 1, ConnMaxLifetime: time.Hour, - Settings: clickhouse.Settings{ - "allow_suspicious_low_cardinality_types": 1, - }, ClientInfo: clickhouse.ClientInfo{ Products: []struct { Name string diff --git a/console/data/docs/99-changelog.md b/console/data/docs/99-changelog.md index 5f5494bd..1d69871d 100644 --- a/console/data/docs/99-changelog.md +++ b/console/data/docs/99-changelog.md @@ -13,10 +13,6 @@ identified with a specific icon: ## Unreleased -- 🩹 *orchestrator*: create flows table with - `allow_suspicious_low_cardinality_types` to ensure we can use - `LowCardinality(IPv6)`. -- 🌱 *docker*: update ClickHouse to 23.3 (this is not mandatory) - 🌱 *build*: minimum supported Node version is now 16 ## 1.8.3 - 2023-04-28 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index d82a0cbb..c3dd85a5 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -31,7 +31,7 @@ services: - 127.0.0.1:6379:6379/tcp clickhouse: - image: clickhouse/clickhouse-server:23.3 + image: clickhouse/clickhouse-server:22.8 ports: - 127.0.0.1:8123:8123/tcp - 127.0.0.1:9000:9000/tcp diff --git a/docker-compose.yml b/docker-compose.yml index c27b5dc3..542638e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -130,7 +130,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro clickhouse: - image: clickhouse/clickhouse-server:23.3 + image: clickhouse/clickhouse-server:22.8 volumes: - ./orchestrator/clickhouse/data/docker-entrypoint.sh:/docker-entrypoint-initdb.d/init-db.sh:ro - akvorado-clickhouse:/var/lib/clickhouse