-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
[7.6] Fix Elasticsearch GC logs ingestion from Docker logs (#17164) #17207
Conversation
Pinging @elastic/integrations (Team:Integrations) |
@ycombinator I was under the impression there would not be another 7.6 release. |
@blakerouse That's right. There isn't a 7.6.3 release planned as of now. But things could always change, e.g. a critical bug somewhere in the stack comes up and demands another patch release before 7.7.0 goes out. So we backport bugfixes to the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, understandable. Looks good then!
Failing CI test is totally related.
Will investigate and fix! |
* [Filebeat][elasticsearch] fix JSON lines picked up in gc.logs When used with docker autodiscover, the elasticsearch gc module erroneously picks up JSON formatted line from docker's stdout. Fix by excluding lines that start with `{`. * Adding test files * Adding CHANGELOG entry * Moving test files to correct fileset * Introduce GC log entry in test fixture + golden file * Make sure multiline pattern excludes lines starting with { * Fixing golden file Co-authored-by: Magnus Kessler <[email protected]>
cabe659
to
0e72c98
Compare
Heya @leehinman, I requested your review on this backport PR because it's not a clean backport. I had to exclude certain fields from the expected test file, based on the changes made in #16469 (which weren't backported to 7.6). So I'd like you to double check my exclusions here, if you don't mind. Thanks! |
e124a3e
to
5c25a3c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Jenkins CI failures are unrelated. Merging. |
Backports the following commits to 7.6: