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: Update field ref with ECS icon #4272

Merged
merged 7 commits into from
Oct 7, 2020

Conversation

bmorelli25
Copy link
Member

@bmorelli25 bmorelli25 commented Oct 6, 2020

Motivation/summary

I updated generate_fields_docs.py in elastic/beats#21359 to include an ECS icon next to ECS fields in the field reference documentation. This PR makes use of that new script to create APM Server's field reference:

Unfortunately, I can't get make update to make use of that change. I still have to use a local clone of Beats to get things to work:

go mod edit -replace=github.com/elastic/beats/v7=../beats

Is this because APM Server needs to update to a later version of Beats before we can make use of this change? If so, does it make more sense to wait on this PR until after that happens?

Related issues

Closes elastic/apm#276.
Relates to elastic/beats#20729.

@bmorelli25 bmorelli25 requested a review from a team October 6, 2020 23:45
@bmorelli25 bmorelli25 self-assigned this Oct 6, 2020
@apmmachine
Copy link
Contributor

apmmachine commented Oct 6, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #4272 updated]

  • Start Time: 2020-10-07T14:12:47.205+0000

  • Duration: 3 min 13 sec

@graphaelli
Copy link
Member

Is this because APM Server needs to update to a later version of Beats before we can make use of this change? If so, does it make more sense to wait on this PR until after that happens?

Sounds right. You could bundle a make update-beats with this pr to test the theory.

@bmorelli25
Copy link
Member Author

Sounds right. You could bundle a make update-beats with this pr to test the theory.

Neat, thanks. That worked!

Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

Nice, I like it!

@bmorelli25
Copy link
Member Author

It looks like Beats has been updated twice since last night: First in #4266, and then again in #4267. I will remove that from this PR.

@bmorelli25 bmorelli25 merged commit 7cceb88 into elastic:master Oct 7, 2020
@bmorelli25 bmorelli25 deleted the ecs-docs-update branch October 7, 2020 14:44
bmorelli25 added a commit to bmorelli25/apm-server that referenced this pull request Oct 7, 2020
bmorelli25 added a commit to bmorelli25/apm-server that referenced this pull request Oct 7, 2020
# Conflicts:
#	docs/fields.asciidoc
bmorelli25 added a commit to bmorelli25/apm-server that referenced this pull request Oct 7, 2020
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.

[Docs] Fix positioning of ECS fields in the documents
5 participants