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

Re-introduce field formats on ECS fields. #11240

Merged
merged 2 commits into from
Mar 14, 2019

Conversation

webmat
Copy link
Contributor

@webmat webmat commented Mar 14, 2019

They were accidentally removed by #11150.

@webmat webmat requested review from a team as code owners March 14, 2019 01:31
@webmat webmat self-assigned this Mar 14, 2019
@webmat webmat added ecs needs_backport PR is waiting to be backported to other branches. labels Mar 14, 2019
@webmat
Copy link
Contributor Author

webmat commented Mar 14, 2019

Since this reintroduces field formats exactly as they were before #11150, I don't think this requires a changelog.

@webmat webmat requested review from ruflin and simitt March 14, 2019 01:46
@webmat
Copy link
Contributor Author

webmat commented Mar 14, 2019

Error seems unrelated, in Metricbeat test suite:

22:20:14 --- FAIL: TestData (2.15s)
22:20:14 	elasticsearch_integration_test.go:109: getting elasticsearch version Get http://elasticsearch:9200/: dial tcp: lookup elasticsearch on 127.0.0.11:53: no such host

127.0.0.11? 😆

@webmat
Copy link
Contributor Author

webmat commented Mar 14, 2019

jenkins, test this

@@ -1807,6 +1813,7 @@
- name: bytes
level: core
type: long
format: bytes
description: Bytes sent from the source to the destination.
example: 184
- name: domain
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, you're right. I'll go add them
🏃

@webmat
Copy link
Contributor Author

webmat commented Mar 14, 2019

Rebased on top of master. I think #11230 fixes the Metricbeat test flakiness

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 c6c6ab9 into elastic:master Mar 14, 2019
webmat added a commit to webmat/beats that referenced this pull request Mar 14, 2019
webmat added a commit that referenced this pull request Mar 14, 2019
webmat referenced this pull request Mar 22, 2019
Moved the definition of `agent.hostname` to fields.common.yml
DStape pushed a commit to DStape/beats that referenced this pull request Aug 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ecs needs_backport PR is waiting to be backported to other branches.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants