Remove dedoting for now

Signed-off-by: chrismark <chrismarkou92@gmail.com>
elastic · Jul 22, 2021 · 701236c · 701236c
1 parent d42013f
commit 701236c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 51 deletions.
diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/config.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/config.go
@@ -25,9 +25,6 @@ type Config struct {
 
 	// Needed when resource is a Pod or Node
 	Node string `config:"node"`
-
-	LabelsDedot      bool `config:"labels.dedot"`
-	AnnotationsDedot bool `config:"annotations.dedot"`
 }
 
 // Resources config section for resources' config blocks
@@ -47,8 +44,6 @@ func (c *Config) InitDefaults() {
 	c.CleanupTimeout = 60 * time.Second
 	c.SyncPeriod = 10 * time.Minute
 	c.Scope = "node"
-	c.LabelsDedot = true
-	c.AnnotationsDedot = true
 }
 
 // Validate ensures correctness of config

diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/node.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/node.go
@@ -183,22 +183,13 @@ func generateNodeData(node *kubernetes.Node, cfg *Config) *nodeData {
 	// Pass annotations to all events so that it can be used in templating and by annotation builders.
 	annotations := common.MapStr{}
 	for k, v := range node.GetObjectMeta().GetAnnotations() {
-		if cfg.AnnotationsDedot {
-			annotation := common.DeDot(k)
-			annotations.Put(annotation, v)
-		} else {
-			safemapstr.Put(annotations, k, v)
-		}
+		safemapstr.Put(annotations, k, v)
 	}
 
 	labels := common.MapStr{}
 	for k, v := range node.GetObjectMeta().GetLabels() {
-		if cfg.LabelsDedot {
-			label := common.DeDot(k)
-			labels.Put(label, v)
-		} else {
-			safemapstr.Put(labels, k, v)
-		}
+		// TODO: add dedoting option
+		safemapstr.Put(labels, k, v)
 	}
 
 	mapping := map[string]interface{}{

diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/node_test.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/node_test.go
@@ -41,7 +41,7 @@ func TestGenerateNodeData(t *testing.T) {
 		},
 	}
 
-	data := generateNodeData(node, &Config{LabelsDedot: true, AnnotationsDedot: true})
+	data := generateNodeData(node, &Config{})
 
 	mapping := map[string]interface{}{
 		"node": map[string]interface{}{

diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod.go
@@ -129,22 +129,13 @@ func generatePodData(pod *kubernetes.Pod, cfg *Config) providerData {
 	// Pass annotations to all events so that it can be used in templating and by annotation builders.
 	annotations := common.MapStr{}
 	for k, v := range pod.GetObjectMeta().GetAnnotations() {
-		if cfg.AnnotationsDedot {
-			annotation := common.DeDot(k)
-			annotations.Put(annotation, v)
-		} else {
-			safemapstr.Put(annotations, k, v)
-		}
+		safemapstr.Put(annotations, k, v)
 	}
 
 	labels := common.MapStr{}
 	for k, v := range pod.GetObjectMeta().GetLabels() {
-		if cfg.LabelsDedot {
-			label := common.DeDot(k)
-			labels.Put(label, v)
-		} else {
-			safemapstr.Put(labels, k, v)
-		}
+		// TODO: add dedoting option
+		safemapstr.Put(labels, k, v)
 	}
 
 	mapping := map[string]interface{}{
@@ -189,12 +180,7 @@ func generateContainerData(
 
 	labels := common.MapStr{}
 	for k, v := range pod.GetObjectMeta().GetLabels() {
-		if cfg.LabelsDedot {
-			label := common.DeDot(k)
-			labels.Put(label, v)
-		} else {
-			safemapstr.Put(labels, k, v)
-		}
+		safemapstr.Put(labels, k, v)
 	}
 
 	for _, c := range containers {

diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod_test.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod_test.go
@@ -44,7 +44,7 @@ func TestGeneratePodData(t *testing.T) {
 		Status: kubernetes.PodStatus{PodIP: "127.0.0.5"},
 	}
 
-	data := generatePodData(pod, &Config{LabelsDedot: true, AnnotationsDedot: true})
+	data := generatePodData(pod, &Config{})
 
 	mapping := map[string]interface{}{
 		"namespace": pod.GetNamespace(),
@@ -129,7 +129,7 @@ func TestGenerateContainerPodData(t *testing.T) {
 		pod,
 		containers,
 		containerStatuses,
-		&Config{LabelsDedot: true, AnnotationsDedot: true})
+		&Config{})
 
 	mapping := map[string]interface{}{
 		"namespace": pod.GetNamespace(),

diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/service.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/service.go
@@ -105,22 +105,13 @@ func generateServiceData(service *kubernetes.Service, cfg *Config) *serviceData
 	// Pass annotations to all events so that it can be used in templating and by annotation builders.
 	annotations := common.MapStr{}
 	for k, v := range service.GetObjectMeta().GetAnnotations() {
-		if cfg.AnnotationsDedot {
-			annotation := common.DeDot(k)
-			annotations.Put(annotation, v)
-		} else {
-			safemapstr.Put(annotations, k, v)
-		}
+		safemapstr.Put(annotations, k, v)
 	}
 
 	labels := common.MapStr{}
 	for k, v := range service.GetObjectMeta().GetLabels() {
-		if cfg.LabelsDedot {
-			label := common.DeDot(k)
-			labels.Put(label, v)
-		} else {
-			safemapstr.Put(labels, k, v)
-		}
+		// TODO: add dedoting option
+		safemapstr.Put(labels, k, v)
 	}
 
 	mapping := map[string]interface{}{

diff --git a/x-pack/elastic-agent/pkg/composable/providers/kubernetes/service_test.go b/x-pack/elastic-agent/pkg/composable/providers/kubernetes/service_test.go
@@ -45,7 +45,7 @@ func TestGenerateServiceData(t *testing.T) {
 		},
 	}
 
-	data := generateServiceData(service, &Config{LabelsDedot: true, AnnotationsDedot: true})
+	data := generateServiceData(service, &Config{})
 
 	mapping := map[string]interface{}{
 		"service": map[string]interface{}{