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.

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

Update Kafka versions #17819

Merged
merged 1 commit into from
Apr 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/kafka.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/kafka/_meta/supported-versions.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/broker/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/consumer/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/kafka/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/producer/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testing/environments/docker/kafka/Dockerfile
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.1.1
ENV KAFKA_VERSION 2.2.2
ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
ENV TERM=linux

Expand Down