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

Cherry-pick #7133 to 6.3: Keep event when add_docker_metadata fails to extract container id #7156

Merged
merged 2 commits into from
Jun 18, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented May 22, 2018

Cherry-pick of PR #7133 to 6.3 branch. Original message:

Before this change an error extracting container id from the source path
resulted on lossing the log line.

This change ensures we report the error but still send the log lines
through, without enriching.

Fixes #7129

Copy link
Collaborator

@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.

Waiting with merging until 6.3 is out of freeze.

…lastic#7133)

Before this change an error extracting container id from the source path
resulted on lossing the log line.

This change ensures we report the error but still send the log lines
through, without enriching.

(cherry picked from commit c7f3f45)
@exekias exekias force-pushed the backport_7133_6.3 branch from 71cc18a to 64f66c5 Compare June 14, 2018 10:31
@ruflin
Copy link
Collaborator

ruflin commented Jun 15, 2018

jenkins, test this

@ph ph merged commit 88cf4ee into elastic:6.3 Jun 18, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…lastic#7133) (elastic#7156)

Before this change an error extracting container id from the source path
resulted on lossing the log line.

This change ensures we report the error but still send the log lines
through, without enriching.

(cherry picked from commit b1d8542)
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