diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02a81a21..57d5c654 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: ports: - 2181:2181 kafka: - image: bitnami/kafka:2.8.1 + image: bitnami/kafka:3.3 env: KAFKA_BROKER_ID: "1" KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:2181" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a69541c..5712da4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ run tests: services: - name: bitnami/zookeeper:3.7 alias: zookeeper - - name: bitnami/kafka:2.8.1 + - name: bitnami/kafka:3.3 alias: kafka - name: clickhouse/clickhouse-server:22.8 alias: clickhouse diff --git a/akvorado.yaml b/akvorado.yaml index f7cccd50..e3697cec 100644 --- a/akvorado.yaml +++ b/akvorado.yaml @@ -5,7 +5,7 @@ # orchestrator /dev/null --dump --check`. kafka: topic: flows - version: 2.8.1 + version: 3.3.1 brokers: - kafka:9092 topic-configuration: diff --git a/console/data/docs/99-changelog.md b/console/data/docs/99-changelog.md index 84963af0..ad0291e6 100644 --- a/console/data/docs/99-changelog.md +++ b/console/data/docs/99-changelog.md @@ -19,6 +19,7 @@ after upgrading for it to pick the new schema. - ✨ *console*: add `SrcNetPrefix` and `DstNetPrefix` (as a dimension and a filter attribute) - 🌱 *console*: add `limit` and `graph-type` to `console.default-visualize-options` - 🌱 *docker*: published `docker-compose.yml` file pins Akvorado image to the associated release +- 🌱 *docker*: update Zookeeper and Kafka images (this upgrade is optional) ## 1.6.3 - 2022-11-26 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 571d12fa..3727cb79 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -8,7 +8,7 @@ services: - ALLOW_ANONYMOUS_LOGIN=yes kafka: - image: bitnami/kafka:2.8.1 + image: bitnami/kafka:3.3 environment: - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 - KAFKA_BROKER_ID=1 diff --git a/docker-compose.yml b/docker-compose.yml index 4227177c..94537c29 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: volumes: - akvorado-zookeeper:/bitnami/zookeeper kafka: - image: bitnami/kafka:2.8.1 + image: bitnami/kafka:3.3 environment: - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 - ALLOW_PLAINTEXT_LISTENER=yes