Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Kafka 2.1.0 #10440

Merged
merged 3 commits into from
Jan 31, 2019
Merged

Support Kafka 2.1.0 #10440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf1c848
Support Kafka 2.1.0
jsoriano Jan 30, 2019
c8cfc8f
Update docs
jsoriano Jan 30, 2019
33b78d4
Merge remote-tracking branch 'origin/master' into kafka-2-1
jsoriano Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 4 additions & 2 deletions libbeat/common/kafka/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
)

Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/outputconfig.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/kafka.asciidoc
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion testing/environments/docker/kafka/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down