From fdec0acc89b872041583ea59debfc67ecce32eae Mon Sep 17 00:00:00 2001
From: Chris Mark <chrismarkou92@gmail.com>
Date: Mon, 19 Apr 2021 16:02:38 +0300
Subject: [PATCH 1/2] Fix bug with annotations dedot config on k8s not used
 (#25111)

(cherry picked from commit 75612012397b2cba882d81f188d9911d3673123d)
---
 CHANGELOG.next.asciidoc                       |  1 +
 .../common/kubernetes/metadata/pod_test.go    | 65 +++++++++++++++++--
 .../common/kubernetes/metadata/resource.go    |  2 +-
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index d5380972f836..e6de3cebfb60 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -120,6 +120,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Periodic metrics in logs will now report `libbeat.output.events.active` and `beat.memstats.rss` as gauges (rather than counters). {pull}22877[22877]
 - Fix inode removal tracking code when files are replaced by files with the same name {pull}25002[25002]
 - Fix `mage GenerateCustomBeat` instructions for a new beat {pull}17679[17679]
+- Fix bug with annotations dedot config on k8s not used {pull}25111[25111]
 - Fix negative Kafka partition bug {pull}25048[25048]
 
 *Auditbeat*
diff --git a/libbeat/common/kubernetes/metadata/pod_test.go b/libbeat/common/kubernetes/metadata/pod_test.go
index a33458504569..a8cd15926284 100644
--- a/libbeat/common/kubernetes/metadata/pod_test.go
+++ b/libbeat/common/kubernetes/metadata/pod_test.go
@@ -241,10 +241,67 @@ func TestPod_Generate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "test object with owner reference to replicaset honors annotations.dedot: false",
+			input: &v1.Pod{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      name,
+					UID:       types.UID(uid),
+					Namespace: namespace,
+					Labels: map[string]string{
+						"foo": "bar",
+					},
+					Annotations: map[string]string{
+						"k8s.app": "production",
+					},
+					OwnerReferences: []metav1.OwnerReference{
+						{
+							APIVersion: "apps",
+							Kind:       "ReplicaSet",
+							Name:       "nginx-rs",
+							UID:        "005f3b90-4b9d-12f8-acf0-31020a8409087",
+							Controller: &boolean,
+						},
+					},
+				},
+				TypeMeta: metav1.TypeMeta{
+					Kind:       "Pod",
+					APIVersion: "v1",
+				},
+				Spec: v1.PodSpec{
+					NodeName: "testnode",
+				},
+				Status: v1.PodStatus{PodIP: "127.0.0.5"},
+			},
+			output: common.MapStr{
+				"pod": common.MapStr{
+					"name": "obj",
+					"uid":  uid,
+					"ip":   "127.0.0.5",
+				},
+				"namespace": "default",
+				"deployment": common.MapStr{
+					"name": "nginx-deployment",
+				},
+				"replicaset": common.MapStr{
+					"name": "nginx-rs",
+				},
+				"node": common.MapStr{
+					"name": "testnode",
+				},
+				"labels": common.MapStr{
+					"foo": "bar",
+				},
+				"annotations": common.MapStr{
+					"k8s": common.MapStr{"app": "production"},
+				},
+			},
+		},
 	}
 
 	config, err := common.NewConfigFrom(map[string]interface{}{
-		"include_annotations": []string{"app"},
+		"include_annotations": []string{"app", "k8s.app"},
+		"annotations.dedot":   false,
 	})
 	assert.Nil(t, err)
 
@@ -277,7 +334,7 @@ func TestPod_GenerateFromName(t *testing.T) {
 						"foo": "bar",
 					},
 					Annotations: map[string]string{
-						"app": "production",
+						"k8s.app": "production",
 					},
 				},
 				TypeMeta: metav1.TypeMeta{
@@ -301,7 +358,7 @@ func TestPod_GenerateFromName(t *testing.T) {
 					"foo": "bar",
 				},
 				"annotations": common.MapStr{
-					"app": "production",
+					"k8s_app": "production",
 				},
 			},
 		},
@@ -360,7 +417,7 @@ func TestPod_GenerateFromName(t *testing.T) {
 
 	for _, test := range tests {
 		config, err := common.NewConfigFrom(map[string]interface{}{
-			"include_annotations": []string{"app"},
+			"include_annotations": []string{"app", "k8s.app"},
 		})
 		assert.Nil(t, err)
 		pods := cache.NewStore(cache.MetaNamespaceKeyFunc)
diff --git a/libbeat/common/kubernetes/metadata/resource.go b/libbeat/common/kubernetes/metadata/resource.go
index 6f280f9a9951..3bff3317f0d9 100644
--- a/libbeat/common/kubernetes/metadata/resource.go
+++ b/libbeat/common/kubernetes/metadata/resource.go
@@ -61,7 +61,7 @@ func (r *Resource) Generate(kind string, obj kubernetes.Resource, options ...Fie
 		labelMap.Delete(label)
 	}
 
-	annotationsMap := generateMapSubset(accessor.GetAnnotations(), r.config.IncludeAnnotations, r.config.LabelsDedot)
+	annotationsMap := generateMapSubset(accessor.GetAnnotations(), r.config.IncludeAnnotations, r.config.AnnotationsDedot)
 
 	meta := common.MapStr{
 		strings.ToLower(kind): common.MapStr{

From 37e0c0559ce619343e434885f1e84b1e49ae2cae Mon Sep 17 00:00:00 2001
From: Chris Mark <chrismarkou92@gmail.com>
Date: Tue, 20 Apr 2021 12:35:17 +0300
Subject: [PATCH 2/2] Update pod_test.go

---
 libbeat/common/kubernetes/metadata/pod_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libbeat/common/kubernetes/metadata/pod_test.go b/libbeat/common/kubernetes/metadata/pod_test.go
index a8cd15926284..c5740cd6f0dc 100644
--- a/libbeat/common/kubernetes/metadata/pod_test.go
+++ b/libbeat/common/kubernetes/metadata/pod_test.go
@@ -277,7 +277,6 @@ func TestPod_Generate(t *testing.T) {
 				"pod": common.MapStr{
 					"name": "obj",
 					"uid":  uid,
-					"ip":   "127.0.0.5",
 				},
 				"namespace": "default",
 				"deployment": common.MapStr{