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

[docs] Documentation updates from APM #15835

Merged
merged 4 commits into from
Feb 4, 2020

Conversation

bmorelli25
Copy link
Member

@bmorelli25 bmorelli25 commented Jan 24, 2020

This PR updates libbeat documentation for APM. Specifically:

HTML DIFF

@bmorelli25
Copy link
Member Author

DeDe is out this week, and I'd like to get this merged so I can run the Beats docs script with fewer conflicts. Adding @andresrc, in case you have time to take a peek at this.

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.

LGTM

@bmorelli25 bmorelli25 merged commit d017df5 into elastic:master Feb 4, 2020
@bmorelli25 bmorelli25 deleted the apm-updates branch February 4, 2020 20:55
@ycombinator
Copy link
Contributor

@bmorelli25 @dedemorton Should this be backported to 7.x and 7.7 branches?

@bmorelli25
Copy link
Member Author

@ycombinator. We don't backport APM changes, but it looks like I included some general beats changes (API keys docs) in the PR as well... so yes, you're right, this should be backported. Thank you for the heads-up! Will do right now.

bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Apr 2, 2020
# Conflicts:
#	libbeat/docs/shared-systemd.asciidoc
#	libbeat/docs/template-config.asciidoc
bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Apr 2, 2020
# Conflicts:
#	libbeat/docs/shared-systemd.asciidoc
#	libbeat/docs/template-config.asciidoc
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants