From 5dac04de88f67632bedf9d843c1319337f5efb73 Mon Sep 17 00:00:00 2001 From: Visha Angelova <91186315+vishaangelova@users.noreply.github.com> Date: Mon, 13 Jul 2026 20:16:58 +0200 Subject: [PATCH] Update `applies_to` version for Kafka input settings (#51862) Updated the `applies_to` versions for `timeout`, `keep_alive`, `session_timeout`, and `heartbeat_interval` settings in the Kafka input documentation as these settings were backported to 9.3. (cherry picked from commit d8845608280a1756c21661d0450d93005bc4d208) # Conflicts: # docs/reference/filebeat/filebeat-input-kafka.md --- docs/reference/filebeat/filebeat-input-kafka.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/reference/filebeat/filebeat-input-kafka.md b/docs/reference/filebeat/filebeat-input-kafka.md index 1f682ac2e0d..99b033003b8 100644 --- a/docs/reference/filebeat/filebeat-input-kafka.md +++ b/docs/reference/filebeat/filebeat-input-kafka.md @@ -98,7 +98,11 @@ How long to wait before retrying a failed read. Default is 2s. ### `timeout` [_timeout_2] ```{applies_to} +<<<<<<< HEAD stack: ga 9.3.8+, ga 9.4.4+, ga 9.5 +======= +stack: ga 9.3+ +>>>>>>> d88456082 (Update `applies_to` version for Kafka input settings (#51862)) ``` The network timeout for the connection to the Kafka brokers, applied to the dial, read, and write deadlines. Increase this for consumers reading across higher-latency links (for example cross-region or WAN), where a large fetch response may not be fully read within the default deadline. Default is 30s. @@ -106,7 +110,11 @@ The network timeout for the connection to the Kafka brokers, applied to the dial ### `keep_alive` [_keep_alive] ```{applies_to} +<<<<<<< HEAD stack: ga 9.3.8+, ga 9.4.4+, ga 9.5 +======= +stack: ga 9.3+ +>>>>>>> d88456082 (Update `applies_to` version for Kafka input settings (#51862)) ``` The keep-alive period for the active network connection to the Kafka brokers. Default is 0s (disabled). @@ -114,7 +122,11 @@ The keep-alive period for the active network connection to the Kafka brokers. De ### `session_timeout` [_session_timeout] ```{applies_to} +<<<<<<< HEAD stack: ga 9.3.8+, ga 9.4.4+, ga 9.5 +======= +stack: ga 9.3+ +>>>>>>> d88456082 (Update `applies_to` version for Kafka input settings (#51862)) ``` The consumer group session timeout. If the broker receives no heartbeat from a consumer within this period, the consumer is removed from the group and a rebalance is triggered. Consumers on higher-latency links may need a larger value to avoid spurious rebalances. Default is 10s. @@ -122,7 +134,11 @@ The consumer group session timeout. If the broker receives no heartbeat from a c ### `heartbeat_interval` [_heartbeat_interval] ```{applies_to} +<<<<<<< HEAD stack: ga 9.3.8+, ga 9.4.4+, ga 9.5 +======= +stack: ga 9.3+ +>>>>>>> d88456082 (Update `applies_to` version for Kafka input settings (#51862)) ``` How often the consumer sends heartbeats to the broker. This must be lower than `session_timeout`, and is typically set to no more than a third of that value. Default is 3s.