From f7c74f9e72e56eb9155ebb481adefdc8d841ee7c Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Sun, 19 Apr 2020 18:28:37 -0700 Subject: [PATCH] Update Kafka versions --- metricbeat/docs/modules/kafka.asciidoc | 2 +- metricbeat/module/kafka/README.md | 2 +- metricbeat/module/kafka/_meta/docs.asciidoc | 2 +- metricbeat/module/kafka/_meta/supported-versions.yml | 1 + metricbeat/module/kafka/broker/_meta/docs.asciidoc | 2 +- metricbeat/module/kafka/consumer/_meta/docs.asciidoc | 2 +- metricbeat/module/kafka/docker-compose.yml | 4 ++-- metricbeat/module/kafka/producer/_meta/docs.asciidoc | 2 +- testing/environments/docker/kafka/Dockerfile | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/metricbeat/docs/modules/kafka.asciidoc b/metricbeat/docs/modules/kafka.asciidoc index dfa7807db696..e787c297bbcf 100644 --- a/metricbeat/docs/modules/kafka.asciidoc +++ b/metricbeat/docs/modules/kafka.asciidoc @@ -27,7 +27,7 @@ kafka-acls --authorizer-properties zookeeper.connect=localhost:2181 --add --allo [float] === Compatibility -This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.1.1. +This module is tested with Kafka 0.10.2.1, 1.1.0, 2.1.1, and 2.2.2. The Broker, Producer, Consumer metricsets require <> to fetch JMX metrics. Refer to the link for Jolokia's compatibility notes. diff --git a/metricbeat/module/kafka/README.md b/metricbeat/module/kafka/README.md index c80b79c21776..dc31ee0b82f0 100644 --- a/metricbeat/module/kafka/README.md +++ b/metricbeat/module/kafka/README.md @@ -14,7 +14,7 @@ To bring this container up simply run the tests for Kafka module: After the tests have been completed, the Kafka container should be still running. Verify with: ```console -707b50334835 docker.elastic.co/integrations-ci/beats-kafka:2.1.1-2 "/run.sh" 2 minutes ago Up 2 minutes (healthy) 2181/tcp, 0.0.0.0:32785->8774/tcp, 0.0.0.0:32784->8775/tcp, 0.0.0.0:32783->8779/tcp, 0.0.0.0:32782->9092/tcp kafka_a035cf4c6889705a_kafka_1 +707b50334835 docker.elastic.co/integrations-ci/beats-kafka:2.2.2-2 "/run.sh" 2 minutes ago Up 2 minutes (healthy) 2181/tcp, 0.0.0.0:32785->8774/tcp, 0.0.0.0:32784->8775/tcp, 0.0.0.0:32783->8779/tcp, 0.0.0.0:32782->9092/tcp kafka_a035cf4c6889705a_kafka_1 ``` In order to identify to which port the Broker is listening on one should check in the logs of the container and find diff --git a/metricbeat/module/kafka/_meta/docs.asciidoc b/metricbeat/module/kafka/_meta/docs.asciidoc index d28a35fcdeb8..b0010e84260e 100644 --- a/metricbeat/module/kafka/_meta/docs.asciidoc +++ b/metricbeat/module/kafka/_meta/docs.asciidoc @@ -20,7 +20,7 @@ kafka-acls --authorizer-properties zookeeper.connect=localhost:2181 --add --allo [float] === Compatibility -This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.1.1. +This module is tested with Kafka 0.10.2.1, 1.1.0, 2.1.1, and 2.2.2. The Broker, Producer, Consumer metricsets require <> to fetch JMX metrics. Refer to the link for Jolokia's compatibility notes. diff --git a/metricbeat/module/kafka/_meta/supported-versions.yml b/metricbeat/module/kafka/_meta/supported-versions.yml index cc0deea25e6f..891e77f9142a 100644 --- a/metricbeat/module/kafka/_meta/supported-versions.yml +++ b/metricbeat/module/kafka/_meta/supported-versions.yml @@ -1,4 +1,5 @@ variants: + - KAFKA_VERSION: 2.2.2 - KAFKA_VERSION: 2.1.1 - KAFKA_VERSION: 2.0.0 - KAFKA_VERSION: 1.1.0 diff --git a/metricbeat/module/kafka/broker/_meta/docs.asciidoc b/metricbeat/module/kafka/broker/_meta/docs.asciidoc index 8f4187ba8def..ba1b189fda0a 100644 --- a/metricbeat/module/kafka/broker/_meta/docs.asciidoc +++ b/metricbeat/module/kafka/broker/_meta/docs.asciidoc @@ -2,7 +2,7 @@ This metricset periodically fetches JMX metrics from Kafka Broker JMX. [float] === Compatibility -The module has been tested with Kafka 2.1.1. Other versions are expected to work. +The module has been tested with Kafka 2.1.1 and 2.2.2. Other versions are expected to work. [float] === Usage diff --git a/metricbeat/module/kafka/consumer/_meta/docs.asciidoc b/metricbeat/module/kafka/consumer/_meta/docs.asciidoc index 0fd42e7d26e7..c50fd52115f9 100644 --- a/metricbeat/module/kafka/consumer/_meta/docs.asciidoc +++ b/metricbeat/module/kafka/consumer/_meta/docs.asciidoc @@ -2,7 +2,7 @@ This metricset periodically fetches JMX metrics from Kafka Consumers implemented [float] === Compatibility -The module has been tested with Kafka 2.1.1. Other versions are expected to work. +The module has been tested with Kafka 2.1.1 and 2.2.2. Other versions are expected to work. [float] === Usage diff --git a/metricbeat/module/kafka/docker-compose.yml b/metricbeat/module/kafka/docker-compose.yml index c24a15b6a4ac..9865faf5116e 100644 --- a/metricbeat/module/kafka/docker-compose.yml +++ b/metricbeat/module/kafka/docker-compose.yml @@ -2,11 +2,11 @@ version: '2.3' services: kafka: - image: docker.elastic.co/integrations-ci/beats-kafka:${KAFKA_VERSION:-2.1.1}-2 + image: docker.elastic.co/integrations-ci/beats-kafka:${KAFKA_VERSION:-2.2.2}-2 build: context: ./_meta args: - KAFKA_VERSION: ${KAFKA_VERSION:-2.1.1} + KAFKA_VERSION: ${KAFKA_VERSION:-2.2.2} ports: - 9092 - 8779 diff --git a/metricbeat/module/kafka/producer/_meta/docs.asciidoc b/metricbeat/module/kafka/producer/_meta/docs.asciidoc index 29bd793c708a..d82744924c35 100644 --- a/metricbeat/module/kafka/producer/_meta/docs.asciidoc +++ b/metricbeat/module/kafka/producer/_meta/docs.asciidoc @@ -2,7 +2,7 @@ This metricset periodically fetches JMX metrics from Kafka Producers implemented [float] === Compatibility -The module has been tested with Kafka 2.1.1. Other versions are expected to work. +The module has been tested with Kafka 2.1.1 and 2.2.2. Other versions are expected to work. [float] === Usage diff --git a/testing/environments/docker/kafka/Dockerfile b/testing/environments/docker/kafka/Dockerfile index 2af8a1dd0b90..24bf09961937 100644 --- a/testing/environments/docker/kafka/Dockerfile +++ b/testing/environments/docker/kafka/Dockerfile @@ -4,7 +4,7 @@ ENV KAFKA_HOME /kafka # The advertised host is kafka. This means it will not work if container is started locally and connected from localhost to it ENV KAFKA_ADVERTISED_HOST kafka ENV KAFKA_LOGS_DIR="/kafka-logs" -ENV KAFKA_VERSION 2.1.1 +ENV KAFKA_VERSION 2.2.2 ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true" ENV TERM=linux