Skip to content

Backport #11240 to 7.0: Re-introduce field formats on ECS fields. (#11240)#11241

Merged
webmat merged 1 commit intoelastic:7.0from
webmat:backport_11240_7.0
Mar 14, 2019
Merged

Backport #11240 to 7.0: Re-introduce field formats on ECS fields. (#11240)#11241
webmat merged 1 commit intoelastic:7.0from
webmat:backport_11240_7.0

Conversation

@webmat
Copy link
Copy Markdown
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:43
@webmat webmat self-assigned this Mar 14, 2019
@webmat
Copy link
Copy Markdown
Contributor Author

webmat commented Mar 14, 2019

I'm kicking off this backport early (aka before the original is merged) because the original is trivial. Hopefully this can streamline the fixing of 7.0, if tests are all green here tomorrow morning.

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

webmat commented Mar 14, 2019

Error here is also in the Metricbeat testsuite around elasticsearch:6.6.0. But the errors are very different than on #11240. Will investigate tomorrow.

@webmat
Copy link
Copy Markdown
Contributor Author

webmat commented Mar 14, 2019

jenkins, test this bro

@simitt
Copy link
Copy Markdown
Contributor

simitt commented Mar 14, 2019

Same comment as for #11240, otherwise LGTM.

Copy link
Copy Markdown
Contributor

@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 Will you make the adjustments in this PR or follow up with a second one?

@webmat
Copy link
Copy Markdown
Contributor Author

webmat commented Mar 14, 2019

Yes, waiting to backport #11249 first, then I'll reapply #11240 on top of all that

@webmat webmat force-pushed the backport_11240_7.0 branch from 58892c1 to 6a82a57 Compare March 14, 2019 16:32
@webmat webmat merged commit 7a21bcb into elastic:7.0 Mar 14, 2019
@webmat
Copy link
Copy Markdown
Contributor Author

webmat commented Mar 14, 2019

This is merged @simitt

webmat referenced this pull request Mar 22, 2019
Moved the definition of `agent.hostname` to fields.common.yml
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