From ef84c87046724c604fed1cead1120241d7f640e0 Mon Sep 17 00:00:00 2001 From: Peter Deng Date: Tue, 19 Oct 2021 13:01:27 +0800 Subject: [PATCH 1/6] allows disable pod events enrichment with deployment name --- .../providers/kubernetes/pod_test.go | 2 +- libbeat/common/kubernetes/metadata/config.go | 10 +++-- .../common/kubernetes/metadata/metadata.go | 2 +- libbeat/common/kubernetes/metadata/pod.go | 43 +++++++++++-------- .../common/kubernetes/metadata/pod_test.go | 6 +-- .../add_kubernetes_metadata/indexers_test.go | 8 ++-- .../module/kubernetes/util/kubernetes.go | 4 +- 7 files changed, 43 insertions(+), 32 deletions(-) diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go index 4a7097d48022..e92bcc2575fb 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod_test.go +++ b/libbeat/autodiscover/providers/kubernetes/pod_test.go @@ -2023,7 +2023,7 @@ func TestPod_EmitEvent(t *testing.T) { t.Fatal(err) } - metaGen := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, client, nil, nil) + metaGen := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, client, nil, nil, nil) p := &Provider{ config: defaultConfig(), bus: bus.New(logp.NewLogger("bus"), "test"), diff --git a/libbeat/common/kubernetes/metadata/config.go b/libbeat/common/kubernetes/metadata/config.go index 5e27eff4cf3f..5edc061d2f21 100644 --- a/libbeat/common/kubernetes/metadata/config.go +++ b/libbeat/common/kubernetes/metadata/config.go @@ -32,8 +32,9 @@ type Config struct { // AddResourceMetadataConfig allows adding config for enriching additional resources type AddResourceMetadataConfig struct { - Node *common.Config `config:"node"` - Namespace *common.Config `config:"namespace"` + Node *common.Config `config:"node"` + Namespace *common.Config `config:"namespace"` + Deployment bool `config:"deployment"` } // InitDefaults initializes the defaults for the config. @@ -52,7 +53,8 @@ func GetDefaultResourceMetadataConfig() *AddResourceMetadataConfig { metaConfig.InitDefaults() metaCfg, _ := common.NewConfigFrom(&metaConfig) return &AddResourceMetadataConfig{ - Node: metaCfg, - Namespace: metaCfg, + Node: metaCfg, + Namespace: metaCfg, + Deployment: true, } } diff --git a/libbeat/common/kubernetes/metadata/metadata.go b/libbeat/common/kubernetes/metadata/metadata.go index 0d95d9606401..35f0d2f032be 100644 --- a/libbeat/common/kubernetes/metadata/metadata.go +++ b/libbeat/common/kubernetes/metadata/metadata.go @@ -96,7 +96,7 @@ func GetPodMetaGen( if namespaceWatcher != nil && metaConf.Namespace.Enabled() { namespaceMetaGen = NewNamespaceMetadataGenerator(metaConf.Namespace, namespaceWatcher.Store(), namespaceWatcher.Client()) } - metaGen := NewPodMetadataGenerator(cfg, podWatcher.Store(), podWatcher.Client(), nodeMetaGen, namespaceMetaGen) + metaGen := NewPodMetadataGenerator(cfg, podWatcher.Store(), podWatcher.Client(), nodeMetaGen, namespaceMetaGen, metaConf) return metaGen } diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go index 66138f06d9fc..4ad98ccfe1a9 100644 --- a/libbeat/common/kubernetes/metadata/pod.go +++ b/libbeat/common/kubernetes/metadata/pod.go @@ -29,11 +29,12 @@ import ( ) type pod struct { - store cache.Store - client k8s.Interface - node MetaGen - namespace MetaGen - resource *Resource + store cache.Store + client k8s.Interface + node MetaGen + namespace MetaGen + resource *Resource + addDeployment bool } // NewPodMetadataGenerator creates a metagen for pod resources @@ -42,13 +43,19 @@ func NewPodMetadataGenerator( pods cache.Store, client k8s.Interface, node MetaGen, - namespace MetaGen) MetaGen { + namespace MetaGen, + metaCfg *AddResourceMetadataConfig) MetaGen { + var addDeploymentMeta bool + if metaCfg != nil { + addDeploymentMeta = metaCfg.Deployment + } return &pod{ - resource: NewResourceMetadataGenerator(cfg, client), - store: pods, - node: node, - namespace: namespace, - client: client, + resource: NewResourceMetadataGenerator(cfg, client), + store: pods, + node: node, + namespace: namespace, + client: client, + addDeployment: addDeploymentMeta, } } @@ -84,11 +91,13 @@ func (p *pod) GenerateK8s(obj kubernetes.Resource, opts ...FieldOptions) common. out := p.resource.GenerateK8s("pod", obj, opts...) // check if Pod is handled by a ReplicaSet which is controlled by a Deployment - rsName, _ := out.GetValue("replicaset.name") - if rsName, ok := rsName.(string); ok { - dep := p.getRSDeployment(rsName, po.GetNamespace()) - if dep != "" { - out.Put("deployment.name", dep) + if p.addDeployment { + rsName, _ := out.GetValue("replicaset.name") + if rsName, ok := rsName.(string); ok { + dep := p.getRSDeployment(rsName, po.GetNamespace()) + if dep != "" { + out.Put("deployment.name", dep) + } } } @@ -107,7 +116,7 @@ func (p *pod) GenerateK8s(obj kubernetes.Resource, opts ...FieldOptions) common. meta := p.namespace.GenerateFromName(po.GetNamespace()) if meta != nil { // Use this in 8.0 - //out.Put("namespace", meta["namespace"]) + // out.Put("namespace", meta["namespace"]) out.DeepUpdate(meta) } } diff --git a/libbeat/common/kubernetes/metadata/pod_test.go b/libbeat/common/kubernetes/metadata/pod_test.go index 040d2d2fba8e..6b0dc6da6fd3 100644 --- a/libbeat/common/kubernetes/metadata/pod_test.go +++ b/libbeat/common/kubernetes/metadata/pod_test.go @@ -384,7 +384,7 @@ func TestPod_Generate(t *testing.T) { }) assert.NoError(t, err) - metagen := NewPodMetadataGenerator(config, nil, client, nil, nil) + metagen := NewPodMetadataGenerator(config, nil, client, nil, nil, nil) for _, test := range tests { t.Run(test.name, func(t *testing.T) { assert.Equal(t, test.output, metagen.Generate(test.input)) @@ -510,7 +510,7 @@ func TestPod_GenerateFromName(t *testing.T) { assert.NoError(t, err) pods := cache.NewStore(cache.MetaNamespaceKeyFunc) pods.Add(test.input) - metagen := NewPodMetadataGenerator(config, pods, client, nil, nil) + metagen := NewPodMetadataGenerator(config, pods, client, nil, nil, nil) accessor, err := meta.Accessor(test.input) require.NoError(t, err) @@ -634,7 +634,7 @@ func TestPod_GenerateWithNodeNamespace(t *testing.T) { namespaces.Add(test.namespace) nsMeta := NewNamespaceMetadataGenerator(config, namespaces, client) - metagen := NewPodMetadataGenerator(config, pods, client, nodeMeta, nsMeta) + metagen := NewPodMetadataGenerator(config, pods, client, nodeMeta, nsMeta, nil) t.Run(test.name, func(t *testing.T) { assert.Equal(t, test.output, metagen.Generate(test.input)) }) diff --git a/libbeat/processors/add_kubernetes_metadata/indexers_test.go b/libbeat/processors/add_kubernetes_metadata/indexers_test.go index a28775641fdc..b2476b552587 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexers_test.go +++ b/libbeat/processors/add_kubernetes_metadata/indexers_test.go @@ -32,7 +32,7 @@ import ( "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) -var metagen = metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil) +var metagen = metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil, nil) func TestPodIndexer(t *testing.T) { var testConfig = common.NewConfig() @@ -92,7 +92,7 @@ func TestPodIndexer(t *testing.T) { func TestPodUIDIndexer(t *testing.T) { var testConfig = common.NewConfig() - metaGenWithPodUID := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil) + metaGenWithPodUID := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil, nil) podUIDIndexer, err := NewPodUIDIndexer(*testConfig, metaGenWithPodUID) assert.NoError(t, err) @@ -307,7 +307,7 @@ func TestFilteredGenMeta(t *testing.T) { }) assert.NoError(t, err) - filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil) + filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil, nil) podIndexer, err = NewPodNameIndexer(*testConfig, filteredGen) assert.NoError(t, err) @@ -344,7 +344,7 @@ func TestFilteredGenMetaExclusion(t *testing.T) { }) assert.NoError(t, err) - filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil) + filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil, nil) podIndexer, err := NewPodNameIndexer(*testConfig, filteredGen) assert.NoError(t, err) diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go index 58aab72f1ff7..56a4a2c1c31f 100644 --- a/metricbeat/module/kubernetes/util/kubernetes.go +++ b/metricbeat/module/kubernetes/util/kubernetes.go @@ -139,7 +139,7 @@ func NewResourceMetadataEnricher( cfg, _ := common.NewConfigFrom(&metaConfig) metaGen := metadata.NewResourceMetadataGenerator(cfg, watcher.Client()) - podMetaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil) + podMetaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil, &metadata.AddResourceMetadataConfig{Deployment: true}) serviceMetaGen := metadata.NewServiceMetadataGenerator(cfg, nil, nil, watcher.Client()) enricher := buildMetadataEnricher(watcher, // update @@ -228,7 +228,7 @@ func NewContainerMetadataEnricher( cfg, _ := common.NewConfigFrom(&metaConfig) - metaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil) + metaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil, &metadata.AddResourceMetadataConfig{Deployment: true}) enricher := buildMetadataEnricher(watcher, // update func(m map[string]common.MapStr, r kubernetes.Resource) { From fb2e6936597f00dee6c424e16a69cec20f99b08a Mon Sep 17 00:00:00 2001 From: Peter Deng Date: Thu, 28 Oct 2021 21:04:54 +0800 Subject: [PATCH 2/6] update doc and regression fix --- CHANGELOG.next.asciidoc | 1 + libbeat/common/kubernetes/metadata/pod.go | 2 +- libbeat/docs/shared-autodiscover.asciidoc | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 20d0c41610e0..4c4171b0d855 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -27,6 +27,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Enable IMDSv2 support for `add_cloud_metadata` processor on AWS. {issue}22101[22101] {pull}28285[28285] - Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917] - Previously, RE2 and thus Golang had a bug where `(|a)*` matched more characters than `(|a)+`. To stay consistent with PCRE, the bug was fixed. Configurations that rely on the old, buggy behaviour has to be adjusted. See more about Golang bug: https://github.com/golang/go/issues/46123 {pull}27543[27543] +- Allows disable pod events enrichment with deployment name {pull}28521[28521] *Auditbeat* diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go index 4ad98ccfe1a9..80303e7dd6dc 100644 --- a/libbeat/common/kubernetes/metadata/pod.go +++ b/libbeat/common/kubernetes/metadata/pod.go @@ -45,7 +45,7 @@ func NewPodMetadataGenerator( node MetaGen, namespace MetaGen, metaCfg *AddResourceMetadataConfig) MetaGen { - var addDeploymentMeta bool + addDeploymentMeta := true if metaCfg != nil { addDeploymentMeta = metaCfg.Deployment } diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index 1d19a0f4bac1..75e5c0a57bcd 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -245,7 +245,8 @@ endif::[] `add_resource_metadata` can be done for `node` or `namespace`. By default all labels will be included while annotations are not added by default. This settings are useful when labels' and annotations' storing requires special handling to avoid overloading the storage output. The enrichment of `node` or `namespace` metadata - can be individually disabled by setting `enabled: false`. + can be individually disabled by setting `enabled: false`. If resource is `pod` and it is created from a `deployment`, by default + the deployment name is added, this can be disabled by set to `false`. Example: ["source","yaml",subs="attributes"] @@ -256,6 +257,7 @@ endif::[] node: include_labels: ["nodelabel2"] include_annotations: ["nodeannotation1"] + deployment: false ------------------------------------------------------------------------------------- `unique`:: (Optional) Defaults to `false`. Marking an autodiscover provider as unique results into From b8f5d63a356621edc9e1abfa38e55713b287d0f9 Mon Sep 17 00:00:00 2001 From: Peter Deng Date: Thu, 28 Oct 2021 21:24:42 +0800 Subject: [PATCH 3/6] fix changelog --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 4c4171b0d855..1bcb92adba43 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -27,7 +27,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Enable IMDSv2 support for `add_cloud_metadata` processor on AWS. {issue}22101[22101] {pull}28285[28285] - Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917] - Previously, RE2 and thus Golang had a bug where `(|a)*` matched more characters than `(|a)+`. To stay consistent with PCRE, the bug was fixed. Configurations that rely on the old, buggy behaviour has to be adjusted. See more about Golang bug: https://github.com/golang/go/issues/46123 {pull}27543[27543] -- Allows disable pod events enrichment with deployment name {pull}28521[28521] *Auditbeat* @@ -230,6 +229,7 @@ for a few releases. Please use other tools provided by Elastic to fetch data fro - Fix handling of float data types within processors. {issue}28279[28279] {pull}28280[28280] - Allow `clone3` syscall in seccomp filters. {pull}28117[28117] - Remove unnecessary escaping step in dashboard loading, so they can be displayed in Kibana. {pull}28395[28395] +- Allows disable pod events enrichment with deployment name {pull}28521[28521] *Auditbeat* From 3a1a5ac4b21f380de8f11d9ee7f2b0f9403d121a Mon Sep 17 00:00:00 2001 From: Peter Deng Date: Thu, 4 Nov 2021 10:55:29 +0800 Subject: [PATCH 4/6] fix merge conflict issue --- libbeat/common/kubernetes/metadata/pod.go | 41 ++++++++++++++--------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go index e79054603f0e..15202486b3bc 100644 --- a/libbeat/common/kubernetes/metadata/pod.go +++ b/libbeat/common/kubernetes/metadata/pod.go @@ -29,11 +29,12 @@ import ( ) type pod struct { - store cache.Store - client k8s.Interface - node MetaGen - namespace MetaGen - resource *Resource + store cache.Store + client k8s.Interface + node MetaGen + namespace MetaGen + resource *Resource + addDeployment bool } // NewPodMetadataGenerator creates a metagen for pod resources @@ -42,13 +43,19 @@ func NewPodMetadataGenerator( pods cache.Store, client k8s.Interface, node MetaGen, - namespace MetaGen) MetaGen { + namespace MetaGen, + metaCfg *AddResourceMetadataConfig) MetaGen { + addDeploymentMeta := true + if metaCfg != nil { + addDeploymentMeta = metaCfg.Deployment + } return &pod{ - resource: NewResourceMetadataGenerator(cfg, client), - store: pods, - node: node, - namespace: namespace, - client: client, + resource: NewResourceMetadataGenerator(cfg, client), + store: pods, + node: node, + namespace: namespace, + client: client, + addDeployment: addDeploymentMeta, } } @@ -84,11 +91,13 @@ func (p *pod) GenerateK8s(obj kubernetes.Resource, opts ...FieldOptions) common. out := p.resource.GenerateK8s("pod", obj, opts...) // check if Pod is handled by a ReplicaSet which is controlled by a Deployment - rsName, _ := out.GetValue("replicaset.name") - if rsName, ok := rsName.(string); ok { - dep := p.getRSDeployment(rsName, po.GetNamespace()) - if dep != "" { - out.Put("deployment.name", dep) + if p.addDeployment { + rsName, _ := out.GetValue("replicaset.name") + if rsName, ok := rsName.(string); ok { + dep := p.getRSDeployment(rsName, po.GetNamespace()) + if dep != "" { + out.Put("deployment.name", dep) + } } } From 9c023bba34f76be4ba5c82297f5991a9c71947fb Mon Sep 17 00:00:00 2001 From: Peter Deng Date: Thu, 4 Nov 2021 11:08:14 +0800 Subject: [PATCH 5/6] incorporate suggested changes --- libbeat/common/kubernetes/metadata/metadata.go | 2 +- libbeat/common/kubernetes/metadata/pod.go | 6 +----- metricbeat/module/kubernetes/util/kubernetes.go | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libbeat/common/kubernetes/metadata/metadata.go b/libbeat/common/kubernetes/metadata/metadata.go index 35f0d2f032be..7195d47ab0c4 100644 --- a/libbeat/common/kubernetes/metadata/metadata.go +++ b/libbeat/common/kubernetes/metadata/metadata.go @@ -96,7 +96,7 @@ func GetPodMetaGen( if namespaceWatcher != nil && metaConf.Namespace.Enabled() { namespaceMetaGen = NewNamespaceMetadataGenerator(metaConf.Namespace, namespaceWatcher.Store(), namespaceWatcher.Client()) } - metaGen := NewPodMetadataGenerator(cfg, podWatcher.Store(), podWatcher.Client(), nodeMetaGen, namespaceMetaGen, metaConf) + metaGen := NewPodMetadataGenerator(cfg, podWatcher.Store(), podWatcher.Client(), nodeMetaGen, namespaceMetaGen, metaConf.Deployment) return metaGen } diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go index 15202486b3bc..5ec63292b6c8 100644 --- a/libbeat/common/kubernetes/metadata/pod.go +++ b/libbeat/common/kubernetes/metadata/pod.go @@ -44,11 +44,7 @@ func NewPodMetadataGenerator( client k8s.Interface, node MetaGen, namespace MetaGen, - metaCfg *AddResourceMetadataConfig) MetaGen { - addDeploymentMeta := true - if metaCfg != nil { - addDeploymentMeta = metaCfg.Deployment - } + addDeploymentMeta bool) MetaGen { return &pod{ resource: NewResourceMetadataGenerator(cfg, client), store: pods, diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go index 3dc5f1dab2e5..41e0a2bac163 100644 --- a/metricbeat/module/kubernetes/util/kubernetes.go +++ b/metricbeat/module/kubernetes/util/kubernetes.go @@ -144,7 +144,7 @@ func NewResourceMetadataEnricher( cfg, _ := common.NewConfigFrom(&metaConfig) metaGen := metadata.NewResourceMetadataGenerator(cfg, watcher.Client()) - podMetaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil, &metadata.AddResourceMetadataConfig{Deployment: true}) + podMetaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil, true) serviceMetaGen := metadata.NewServiceMetadataGenerator(cfg, nil, nil, watcher.Client()) enricher := buildMetadataEnricher(watcher, // update @@ -233,7 +233,7 @@ func NewContainerMetadataEnricher( cfg, _ := common.NewConfigFrom(&metaConfig) - metaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil, &metadata.AddResourceMetadataConfig{Deployment: true}) + metaGen := metadata.NewPodMetadataGenerator(cfg, nil, watcher.Client(), nil, nil, true) enricher := buildMetadataEnricher(watcher, // update func(m map[string]common.MapStr, r kubernetes.Resource) { From 357bb69e4ae98b2487f8aa2dd7e33a4b2705db92 Mon Sep 17 00:00:00 2001 From: Peter Deng Date: Fri, 5 Nov 2021 08:27:55 +0800 Subject: [PATCH 6/6] fix syntax error --- libbeat/autodiscover/providers/kubernetes/pod_test.go | 2 +- libbeat/common/kubernetes/metadata/pod_test.go | 6 +++--- .../processors/add_kubernetes_metadata/indexers_test.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go index e92bcc2575fb..266a15fb1593 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod_test.go +++ b/libbeat/autodiscover/providers/kubernetes/pod_test.go @@ -2023,7 +2023,7 @@ func TestPod_EmitEvent(t *testing.T) { t.Fatal(err) } - metaGen := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, client, nil, nil, nil) + metaGen := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, client, nil, nil, true) p := &Provider{ config: defaultConfig(), bus: bus.New(logp.NewLogger("bus"), "test"), diff --git a/libbeat/common/kubernetes/metadata/pod_test.go b/libbeat/common/kubernetes/metadata/pod_test.go index 6b0dc6da6fd3..0ea6053a1fbe 100644 --- a/libbeat/common/kubernetes/metadata/pod_test.go +++ b/libbeat/common/kubernetes/metadata/pod_test.go @@ -384,7 +384,7 @@ func TestPod_Generate(t *testing.T) { }) assert.NoError(t, err) - metagen := NewPodMetadataGenerator(config, nil, client, nil, nil, nil) + metagen := NewPodMetadataGenerator(config, nil, client, nil, nil, true) for _, test := range tests { t.Run(test.name, func(t *testing.T) { assert.Equal(t, test.output, metagen.Generate(test.input)) @@ -510,7 +510,7 @@ func TestPod_GenerateFromName(t *testing.T) { assert.NoError(t, err) pods := cache.NewStore(cache.MetaNamespaceKeyFunc) pods.Add(test.input) - metagen := NewPodMetadataGenerator(config, pods, client, nil, nil, nil) + metagen := NewPodMetadataGenerator(config, pods, client, nil, nil, true) accessor, err := meta.Accessor(test.input) require.NoError(t, err) @@ -634,7 +634,7 @@ func TestPod_GenerateWithNodeNamespace(t *testing.T) { namespaces.Add(test.namespace) nsMeta := NewNamespaceMetadataGenerator(config, namespaces, client) - metagen := NewPodMetadataGenerator(config, pods, client, nodeMeta, nsMeta, nil) + metagen := NewPodMetadataGenerator(config, pods, client, nodeMeta, nsMeta, true) t.Run(test.name, func(t *testing.T) { assert.Equal(t, test.output, metagen.Generate(test.input)) }) diff --git a/libbeat/processors/add_kubernetes_metadata/indexers_test.go b/libbeat/processors/add_kubernetes_metadata/indexers_test.go index b2476b552587..058d838592ac 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexers_test.go +++ b/libbeat/processors/add_kubernetes_metadata/indexers_test.go @@ -32,7 +32,7 @@ import ( "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) -var metagen = metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil, nil) +var metagen = metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil, true) func TestPodIndexer(t *testing.T) { var testConfig = common.NewConfig() @@ -92,7 +92,7 @@ func TestPodIndexer(t *testing.T) { func TestPodUIDIndexer(t *testing.T) { var testConfig = common.NewConfig() - metaGenWithPodUID := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil, nil) + metaGenWithPodUID := metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil, nil, true) podUIDIndexer, err := NewPodUIDIndexer(*testConfig, metaGenWithPodUID) assert.NoError(t, err) @@ -307,7 +307,7 @@ func TestFilteredGenMeta(t *testing.T) { }) assert.NoError(t, err) - filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil, nil) + filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil, true) podIndexer, err = NewPodNameIndexer(*testConfig, filteredGen) assert.NoError(t, err) @@ -344,7 +344,7 @@ func TestFilteredGenMetaExclusion(t *testing.T) { }) assert.NoError(t, err) - filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil, nil) + filteredGen := metadata.NewPodMetadataGenerator(config, nil, nil, nil, nil, true) podIndexer, err := NewPodNameIndexer(*testConfig, filteredGen) assert.NoError(t, err)