Test metricbeat kafka module with kafka 2.0.0 (#7992)

elastic · Aug 17, 2018 · 7635731 · 7635731
1 parent 471c360
commit 7635731
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
@@ -98,12 +98,20 @@ services:
   kafka:
     build:
       context: ./module/kafka/_meta
-      dockerfile: Dockerfile.1.1.0
+      args:
+        KAFKA_VERSION: 2.0.0
+
+  kafka_1_1_0:
+    build:
+      context: ./module/kafka/_meta
+      args:
+        KAFKA_VERSION: 1.1.0
 
   kafka_0_10_2:
     build:
       context: ./module/kafka/_meta
-      dockerfile: Dockerfile.0.10.2
+      args:
+        KAFKA_VERSION: 0.10.2.1
 
   kibana:
     build: ./module/kibana/_meta

diff --git a/metricbeat/docs/modules/kafka.asciidoc b/metricbeat/docs/modules/kafka.asciidoc
@@ -14,7 +14,7 @@ The default metricsets are `consumergroup` and `partition`.
 [float]
 === Compability
 
-This module is tested with Kafka 0.10.2 and 1.1.0.
+This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.0.0.
 
 
 [float]

diff --git a/...cbeat/module/kafka/_meta/Dockerfile.1.1.0 → metricbeat/module/kafka/_meta/Dockerfile b/...cbeat/module/kafka/_meta/Dockerfile.1.1.0 → metricbeat/module/kafka/_meta/Dockerfile
@@ -1,9 +1,10 @@
 FROM debian:stretch
 
+ARG KAFKA_VERSION=2.0.0
+
 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_LOGS_DIR="/kafka-logs"
-ENV KAFKA_VERSION 1.1.0
 ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
 ENV TERM=linux
 

diff --git a/metricbeat/module/kafka/_meta/Dockerfile.0.10.2 b/metricbeat/module/kafka/_meta/Dockerfile.0.10.2
diff --git a/metricbeat/module/kafka/_meta/docs.asciidoc b/metricbeat/module/kafka/_meta/docs.asciidoc
@@ -5,4 +5,4 @@ The default metricsets are `consumergroup` and `partition`.
 [float]
 === Compability
 
-This module is tested with Kafka 0.10.2 and 1.1.0.
+This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.0.0.
diff --git a/metricbeat/tests/system/test_kafka.py b/metricbeat/tests/system/test_kafka.py
@@ -45,5 +45,9 @@ def get_hosts(self):
                 os.getenv('KAFKA_PORT', '9092')]
 
 
+class Kafka_1_1_0_Test(KafkaTest):
+    COMPOSE_SERVICES = ['kafka_1_1_0']
+
+
 class Kafka_0_10_2_Test(KafkaTest):
     COMPOSE_SERVICES = ['kafka_0_10_2']