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

Cherry-pick #11247 to 7.0: Don't collect empty ip addresses in docker container metricset #11293

Merged
merged 2 commits into from
Mar 19, 2019
Merged

Cherry-pick #11247 to 7.0: Don't collect empty ip addresses in docker container metricset #11293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8817f
Don't collect empty ip addresses in docker container metricset (#11247)
jsoriano Mar 18, 2019
6691d3a
Fix changelog
jsoriano Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ https://github.com/elastic/beats/compare/v7.0.0-beta1...master[Check the HEAD di

- Fix errors in filebeat Zeek dashboard and README files. Add notice.log support. {pull}10916[10916]
- Fix a bug when converting NetFlow fields to snake_case. {pull}10950[10950]
- Add on_failure handler for Zeek ingest pipelines. Fix one field name error for notice and add an additional test
case. {issue}11004[11004] {pull}11105[11105]
- Add on_failure handler for Zeek ingest pipelines. Fix one field name error for notice and add an additional test case. {issue}11004[11004] {pull}11105[11105]
Copy link
Member

Choose a reason for hiding this comment

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

Seems to be too much in here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

- Fix issue preventing docker container events to be stored if the container has a network interface without ip address. {issue}11225[11225] {pull}11247[11247]
- Change URLPATH grok pattern to support brackets. {issue}11135[11135] {pull}11252[11252]
- Add support for iis log with different address format. {issue}11255[11255] {pull}11256[11256]

Expand Down
4 changes: 3 additions & 1 deletion metricbeat/module/docker/container/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ func eventMapping(r mb.ReporterV2, cont *types.Container, dedot bool) {
func extractIPAddresses(networks *types.SummaryNetworkSettings) []string {
ipAddresses := make([]string, 0, len(networks.Networks))
for _, network := range networks.Networks {
ipAddresses = append(ipAddresses, network.IPAddress)
if len(network.IPAddress) > 0 {
ipAddresses = append(ipAddresses, network.IPAddress)
}
}
return ipAddresses
}