Move uid back to pod.uid

elastic · Jul 10, 2018 · b6d8f76 · b6d8f76
1 parent 18d509f
commit b6d8f76
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/libbeat/common/kubernetes/metadata.go b/libbeat/common/kubernetes/metadata.go
@@ -43,7 +43,7 @@ type MetaGeneratorConfig struct {
 	IncludeAnnotations []string `config:"include_annotations"`
 
 	// Undocumented settings, to be deprecated in favor of `drop_fields` processor:
-	IncludeUID             bool `config:"include_uid"`
+	IncludePodUID          bool `config:"include_pod_uid"`
 	IncludeCreatorMetadata bool `config:"include_creator_metadata"`
 }
 
@@ -88,11 +88,6 @@ func (g *metaGenerator) ResourceMetadata(obj Resource) common.MapStr {
 		meta["namespace"] = objMeta.GetNamespace()
 	}
 
-	// Add UID metadata if enabled
-	if g.IncludeUID {
-		meta["uid"] = objMeta.GetUid()
-	}
-
 	// Add controller metadata if present
 	if g.IncludeCreatorMetadata {
 		for _, ref := range objMeta.OwnerReferences {
@@ -123,6 +118,11 @@ func (g *metaGenerator) ResourceMetadata(obj Resource) common.MapStr {
 func (g *metaGenerator) PodMetadata(pod *Pod) common.MapStr {
 	podMeta := g.ResourceMetadata(pod)
 
+	// Add UID metadata if enabled
+	if g.IncludePodUID {
+		safemapstr.Put(podMeta, "pod.uid", pod.GetMetadata().GetUid())
+	}
+
 	safemapstr.Put(podMeta, "pod.name", pod.GetMetadata().GetName())
 	safemapstr.Put(podMeta, "node.name", pod.Spec.GetNodeName())
 

diff --git a/libbeat/common/kubernetes/metadata_test.go b/libbeat/common/kubernetes/metadata_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 func TestPodMetadataDeDot(t *testing.T) {
-	withUID, _ := common.NewConfigFrom(map[string]interface{}{"include_uid": true})
+	withUID, _ := common.NewConfigFrom(map[string]interface{}{"include_pod_uid": true})
 
 	UID := "005f3b90-4b9d-12f8-acf0-31020a840133"
 	Deployment := "Deployment"
@@ -71,8 +71,10 @@ func TestPodMetadataDeDot(t *testing.T) {
 				},
 			},
 			meta: common.MapStr{
-				"pod":    common.MapStr{"name": ""},
-				"uid":    "005f3b90-4b9d-12f8-acf0-31020a840133",
+				"pod": common.MapStr{
+					"name": "",
+					"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+				},
 				"node":   common.MapStr{"name": "test"},
 				"labels": common.MapStr{"a": common.MapStr{"value": "bar", "key": "foo"}},
 			},

diff --git a/libbeat/processors/add_kubernetes_metadata/_meta/fields.yml b/libbeat/processors/add_kubernetes_metadata/_meta/fields.yml
@@ -13,10 +13,10 @@
           description: >
             Kubernetes pod name
 
-        - name: uid
+        - name: pod.uid
           type: keyword
           description: >
-            Kubernetes uid
+            Kubernetes Pod UID
 
         - name: namespace
           type: keyword

diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go
@@ -102,7 +102,12 @@ func NewResourceMetadataEnricher(
 		// update
 		func(m map[string]common.MapStr, r kubernetes.Resource) {
 			id := join(r.GetMetadata().GetNamespace(), r.GetMetadata().GetName())
-			m[id] = metaGen.ResourceMetadata(r)
+			switch r := r.(type) {
+			case *kubernetes.Pod:
+				m[id] = metaGen.PodMetadata(r)
+			default:
+				m[id] = metaGen.ResourceMetadata(r)
+			}
 		},
 		// delete
 		func(m map[string]common.MapStr, r kubernetes.Resource) {
@@ -145,7 +150,7 @@ func NewContainerMetadataEnricher(
 		// update
 		func(m map[string]common.MapStr, r kubernetes.Resource) {
 			pod := r.(*kubernetes.Pod)
-			meta := metaGen.ResourceMetadata(r)
+			meta := metaGen.PodMetadata(pod)
 			for _, container := range append(pod.GetSpec().GetContainers(), pod.GetSpec().GetInitContainers()...) {
 				id := join(r.GetMetadata().GetNamespace(), r.GetMetadata().GetName(), container.GetName())
 				m[id] = meta