Migrate docker autodiscovery to ECS#10898
Merged
jsoriano merged 16 commits intoelastic:masterfrom Feb 25, 2019
Merged
Conversation
This was referenced Feb 22, 2019
Contributor
|
@jsoriano Thanks for fixing the selector part! This is tested and works! But the CI failed because
So we just need to document it then :-) |
Member
Author
|
@kaiyan-sheng I have removed the check for jolokia from this PR, lets add these fields in a follow up, at the moment we don't have fields files for autodiscover providers. |
Contributor
|
sounds good to me! Thanks! |
kaiyan-sheng
approved these changes
Feb 25, 2019
Contributor
|
jenkins, test this please |
This was referenced Feb 25, 2019
Member
Author
|
@kaiyan-sheng issue created for Jolokia fields #10925 |
jsoriano
added a commit
to jsoriano/beats
that referenced
this pull request
Feb 25, 2019
Fields injected by docker autodiscover provider were being placed in alias fields introduced for ECS, change them to the new location and add selectors accordingly. This PR includes elastic#10862 and elastic#10758 As a summary: * Autodiscover selectors using ECS structure are added to autodiscover events, old selectors are kept for backwards compatibility * Autodiscover generated metadata follows ECS * Dedotting of labels is added, enabled by default, will be backported for 6.7, but disabled `docker.containers.labels` is not migrated, as it wasn't for `add_docker_metadata` (see elastic#9412) Fixes elastic#10757 Co-Authored-By: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-Authored-By: Nicolas Ruflin <spam@ruflin.com> (cherry picked from commit 1bf8087)
jsoriano
added a commit
that referenced
this pull request
Feb 26, 2019
Partial backport of #10898 to 6.7 Summary of backported changes: * ECS fields are added as autodiscover selectors * Labels dedotting added, disabled by default Co-Authored-By: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>
jsoriano
added a commit
that referenced
this pull request
Feb 27, 2019
Fields injected by docker autodiscover provider were being placed in alias fields introduced for ECS, change them to the new location and add selectors accordingly. This PR includes #10862 and #10758 As a summary: * Autodiscover selectors using ECS structure are added to autodiscover events, old selectors are kept for backwards compatibility * Autodiscover generated metadata follows ECS * Dedotting of labels is added, enabled by default, will be backported for 6.7, but disabled `docker.containers.labels` is not migrated, as it wasn't for `add_docker_metadata` (see #9412) Fixes #10757 (cherry picked from commit 1bf8087) Co-Authored-By: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR includes #10862 and #10758
As a summary:
docker.containers.labelsis not migrated, as it wasn't foradd_docker_metadata(see #9412 (comment))Fixes #10757
Co-Authored-By: kaiyan-sheng kaiyan.sheng@elastic.co
Co-Authored-By: Nicolas Ruflin spam@ruflin.com