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

set default value of kafka version to 2.1.0 #41662

Merged
merged 4 commits into from
Nov 20, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
2 changes: 1 addition & 1 deletion filebeat/docs/inputs/input-kafka.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ The Kafka client id (optional).
[float]
===== `version`

The version of the Kafka protocol to use (defaults to `"1.0.0"`). When using Kafka 4.0 and newer, the version must be set to at least `"2.1.0"`.
The version of the Kafka protocol to use (defaults to `"2.1.0"`). When using Kafka 4.0 and newer, the version must be set to at least `"2.1.0"`.

[float]
===== `initial_offset`
Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/kafka/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion libbeat/outputs/kafka/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion libbeat/outputs/kafka/docs/kafka.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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. When using Kafka 4.0 and newer, the version must be set to at least `"2.1.0"`
Kafka protocol version that {beatname_uc} will request when connecting. Defaults to 2.1.0. When using Kafka 4.0 and newer, the version must be set to at least `"2.1.0"`

Valid values are all kafka releases in between `0.8.2.0` and `2.6.0`.

Expand Down
Loading