Support Kafka 2.1.0 (#10440)

elastic · Jan 31, 2019 · cb1c6fe · cb1c6fe
1 parent f8ce1aa
commit cb1c6fe
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -196,6 +196,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add `add_fields` processor. {pull}10119[10119]
 - Add Kibana field formatter to bytes fields. {pull}10184[10184]
 - Document a few more `auditd.log.*` fields. {pull}10192[10192]
+- Support Kafka 2.1.0. {pull}10440[10440]
 - Add ILM mode `auto` to setup.ilm.enabled setting. This new default value detects if ILM is available {pull}10347[10347]
 - Add support to read ILM policy from external JSON file. {pull}10347[10347]
 - Add `overwrite` and `check_exists` settings to ILM support. {pull}10347[10347]

diff --git a/libbeat/common/kafka/version.go b/libbeat/common/kafka/version.go
@@ -75,8 +75,10 @@ var (
 		"1":     v1_1_1,
 
 		"2.0.0": sarama.V2_0_0_0,
-		"2.0":   sarama.V2_0_0_0,
-		"2":     sarama.V2_0_0_0,
+		"2.0.1": sarama.V2_0_1_0,
+		"2.0":   sarama.V2_0_1_0,
+		"2.1":   sarama.V2_1_0_0,
+		"2":     sarama.V2_1_0_0,
 	}
 )
 

diff --git a/libbeat/docs/outputconfig.asciidoc b/libbeat/docs/outputconfig.asciidoc
@@ -817,7 +817,7 @@ NOTE: Events bigger than <<kafka-max_message_bytes,`max_message_bytes`>> will be
 [[kafka-compatibility]]
 ==== Compatibility
 
-This output works with all Kafka versions in between 0.11 and 2.0.0. Older versions
+This output works with all Kafka versions in between 0.11 and 2.1.0. Older versions
 might work as well, but are not supported.
 
 ==== Configuration options

diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
@@ -110,7 +110,7 @@ services:
     build:
       context: ./module/kafka/_meta
       args:
-        KAFKA_VERSION: 2.0.0
+        KAFKA_VERSION: 2.1.0
 
   kafka_1_1_0:
     build:

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

diff --git a/metricbeat/module/kafka/_meta/Dockerfile b/metricbeat/module/kafka/_meta/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stretch
 
-ARG KAFKA_VERSION=2.0.0
+ARG KAFKA_VERSION=2.1.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

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.1, 1.1.0 and 2.0.0.
+This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.1.0.
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.0.0
+ENV KAFKA_VERSION 2.1.0
 ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
 ENV TERM=linux
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ The default metricsets are `consumergroup` and `partition`. @@
     [float]
     === Compability
-    This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.0.0.
+    This module is tested with Kafka 0.10.2.1, 1.1.0 and 2.1.0.
     [float]
@@ Expand Down @@