From 3624acfd3e86efb960eb876874ec5f0439428697 Mon Sep 17 00:00:00 2001 From: Vijay Samuel Date: Tue, 8 Dec 2020 21:34:20 -0800 Subject: [PATCH 1/3] Allow node/namespace metadata to be disabled on kubernetes metagen --- CHANGELOG.next.asciidoc | 1 + libbeat/common/kubernetes/metadata/metadata.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ad292aa3cee..e2c36173431 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -552,6 +552,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add tini as init system in docker images {pull}22137[22137] - Added "add_network_direction" processor for determining perimeter-based network direction. {pull}23076[23076] - Added new `rate_limit` processor for enforcing rate limits on event throughput. {pull}22883[22883] +- Allow node/namespace metadata to be disabled on kubernetes metagen {pull}23012[23012] *Auditbeat* diff --git a/libbeat/common/kubernetes/metadata/metadata.go b/libbeat/common/kubernetes/metadata/metadata.go index e1cbd0e8629..897f6c4bc84 100644 --- a/libbeat/common/kubernetes/metadata/metadata.go +++ b/libbeat/common/kubernetes/metadata/metadata.go @@ -61,10 +61,10 @@ func GetPodMetaGen( metaConf *AddResourceMetadataConfig) MetaGen { var nodeMetaGen, namespaceMetaGen MetaGen - if nodeWatcher != nil { + if nodeWatcher != nil && metaConf.Node.Enabled() { nodeMetaGen = NewNodeMetadataGenerator(metaConf.Node, nodeWatcher.Store()) } - if namespaceWatcher != nil { + if namespaceWatcher != nil && metaConf.Namespace.Enabled() { namespaceMetaGen = NewNamespaceMetadataGenerator(metaConf.Namespace, namespaceWatcher.Store()) } metaGen := NewPodMetadataGenerator(cfg, podWatcher.Store(), nodeMetaGen, namespaceMetaGen) From 4078e4ed2494195e0031742ad604d36ce740121a Mon Sep 17 00:00:00 2001 From: Vijay Samuel Date: Sun, 13 Dec 2020 22:43:31 -0800 Subject: [PATCH 2/3] Ensure that add_kubernetes_metadata honors hostname --- CHANGELOG.next.asciidoc | 2 +- libbeat/processors/add_kubernetes_metadata/kubernetes.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e2c36173431..0133f3b2461 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -552,7 +552,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add tini as init system in docker images {pull}22137[22137] - Added "add_network_direction" processor for determining perimeter-based network direction. {pull}23076[23076] - Added new `rate_limit` processor for enforcing rate limits on event throughput. {pull}22883[22883] -- Allow node/namespace metadata to be disabled on kubernetes metagen {pull}23012[23012] +- Allow node/namespace metadata to be disabled on kubernetes metagen and ensure add_kubernetes_metadata honors host {pull}23012[23012] *Auditbeat* diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go index 2ca864a5bcf..50a90b32621 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes.go @@ -178,7 +178,7 @@ func (k *kubernetesAnnotator) init(config kubeAnnotatorConfig, cfg *common.Confi options := kubernetes.WatchOptions{ SyncTimeout: config.SyncPeriod, - Node: "", + Node: config.Host, } if config.Namespace != "" { options.Namespace = config.Namespace From bcee54c97a4259dd3eadcc1137ae761cef3ab939 Mon Sep 17 00:00:00 2001 From: Vijay Samuel Date: Mon, 14 Dec 2020 09:37:31 -0800 Subject: [PATCH 3/3] Update docs --- libbeat/docs/shared-autodiscover.asciidoc | 3 ++- .../docs/add_kubernetes_metadata.asciidoc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index 95f114a6002..e7d0281d946 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -232,7 +232,8 @@ running configuration for a container, 60s by default. `add_resource_metadata`:: (Optional) Specify labels and annotations filters for the extra metadata coming from Node and Namespace. `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. + 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`. Example: ["source","yaml",subs="attributes"] diff --git a/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc b/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc index b35e7cbaf16..d4fe02fd7db 100644 --- a/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc +++ b/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc @@ -121,7 +121,8 @@ It is unset by default. `add_resource_metadata`:: (Optional) Specify labels and annotations filters for the extra metadata coming from Node and Namespace. `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. +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`. Example: ["source","yaml",subs="attributes"]