Fix race condition when enriching events with Kubernetes metadata (el…

…astic#9067) (cherry picked from commit 936949d)
jsoriano · Nov 14, 2018 · 1daf01c · 1daf01c
1 parent 2f7c62c
commit 1daf01c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -43,6 +43,8 @@ https://github.com/elastic/beats/compare/v6.5.0...6.5[Check the HEAD diff]
 
 *Metricbeat*
 
+- Fix race condition when enriching events with kubernetes metadata. {issue}9055[9055] {issue}9067[9067]
+
 *Packetbeat*
 
 *Winlogbeat*

diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go
@@ -294,6 +294,8 @@ func (m *enricher) Stop() {
 }
 
 func (m *enricher) Enrich(events []common.MapStr) {
+	m.RLock()
+	defer m.RUnlock()
 	for _, event := range events {
 		if meta := m.metadata[m.index(event)]; meta != nil {
 			event.DeepUpdate(common.MapStr{