Check existance of rootfields

elastic · Feb 4, 2022 · 0a0a543 · 0a0a543
1 parent 4ca4e6c
commit 0a0a543
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/metricbeat/module/kubernetes/container/container.go b/metricbeat/module/kubernetes/container/container.go
@@ -114,8 +114,14 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) {
 		// Enrich event with container ECS fields
 		containerEcsFields := ecsfields(event)
 		if len(containerEcsFields) != 0 {
-			e.RootFields = common.MapStr{
-				"container": containerEcsFields,
+			if e.RootFields != nil {
+				e.RootFields.DeepUpdate(common.MapStr{
+					"container": containerEcsFields,
+				})
+			} else {
+				e.RootFields = common.MapStr{
+					"container": containerEcsFields,
+				}
 			}
 		}
 

diff --git a/metricbeat/module/kubernetes/pod/pod.go b/metricbeat/module/kubernetes/pod/pod.go
@@ -116,8 +116,16 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) {
 		// Enrich event with container ECS fields
 		containerEcsFields := ecsfields(event)
 		if len(containerEcsFields) != 0 {
-			e.RootFields = common.MapStr{
-				"container": containerEcsFields,
+			if len(containerEcsFields) != 0 {
+				if e.RootFields != nil {
+					e.RootFields.DeepUpdate(common.MapStr{
+						"container": containerEcsFields,
+					})
+				} else {
+					e.RootFields = common.MapStr{
+						"container": containerEcsFields,
+					}
+				}
 			}
 		}