Use default configuration in kubernetes metadata enrichers (#17020)

Fix issues caused by dedotting not being enabled by default.
elastic · Mar 16, 2020 · c3c9f34 · c3c9f34
1 parent 1a70200
commit c3c9f34
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -11,6 +11,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 *Affecting all Beats*
 
 - Fix an issue that could cause redundant configuration reloads. {pull}16440[16440]
+- Fix metadata enrichers to use default config for kubernetes module. {pull}17020[17020]
 
 *Auditbeat*
 

diff --git a/libbeat/common/kubernetes/metadata/config.go b/libbeat/common/kubernetes/metadata/config.go
@@ -38,7 +38,7 @@ type AddResourceMetadataConfig struct {
 	Namespace *common.Config `config:"namespace"`
 }
 
-func defaultConfig() Config {
+func DefaultConfig() Config {
 	return Config{
 		IncludeCreatorMetadata: true,
 		LabelsDedot:            true,

diff --git a/libbeat/common/kubernetes/metadata/resource.go b/libbeat/common/kubernetes/metadata/resource.go
@@ -34,7 +34,7 @@ type Resource struct {
 
 // NewResourceMetadataGenerator creates a metadata generator for a generic resource
 func NewResourceMetadataGenerator(cfg *common.Config) *Resource {
-	config := defaultConfig()
+	config := DefaultConfig()
 	config.Unmarshal(cfg)
 
 	return &Resource{

diff --git a/libbeat/common/kubernetes/metadata/resource_test.go b/libbeat/common/kubernetes/metadata/resource_test.go
@@ -109,7 +109,7 @@ func TestResource_Generate(t *testing.T) {
 		},
 	}
 
-	cfg := defaultConfig()
+	cfg := DefaultConfig()
 	metagen := &Resource{
 		config: &cfg,
 	}

diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go
@@ -116,7 +116,7 @@ func NewResourceMetadataEnricher(
 		return &nilEnricher{}
 	}
 
-	metaConfig := metadata.Config{}
+	metaConfig := metadata.DefaultConfig()
 	if err := base.Module().UnpackConfig(&metaConfig); err != nil {
 		logp.Err("Error initializing Kubernetes metadata enricher: %s", err)
 		return &nilEnricher{}
@@ -201,7 +201,7 @@ func NewContainerMetadataEnricher(
 		return &nilEnricher{}
 	}
 
-	metaConfig := metadata.Config{}
+	metaConfig := metadata.DefaultConfig()
 	if err := base.Module().UnpackConfig(&metaConfig); err != nil {
 		logp.Err("Error initializing Kubernetes metadata enricher: %s", err)
 		return &nilEnricher{}