Skip to content

[docs][APM] Update APM/Beats documentation#13596

Merged
bmorelli25 merged 5 commits intoelastic:masterfrom
bmorelli25:logstash-apm-docs
Sep 26, 2019
Merged

[docs][APM] Update APM/Beats documentation#13596
bmorelli25 merged 5 commits intoelastic:masterfrom
bmorelli25:logstash-apm-docs

Conversation

@bmorelli25
Copy link
Member

@bmorelli25 bmorelli25 commented Sep 11, 2019

This PR persists changes made in the following apm-server PRs:

  • This PR can only be merged after Beats switches to Asciidoctor.

@bmorelli25 bmorelli25 self-assigned this Sep 11, 2019
@bmorelli25
Copy link
Member Author

@elasticmachine, run elasticsearch-ci/docs rebuild

@bmorelli25 bmorelli25 changed the title [docs][APM] Update APM documentation [docs][APM] Update APM/Beats documentation Sep 19, 2019
@bmorelli25
Copy link
Member Author

@elasticmachine, run elasticsearch-ci/docs

@bmorelli25
Copy link
Member Author

Woo, ci/docs is green on this one! Ready for a review when you have a moment @dedemorton.

The diff looks good to me -- all changes are expected.

Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

I don't have time to build and test the output, but I trust that you've done a thorough job of that. The changes look good...just one minor thing. I'll approve so you can fix what you want and merge when you're ready.

@bmorelli25 bmorelli25 merged commit 0ae55cd into elastic:master Sep 26, 2019
@bmorelli25 bmorelli25 deleted the logstash-apm-docs branch September 26, 2019 12:53
@bmorelli25
Copy link
Member Author

@dedemorton do you want me to partially backport this? The new Logstash config example would be useful to have in current documentation.

@dedemorton
Copy link
Contributor

@bmorelli25 Sure, go for it!

dedemorton pushed a commit to dedemorton/beats that referenced this pull request Sep 27, 2019
dedemorton added a commit that referenced this pull request Sep 27, 2019
* [docs][APM] Update APM/Beats documentation (#13596)

* Fix region tags

* Switch over local build to use asciidoctor (#13772)

* Switch over local build to use asciidoctor

* Add respect_edit_url_overrides flag
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* [docs][APM] Update APM/Beats documentation (elastic#13596)

* Fix region tags

* Switch over local build to use asciidoctor (elastic#13772)

* Switch over local build to use asciidoctor

* Add respect_edit_url_overrides flag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants