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

Fix panic on docker healthcheck collection #9171

Merged
merged 2 commits into from
Nov 20, 2018
Merged

Fix panic on docker healthcheck collection #9171

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
d99a46e
Fix panic on docker healthcheck collection on dockers without healthc…
jsoriano Nov 20, 2018
c636919
Fix changelog
jsoriano Nov 20, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha1...master[Check the HEAD d
*Metricbeat*

- Fix issue preventing diskio metrics collection for idle disks. {issue}9124[9124] {pull}9125[9125]
- Fix panic on docker healthcheck collection on dockers without healthchecks. {pull}9171[9171]

*Packetbeat*

Expand Down
6 changes: 6 additions & 0 deletions metricbeat/module/docker/healthcheck/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ func eventMapping(cont *types.Container, m *MetricSet) common.MapStr {
logp.Err("Error inspecting container %v: %v", cont.ID, err)
return nil
}

// Check if the container has any health check
if container.State.Health == nil {
return nil
}

lastEvent := len(container.State.Health.Log) - 1

// Checks if a healthcheck already happened
Expand Down