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.

Sign up for GitHub

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

Jump to bottom

Add APM data stream rerouting docs #3730

Merged
merged 8 commits into from
Apr 12, 2024
Merged

Add APM data stream rerouting docs #3730

merged 8 commits into from
Apr 12, 2024

Conversation

carsonip
Copy link
Member

@carsonip carsonip commented Apr 6, 2024 •
edited
Loading

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 6, 2024

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 6, 2024

This pull request does not have a backport label. Could you fix it @carsonip? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-/d./d is the label to automatically backport to the /d./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Apr 6, 2024
@carsonip carsonip added backport-8.12 Automated backport with mergify backport-8.13 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Apr 6, 2024
@carsonip carsonip marked this pull request as ready for review April 8, 2024 08:16
@carsonip carsonip requested a review from a team as a code owner April 8, 2024 08:16
simitt
simitt previously approved these changes Apr 9, 2024
View reviewed changes
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

bmorelli25
bmorelli25 previously approved these changes Apr 10, 2024
View reviewed changes
Copy link
Member

@bmorelli25 bmorelli25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @carsonip!

I pushed a few small changes to better tie this addition in with our existing ingest pipeline content.

@bmorelli25 bmorelli25 enabled auto-merge (squash) April 10, 2024 14:50
carsonip
carsonip commented Apr 10, 2024
View reviewed changes
docs/en/observability/apm/data-streams.asciidoc Outdated

For more about the reroute processor, see {ref}/reroute-processor.html[Reroute processor reference].

For more information about custom ingest pipelines, see <<apm-ingest-pipelines,parse data using ingest pipelines>>.
Copy link
Member Author

@carsonip carsonip Apr 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bmorelli25 thanks! I see that you removed the link to {fleet-guide}/data-streams.html#data-streams-pipelines, which is kind of important in this context, because since 8.12 fleet offers hierarchical ingest pipelines by default e.g. traces-apm@custom, traces-apm.integration@custom which may be useful for reroute usage.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhh okay, good point. I'll take a look after my next meeting and figure out how to add it back in!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I moved the reroute reference link up into the content and re-added the fleet link. Thanks for pointing that out!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks

mdbirnstiehl
mdbirnstiehl approved these changes Apr 10, 2024
View reviewed changes
Copy link
Contributor

@mdbirnstiehl mdbirnstiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐦

@carsonip carsonip merged commit 1c82b46 into elastic:main Apr 12, 2024
3 checks passed
mergify bot pushed a commit that referenced this pull request Apr 12, 2024
@carsonip @mergify
Add APM data stream rerouting docs (#3730)
12bf233 
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
This was referenced Apr 12, 2024
Merged
Merged
mergify bot pushed a commit that referenced this pull request Apr 12, 2024
@carsonip @mergify
Add APM data stream rerouting docs (#3730)
9074a37 
Describe APM data stream rerouting, add links to ES reroute processor, apm ingest pipelines and fleet default ingest pipelines.

(cherry picked from commit 1c82b46)
bmorelli25 pushed a commit that referenced this pull request Apr 15, 2024
@mergify @carsonip
Add APM data stream rerouting docs (#3730) (#3755)
4618507 
Describe APM data stream rerouting, add links to ES reroute processor, apm ingest pipelines and fleet default ingest pipelines.

(cherry picked from commit 1c82b46)

Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
bmorelli25 added a commit that referenced this pull request Apr 16, 2024
@mergify @carsonip @bmorelli25
[8.12](backport #3730) Add APM data stream rerouting docs (#3754)
1ed7de5 
* Add APM data stream rerouting docs (#3730)

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

* Update docs/en/observability/apm/ingest-pipelines.asciidoc

* Update ingest-pipelines.asciidoc

---------

Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmorelli25 bmorelli25 bmorelli25 left review comments

@mdbirnstiehl mdbirnstiehl mdbirnstiehl approved these changes

@simitt simitt simitt left review comments

@colleenmcginnis colleenmcginnis Awaiting requested review from colleenmcginnis

Assignees
No one assigned
Labels
backport-8.12 Automated backport with mergify backport-8.13 Automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Documentation: data stream rerouting
4 participants
@carsonip @simitt @bmorelli25 @mdbirnstiehl