Fix panic on docker healthcheck collection (elastic#9171)

Fix panic on docker healthcheck collection on dockers without healthchecks. (cherry picked from commit 1c43d6c)
jsoriano · Nov 20, 2018 · e23093e · e23093e
1 parent f49b928
commit e23093e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -43,6 +43,8 @@ https://github.com/elastic/beats/compare/v6.5.1...6.5[Check the HEAD diff]
 
 *Metricbeat*
 
+- Fix panic on docker healthcheck collection on dockers without healthchecks. {pull}9171[9171]
+
 *Packetbeat*
 
 *Winlogbeat*

diff --git a/metricbeat/module/docker/healthcheck/data.go b/metricbeat/module/docker/healthcheck/data.go
@@ -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