Skip to content

[9.4](backport #51862) Docs: Update applies_to version for Kafka input settings#51907

Merged
vishaangelova merged 4 commits into
9.4from
mergify/bp/9.4/pr-51862
Jul 15, 2026
Merged

[9.4](backport #51862) Docs: Update applies_to version for Kafka input settings#51907
vishaangelova merged 4 commits into
9.4from
mergify/bp/9.4/pr-51862

Conversation

@mergify

@mergify mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Updated the applies_to versions for timeout, keep_alive, session_timeout, and heartbeat_interval settings (added in #51173) in the Kafka input documentation as these settings were backported to 9.4 (#51769) and 9.3 (#51770).

Docs

Proposed commit message

This PR updates the applies_to version for timeout, keep_alive, session_timeout, and heartbeat_interval settings in the Kafka input documentation as these settings were backported to 9.3.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works. Where relevant, I have used the stresstest.sh script to run them under stress conditions and race detector to verify their stability.
  • I have added an entry in ./changelog/fragments using the changelog tool.
This is an automatic backport of pull request #51862 done by [Mergify](https://mergify.com).

@vishaangelova @mergify
Update applies_to version for Kafka input settings (#51862)
ef5aeaa 
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 d884560)

# Conflicts:
#	docs/reference/filebeat/filebeat-input-kafka.md
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 13, 2026
@mergify mergify Bot requested a review from a team as a code owner July 13, 2026 18:19
@mergify mergify Bot added the backport label Jul 13, 2026
@mergify

mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of d884560 has failed:

On branch mergify/bp/9.4/pr-51862
Your branch is up to date with 'origin/9.4'.

You are currently cherry-picking commit d88456082.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/reference/filebeat/filebeat-input-kafka.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 13, 2026
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 13, 2026
@botelastic

botelastic Bot commented Jul 13, 2026

Copy link
Copy Markdown

This pull request doesn't have a Team:<team> label.

@github-actions

github-actions Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • /test : Run the Buildkite pipeline.

@mergify mergify Bot mentioned this pull request Jul 13, 2026
Merged
6 tasks
@github-actions

github-actions Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

TL;DR

The pre-commit check failed because unresolved merge-conflict markers remain in docs/reference/filebeat/filebeat-input-kafka.md. Resolve the conflict in that file, remove all <<<<<<<, =======, and >>>>>>> markers, then push the corrected commit and rerun the checks.

Remediation

  • Resolve the conflicting Kafka documentation sections in docs/reference/filebeat/filebeat-input-kafka.md, preserving the intended applies_to updates for timeout, keep_alive, session_timeout, and heartbeat_interval.
  • Run pre-commit run --show-diff-on-failure --from-ref <base> --to-ref <head> (or the repository’s equivalent pre-commit check) and confirm it passes before rerunning CI.
Investigation details

Root Cause

The pre-commit workflow’s check-merge-conflict hook detected unresolved Git conflict markers introduced while resolving the backport conflict.

Evidence

  • Workflow: https://github.com/elastic/beats/actions/runs/29403973212
  • Job/step: pre-commit / Run elastic/oblt-actions/pre-commit@v1
  • Key log excerpt: docs/reference/filebeat/filebeat-input-kafka.md:101 and :113 report Merge conflict string u003cu003cu003cu003cu003cu003c, =======, and >>>>>>> found; the hook exits with code 1.

Validation

  • Not run locally; this was a read-only CI log analysis.

Follow-up

  • The PR’s earlier conflict-resolution comment identifies the same file as conflicted during cherry-pick; after resolving it, rerun the failed workflow.

What is this? | From workflow: PR Actions Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@github-actions

github-actions Bot commented Jul 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🔍 Preview links for changed docs

@github-actions

github-actions Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

✅ Elastic Docs Style Checker (Vale)

No issues found on modified lines!

The Vale linter checks documentation changes against the Elastic Docs style guide. To use Vale locally or report issues, refer to Elastic style guide for Vale.

@mergify

mergify Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@vishaangelova vishaangelova merged commit 607b6ca into 9.4 Jul 15, 2026
13 checks passed
@vishaangelova vishaangelova deleted the mergify/bp/9.4/pr-51862 branch July 15, 2026 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vishaangelova vishaangelova vishaangelova approved these changes

Assignees

@vishaangelova vishaangelova

Labels

backport conflicts There is a conflict in the backported pull request docs needs_team Indicates that the issue/PR needs a Team:* label skip-changelog

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@vishaangelova