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

docker metadata processor: replace source field with log.field.path #11577

Merged
merged 2 commits into from
Apr 2, 2019
Merged

docker metadata processor: replace source field with log.field.path #11577

merged 2 commits into from
Apr 2, 2019

Conversation

odacremolbap
Copy link
Contributor

@odacremolbap odacremolbap commented Apr 1, 2019 •
edited by exekias
Loading

At libbeat's docker metadata processor:

source field was dismissed recently at filebeat as per #8902
Container ID is being retrieved from log.file.path

Solves #11556

@odacremolbap odacremolbap added bug Filebeat Filebeat libbeat Team:Integrations Label for the Integrations team labels Apr 1, 2019
@odacremolbap odacremolbap requested a review from a team as a code owner April 1, 2019 18:48
@ruflin ruflin added the needs_backport PR is waiting to be backported to other branches. label Apr 2, 2019
ruflin
ruflin reviewed Apr 2, 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.

This needs a changelog entry.

@exekias Could you have a look?

exekias
exekias approved these changes Apr 2, 2019
View reviewed changes
Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

Thank you for taking this!

@odacremolbap
Copy link
Contributor Author

thanks for the reviews!

@ruflin
Is the changelog needed for this? probably this is already covered here:
https://github.com/elastic/beats/pull/8902/files#diff-634e7b38da1fcb3d58e9db4eaa5653f2

I might be wrong but I think there is no user config change needed here for add_docker_metadata (can you confirm @exekias ?)

@odacremolbap odacremolbap self-assigned this Apr 2, 2019
@ruflin
Copy link
Member

ruflin commented Apr 2, 2019

@odacremolbap I think we need a changelog because this fixes a bug which existed in previous 7.0 prerelease versions.

@elasticcla
Copy link

Hi @odacremolbap, we have found your signature in our records, but it seems like you have signed with a different e-mail than the one used in yout Git commit. Can you please add both of these e-mails into your Github profile (they can be hidden), so we can match your e-mails to your Github profile?

@odacremolbap odacremolbap requested review from a team as code owners April 2, 2019 08:48
@odacremolbap odacremolbap merged commit ce68c78 into elastic:master Apr 2, 2019
@odacremolbap odacremolbap mentioned this pull request Apr 2, 2019
Closed
@odacremolbap odacremolbap removed the needs_backport PR is waiting to be backported to other branches. label Apr 2, 2019
@odacremolbap odacremolbap mentioned this pull request Apr 2, 2019
Merged
@odacremolbap odacremolbap deleted the fix/docker-metadata-use-log-file-path branch April 2, 2019 12:46
odacremolbap pushed a commit that referenced this pull request Apr 3, 2019
docker metadata processor: replace source field with log.field.path (#…
337f84f 
…11577) (#11600)

* docker metadata processor: replace source field with log.field.path

(cherry picked from commit ce68c78)
exekias pushed a commit to exekias/beats that referenced this pull request Apr 9, 2019
Update add_docker_metadata
c774f53 
Behavior changed in elastic#11577
@exekias exekias mentioned this pull request Apr 9, 2019
Merged
exekias added a commit that referenced this pull request Apr 9, 2019
@exekias
Update add_docker_metadata (#11717)
bb3f116 
Behavior changed in #11577
exekias added a commit to exekias/beats that referenced this pull request Apr 9, 2019
@exekias
Update add_docker_metadata (elastic#11717)
769db85 
Behavior changed in elastic#11577

(cherry picked from commit bb3f116)
@exekias exekias mentioned this pull request Apr 9, 2019
Merged
exekias added a commit that referenced this pull request Apr 9, 2019
@exekias
Update add_docker_metadata (#11717) (#11718)
8d69f4d 
Behavior changed in #11577

(cherry picked from commit bb3f116)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin left review comments

@exekias exekias exekias approved these changes

Assignees

@odacremolbap odacremolbap

Labels
bug Filebeat Filebeat libbeat Team:Integrations Label for the Integrations team v7.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@odacremolbap @ruflin @elasticcla @exekias