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

Define field formats that were defined in Beats but not yet in ECS. #385

Merged
merged 3 commits into from
Mar 15, 2019
Merged

Define field formats that were defined in Beats but not yet in ECS. #385

merged 3 commits into from
Mar 15, 2019

Conversation

webmat
Copy link
Contributor

@webmat webmat commented Mar 14, 2019 •
edited
Loading

The 1.0.0 field definitions generated by ECS (elastic/beats#11150)
removed a few field formats that had previously been defined on the Beats side,
but were not yet part of ECS.

This adds all of the missing these fields formats to ECS, and generates a Beats
field definition file that includes them all.

@webmat webmat self-assigned this Mar 14, 2019
@webmat
Copy link
Contributor Author

webmat commented Mar 14, 2019

@ruflin I don't think we should backport this to the 1.0 branch, as it wasn't part of ECS at the time we cut the 1.0.0 release. So this would officially be part of ECS as of 1.1.

I will however generate the file for Beats, in order to fix this issue for Beats 7.0.

cc @simitt

@webmat webmat requested a review from ruflin March 14, 2019 01:46
ruflin
ruflin approved these changes Mar 15, 2019
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

@webmat webmat merged commit 7d740e3 into elastic:master Mar 15, 2019
webmat referenced this pull request in elastic/beats Mar 22, 2019
@webmat
Import fields.ecs.yml as generated by the ECS repo (#11150)
c33cb27 
Moved the definition of `agent.hostname` to fields.common.yml
webmat pushed a commit to webmat/ecs that referenced this pull request May 24, 2019
Add secondary PR to a changelog entry.
4c464c4 
Initial PR elastic#385 was tweaked by elastic#425. But only elastic#425 was backported to 1.0.
webmat added a commit to webmat/ecs that referenced this pull request May 24, 2019
@webmat
Define field formats that were defined in Beats but not yet in ECS. (e…
5e2a67e 
…lastic#385)
@webmat webmat mentioned this pull request May 24, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin approved these changes

Assignees

@webmat webmat

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@webmat @ruflin