From 47b27d7d3cde30048cd2f07ce01b88d811ab7b27 Mon Sep 17 00:00:00 2001 From: Khushi Jain Date: Mon, 18 Nov 2024 17:52:26 +0530 Subject: [PATCH 1/3] set default value of kafka version to 2.1.0 --- filebeat/docs/inputs/input-kafka.asciidoc | 2 +- filebeat/input/kafka/config.go | 2 +- libbeat/outputs/kafka/docs/kafka.asciidoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/filebeat/docs/inputs/input-kafka.asciidoc b/filebeat/docs/inputs/input-kafka.asciidoc index ee0cd7842a46..9f6382a99a9b 100644 --- a/filebeat/docs/inputs/input-kafka.asciidoc +++ b/filebeat/docs/inputs/input-kafka.asciidoc @@ -89,7 +89,7 @@ The Kafka client id (optional). [float] ===== `version` -The version of the Kafka protocol to use (defaults to `"1.0.0"`). +The version of the Kafka protocol to use (defaults to `"2.1.0"`). [float] ===== `initial_offset` diff --git a/filebeat/input/kafka/config.go b/filebeat/input/kafka/config.go index 107d765344ba..9d085af27d2e 100644 --- a/filebeat/input/kafka/config.go +++ b/filebeat/input/kafka/config.go @@ -110,7 +110,7 @@ var ( // were chosen to match sarama's defaults. func defaultConfig() kafkaInputConfig { return kafkaInputConfig{ - Version: kafka.Version("1.0.0"), + Version: kafka.Version("2.1.0"), InitialOffset: initialOffsetOldest, ClientID: "filebeat", ConnectBackoff: 30 * time.Second, diff --git a/libbeat/outputs/kafka/docs/kafka.asciidoc b/libbeat/outputs/kafka/docs/kafka.asciidoc index 9907cad61c29..abc93d0d91f0 100644 --- a/libbeat/outputs/kafka/docs/kafka.asciidoc +++ b/libbeat/outputs/kafka/docs/kafka.asciidoc @@ -69,7 +69,7 @@ The cluster metadata contain the actual Kafka brokers events are published to. ===== `version` -Kafka protocol version that {beatname_uc} will request when connecting. Defaults to 1.0.0. +Kafka protocol version that {beatname_uc} will request when connecting. Defaults to 2.1.0. Valid values are all kafka releases in between `0.8.2.0` and `2.6.0`. From f564486f74dbbc08558e296953b931620adbddee Mon Sep 17 00:00:00 2001 From: Khushi Jain Date: Mon, 18 Nov 2024 18:02:19 +0530 Subject: [PATCH 2/3] update default versin in o/p --- libbeat/outputs/kafka/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/outputs/kafka/config.go b/libbeat/outputs/kafka/config.go index c7dc74ee9934..4bdd63d59c50 100644 --- a/libbeat/outputs/kafka/config.go +++ b/libbeat/outputs/kafka/config.go @@ -136,7 +136,7 @@ func defaultConfig() kafkaConfig { BrokerTimeout: 10 * time.Second, Compression: "gzip", CompressionLevel: 4, - Version: kafka.Version("1.0.0"), + Version: kafka.Version("2.1.0"), MaxRetries: 3, Headers: nil, Backoff: backoffConfig{ From acad5601b53ee2a9c97d1f4c95981f77c27a7f96 Mon Sep 17 00:00:00 2001 From: Khushi Jain Date: Mon, 18 Nov 2024 18:31:00 +0530 Subject: [PATCH 3/3] add changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index d0631f156b0f..a1c68ba76cd0 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -16,6 +16,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Beats will rate limit the logs about errors when indexing events on Elasticsearch, logging a summary every 10s. The logs sent to the event log is unchanged. {issue}40157[40157] - Drop support for Debian 10 and upgrade statically linked glibc from 2.28 to 2.31 {pull}41402[41402] - Fix metrics not being ingested, due to "Limit of total fields [10000] has been exceeded while adding new fields [...]". The total fields limit has been increased to 12500. No significant performance impact on Elasticsearch is anticipated. {pull}41640[41640] +- Set default kafka version to 2.1.0 in kafka output and filebeat. {pull}41662[41662] *Auditbeat*