Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2025

What does this PR do?

Adds notes on Collector config compatibility for Elastic Stack versions.

Why is it important?

Incompatible Collector 9.x configs can be breaking changes for ELK 8.x users.

Related: elastic/opentelemetry#495


This is an automatic backport of pull request #11328 done by Mergify.

(cherry picked from commit 319e0f5)

# Conflicts:
#	docs/reference/edot-collector/config/default-config-standalone.md
@mergify mergify bot added the backport label Nov 24, 2025
@mergify mergify bot requested a review from a team as a code owner November 24, 2025 08:35
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Nov 24, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 24, 2025

Cherry-pick of 319e0f5 has failed:

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

You are currently cherry-picking commit 319e0f566.
  (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)

Changes to be committed:
	modified:   docs/reference/edot-collector/components.md
	modified:   docs/reference/edot-collector/config/default-config-k8s.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/reference/edot-collector/config/default-config-standalone.md

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
Copy link
Contributor Author

mergify bot commented Nov 24, 2025

This pull request has not been merged yet. Could you please review and merge it @theletterf? 🙏

@github-actions
Copy link
Contributor

github-actions bot commented Nov 24, 2025

@theletterf theletterf merged commit c94a2c7 into 9.2 Nov 24, 2025
12 checks passed
@theletterf theletterf deleted the mergify/bp/9.2/pr-11328 branch November 24, 2025 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request docs skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants