Skip to content

Conversation

@graphaelli
Copy link
Member

Path of least resistance to get this done. Also attempted to move all of these out of libbeat and into each beat's fields.common.yml but the generated documentation ended up all wrong.

@graphaelli
Copy link
Member Author

@jalvz I expect you're doing one more beats update on 6.x - you will want this in place before doing that, assuming it's acceptable.

@simitt simitt merged commit 02a5147 into elastic:6.x Dec 19, 2018
@jalvz
Copy link
Contributor

jalvz commented Dec 19, 2018

Thanks @graphaelli !
in case this is needed elsewhere, it has been amended here 8d8b859

@graphaelli
Copy link
Member Author

great catch, thanks @jalvz

@graphaelli graphaelli deleted the update-beats-patch branch December 19, 2018 13:05
graphaelli added a commit to graphaelli/apm-server that referenced this pull request Jan 16, 2019
graphaelli added a commit to graphaelli/apm-server that referenced this pull request Jan 16, 2019
graphaelli added a commit that referenced this pull request Jan 16, 2019
* remove APM ECS comptability aliases

* Revert "don't migrate beat.hostname"

This reverts commit 8d8b859.

* Revert "automate conflicting libbeat field removals (#1665)"

This reverts commit 02a5147.

* revert fmt update
graphaelli added a commit to graphaelli/apm-server that referenced this pull request Jan 16, 2019
* remove APM ECS comptability aliases

* Revert "don't migrate beat.hostname"

This reverts commit 8d8b859.

* Revert "automate conflicting libbeat field removals (elastic#1665)"

This reverts commit 02a5147.

* revert fmt update
graphaelli added a commit that referenced this pull request Jan 17, 2019
* remove APM ECS comptability aliases

* Revert "don't migrate beat.hostname"

This reverts commit 8d8b859.

* Revert "automate conflicting libbeat field removals (#1665)"

This reverts commit 02a5147.

* revert fmt update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants