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

[8.12](backport #3730) Add APM data stream rerouting docs #3754

Merged
merged 4 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2024

Closes elastic/apm-server#12375

Feel free to make big changes! Would be helpful to know if it needs better examples / more technical depth etc


This is an automatic backport of pull request #3730 done by [Mergify](https://mergify.com).

Describe APM data stream rerouting, add links to ES reroute processor, apm ingest pipelines and fleet default ingest pipelines.

(cherry picked from commit 1c82b46)

# Conflicts:
#	docs/en/observability/apm/ingest-pipelines.asciidoc
@mergify mergify bot requested a review from a team as a code owner April 12, 2024 10:33
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 12, 2024
Copy link
Contributor Author

mergify bot commented Apr 12, 2024

Cherry-pick of 1c82b46 has failed:

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

You are currently cherry-picking commit 1c82b46d.
  (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/en/observability/apm/data-streams.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/observability/apm/ingest-pipelines.asciidoc

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

@carsonip
Copy link
Member

@bmorelli25 some links are missing apm- prefix on 8.12 branch? Some PRs were missing backports?

Copy link
Contributor Author

mergify bot commented Apr 15, 2024

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

@bmorelli25
Copy link
Member

bmorelli25 commented Apr 15, 2024

@bmorelli25 some links are missing apm- prefix on 8.12 branch? Some PRs were missing backports?

No, we purposely only took that PR back to 8.13 as the 8.12 docs are still in the APM Guide (not Observability Guide) and thus have apm in the URL already.

@bmorelli25 bmorelli25 enabled auto-merge (squash) April 15, 2024 19:12
@bmorelli25 bmorelli25 merged commit 1ed7de5 into 8.12 Apr 16, 2024
3 checks passed
@bmorelli25 bmorelli25 deleted the mergify/bp/8.12/pr-3730 branch April 16, 2024 09:01
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants