Update Kafka versions (elastic#17819) (elastic#17822)

leweafan · Apr 21, 2020 · 9af7c80 · 9af7c80
1 parent f310e54
commit 9af7c80
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git 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 <<metricbeat-module-jolokia,Jolokia>> 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
@@ -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
@@ -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 <<metricbeat-module-jolokia,Jolokia>> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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