Prepare docker autodiscover in 6.7 for ECS and dedotting#10899
Merged
jsoriano merged 16 commits intoelastic:6.7from Feb 26, 2019
Merged
Prepare docker autodiscover in 6.7 for ECS and dedotting#10899jsoriano merged 16 commits intoelastic:6.7from
jsoriano merged 16 commits intoelastic:6.7from
Conversation
roncohen
reviewed
Feb 25, 2019
| func (d *Provider) emitContainer(event bus.Event, flag string) { | ||
| container, meta := d.generateMetaDocker(event) | ||
| var host string | ||
| if len(container.IPAddresses) > 0 { |
Contributor
There was a problem hiding this comment.
Looks like if the condition here is hit, we'll return nil for container and this line will panic
Member
Author
There was a problem hiding this comment.
Good catch, this also affects 7.0 branch that I already merged 🙁 I will open another PR to fix it in master.
Member
Author
There was a problem hiding this comment.
Fixed here and opened PR for master/7.0 #10928
Contributor
|
thanks for taking this on @jsoriano. |
Member
Author
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
4 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.
Partial backport of #10898 to 6.7
Summary of backported changes:
Co-Authored-By: kaiyan-sheng kaiyan.sheng@elastic.co
Co-Authored-By: Nicolas Ruflin spam@ruflin.com