Revert change about container.name and keep only the one about image.…

…name Signed-off-by: chrismark <chrismarkou92@gmail.com>
elastic · Mar 10, 2021 · 95c5ae9 · 95c5ae9
1 parent e11ea81
commit 95c5ae9
Show file tree

Hide file tree

Showing 25 changed files with 413 additions and 423 deletions.
diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc
@@ -11970,12 +11970,10 @@ type: keyword
 *`kubernetes.container.name`*::
 +
 --
-Kubernetes container name
+Kubernetes container name (different than the name from the runtime)
 
 
-type: alias
-
-alias to: container.name
+type: keyword
 
 --
 

diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go
diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
@@ -86569,12 +86569,10 @@ type: keyword
 *`kubernetes.container.name`*::
 +
 --
-Kubernetes container name
+Kubernetes container name (different than the name from the runtime)
 
 
-type: alias
-
-alias to: container.name
+type: keyword
 
 --
 

diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -9552,12 +9552,10 @@ type: keyword
 *`kubernetes.container.name`*::
 +
 --
-Kubernetes container name
+Kubernetes container name (different than the name from the runtime)
 
 
-type: alias
-
-alias to: container.name
+type: keyword
 
 --
 

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/journalbeat/docs/fields.asciidoc b/journalbeat/docs/fields.asciidoc
@@ -9897,12 +9897,10 @@ type: keyword
 *`kubernetes.container.name`*::
 +
 --
-Kubernetes container name
+Kubernetes container name (different than the name from the runtime)
 
 
-type: alias
-
-alias to: container.name
+type: keyword
 
 --
 

diff --git a/journalbeat/include/fields.go b/journalbeat/include/fields.go
diff --git a/libbeat/autodiscover/providers/kubernetes/pod.go b/libbeat/autodiscover/providers/kubernetes/pod.go
@@ -349,15 +349,14 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 		// so it works also on `stop` if containers have been already deleted.
 		eventID := fmt.Sprintf("%s.%s", pod.GetObjectMeta().GetUID(), c.Name)
 
-		meta := p.metagen.Generate(pod)
+		meta := p.metagen.Generate(pod, metadata.WithFields("container.name", c.Name))
 
 		cmeta := common.MapStr{
 			"id":      cid,
 			"runtime": runtimes[c.Name],
 			"image": common.MapStr{
 				"name": c.Image,
 			},
-			"name": c.Name,
 		}
 
 		// Information that can be used in discovering a workload
@@ -386,7 +385,7 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 				"kubernetes": kubemeta,
 				//Actual metadata that will enrich the event
 				"meta": common.MapStr{
-					"kubernetes": meta, // these will be moved to ECS (container.name and container.image.name) through alias type
+					"kubernetes": meta,
 					"container":  cmeta,
 				},
 			}

diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go
@@ -451,13 +451,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar",
 							"runtime": "docker",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -573,13 +574,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"runtime": "docker",
 							"id":      "foobar",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -615,13 +617,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar",
 							"runtime": "docker",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -783,13 +786,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"runtime": "",
 							"id":      "",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -888,13 +892,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "",
 							"runtime": "",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -993,13 +998,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"runtime": "",
 							"id":      "",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -1102,13 +1108,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar",
 							"runtime": "docker",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -1213,13 +1220,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar",
 							"runtime": "docker",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -1356,13 +1364,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar",
 							"runtime": "docker",
-							"name":    "filebeat",
 						},
 					},
 					"config": []*common.Config{},
@@ -1399,13 +1408,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat-init",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar-init",
 							"runtime": "docker",
-							"name":    "filebeat-init",
 						},
 					},
 					"config": []*common.Config{},
@@ -1442,13 +1452,14 @@ func TestEmitEvent(t *testing.T) {
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
 							}, "node": common.MapStr{
 								"name": "node",
+							}, "container": common.MapStr{
+								"name": "filebeat-ephemeral",
 							},
 						},
 						"container": common.MapStr{
 							"image":   common.MapStr{"name": "elastic/filebeat:6.3.0"},
 							"id":      "foobar-ephemeral",
 							"runtime": "docker",
-							"name":    "filebeat-ephemeral",
 						},
 					},
 					"config": []*common.Config{},

diff --git a/libbeat/processors/add_kubernetes_metadata/_meta/fields.yml b/libbeat/processors/add_kubernetes_metadata/_meta/fields.yml
@@ -70,10 +70,9 @@
             Kubernetes statefulset name
 
         - name: container.name
-          type: alias
-          path: container.name
+          type: keyword
           description: >
-            Kubernetes container name
+            Kubernetes container name (different than the name from the runtime)
 
         - name: container.image
           type: alias

diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go
@@ -257,7 +257,8 @@ func (k *kubernetesAnnotator) Run(event *beat.Event) (*beat.Event, error) {
 	}
 
 	metaClone := metadata.Clone()
-	containerImage, err := metaClone.GetValue("container.image")
+	metaClone.Delete("container.name")
+	containerImage, err := metadata.GetValue("container.image")
 	if err == nil {
 		metaClone.Delete("container.image")
 		metaClone.Put("container.image.name", containerImage)
@@ -271,7 +272,9 @@ func (k *kubernetesAnnotator) Run(event *beat.Event) (*beat.Event, error) {
 
 	kubeMeta := metadata.Clone()
 	// remove container meta from kubernetes.container.*
-	kubeMeta.Delete("container")
+	kubeMeta.Delete("container.id")
+	kubeMeta.Delete("container.runtime")
+	kubeMeta.Delete("container.image")
 	event.Fields.DeepUpdate(common.MapStr{
 		"kubernetes": kubeMeta,
 	})

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -27465,12 +27465,10 @@ type: keyword
 *`kubernetes.container.name`*::
 +
 --
-Kubernetes container name
+Kubernetes container name (different than the name from the runtime)
 
 
-type: alias
-
-alias to: container.name
+type: keyword
 
 --
 

diff --git a/metricbeat/module/kubernetes/state_container/_meta/data.json b/metricbeat/module/kubernetes/state_container/_meta/data.json
@@ -13,6 +13,7 @@
       "app": "playground"
     },
     "container": {
+      "name": "ubuntu",
       "cpu": {
         "request": {
           "nanocores": 200000000
@@ -64,7 +65,6 @@
     "image": {
       "name": "ubuntu:latest"
     },
-    "name": "ubuntu"
   },
   "event": {
     "dataset": "kubernetes.container",