[Kubernetes - Metricbeat] Providing config option to disable Kubeadm config api requests

CHANGELOG.next.asciidoc

@@ -316,7 +316,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Add new memory/cgroup metrics to Kibana module {pull}37232[37232]
 - Add SSL support to mysql module {pull}37997[37997]
 - Add SSL support for aerospike module {pull}38126[38126]
-
+- Add `use_kubeadm` config option in kubernetes module in order to toggle kubeadm-config api requests {pull}40086[40086]
 
 *Metricbeat*
 

NOTICE.txt

@@ -12587,11 +12587,11 @@ various licenses:
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-autodiscover
-Version: v0.8.1
+Version: v0.8.2
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.8.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.8.2/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

go.mod

@@ -192,7 +192,7 @@ require (
 	github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20220623125934-28468a6701b5
 	github.com/elastic/bayeux v1.0.5
 	github.com/elastic/ebpfevents v0.6.0
-	github.com/elastic/elastic-agent-autodiscover v0.8.1
+	github.com/elastic/elastic-agent-autodiscover v0.8.2
 	github.com/elastic/elastic-agent-libs v0.10.0
 	github.com/elastic/elastic-agent-system-metrics v0.11.1
 	github.com/elastic/go-elasticsearch/v8 v8.14.0

go.sum

@@ -556,8 +556,8 @@ github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 h1:lnDkqiRFKm0rxdljqr
 github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod h1:aPqzac6AYkipvp4hufTyMj5PDIphF3+At8zr7r51xjY=
 github.com/elastic/ebpfevents v0.6.0 h1:BrL3m7JFK7U6h2jkbk3xAWWs//IZnugCHEDds5u2v68=
 github.com/elastic/ebpfevents v0.6.0/go.mod h1:ESG9gw7N+n5yCCMgdg1IIJENKWSmX7+X0Fi9GUs9nvU=
-github.com/elastic/elastic-agent-autodiscover v0.8.1 h1:u6TWqh7wfevu6S4GUq4SIxYBRo4b/P5RZmx/rSvT10A=
-github.com/elastic/elastic-agent-autodiscover v0.8.1/go.mod h1:0gzGsaDCAqBfUZjuCqqWsSI60eaZ778A5tQZV72rPV0=
+github.com/elastic/elastic-agent-autodiscover v0.8.2 h1:Fs2FhR33AMBPfm5/jz4drVzaEZaqOIHlDBvGtkUZdIk=
+github.com/elastic/elastic-agent-autodiscover v0.8.2/go.mod h1:VZnU53EVaFTxR8Xf6YsLN8FHD5DKQzHSPlKax9/4w+o=
 github.com/elastic/elastic-agent-client/v7 v7.15.0 h1:nDB7v8TBoNuD6IIzC3z7Q0y+7bMgXoT2DsHfolO2CHE=
 github.com/elastic/elastic-agent-client/v7 v7.15.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
 github.com/elastic/elastic-agent-libs v0.10.0 h1:W7uvay0UYdLPtauXGsMD8Xfoe4qtcVWQR4icBgf/26Q=

metricbeat/module/kubernetes/_meta/test/docs/01_playground/metricbeat.yaml

@@ -26,13 +26,15 @@ data:
                   hosts: ["kube-state-metrics:8080"]
                   period: 10s
                   add_metadata: true
+                  # use_kubeadm: true
                   metricsets:
                     - state_node
                     - state_deployment
                     - state_daemonset
                     - state_replicaset
                     - state_pod
                     - state_container
+                    - state_job
                     - state_cronjob
                     - state_resourcequota
                     - state_statefulset
@@ -45,14 +47,16 @@ data:
                   metricsets:
                     - apiserver
                   hosts: ["https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}"]
+                  # use_kubeadm: true
                   bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
                   ssl.certificate_authorities:
                     - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
                   period: 30s
                 # Uncomment this to get k8s events:
-                #- module: kubernetes
-                #  metricsets:
-                #    - event
+                - module: kubernetes
+                  metricsets:
+                   - event
+                  # use_kubeadm: true
         # To enable hints based autodiscover uncomment this:
         #- type: kubernetes
         #  node: ${NODE_NAME}
@@ -113,6 +117,7 @@ data:
         - volume
       period: 10s
       host: ${NODE_NAME}
+      # use_kubeadm: true
       hosts: ["https://${NODE_NAME}:10250"]
       bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
       ssl.verification_mode: "none"
@@ -125,6 +130,7 @@ data:
       metricsets:
         - proxy
       period: 10s
+      # use_kubeadm: true
       host: ${NODE_NAME}
       hosts: ["localhost:10249"]
 ---
@@ -151,12 +157,12 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: metricbeat
-          image: docker.elastic.co/beats/metricbeat:8.0.0-SNAPSHOT
+          image: docker.elastic.co/beats/metricbeat:8.15.0-SNAPSHOT
           command: [ "sleep" ]
           args: [ "infinity" ]
           env:
             - name: ELASTICSEARCH_HOST
-              value: elasticsearch.default.svc.cluster.local
+              value: elasticsearch
             - name: ELASTICSEARCH_PORT
               value: "9200"
             - name: ELASTICSEARCH_USERNAME

metricbeat/module/kubernetes/event/config.go

@@ -25,6 +25,7 @@ import (
 
 type kubeEventsConfig struct {
 	KubeConfig        string                       `config:"kube_config"`
+	KubeAdm           bool                         `config:"use_kubeadm"`
 	KubeClientOptions kubernetes.KubeClientOptions `config:"kube_client_options"`
 	Namespace         string                       `config:"namespace"`
 	SyncPeriod        time.Duration                `config:"sync_period"`
@@ -40,6 +41,7 @@ type Enabled struct {
 func defaultKubernetesEventsConfig() kubeEventsConfig {
 	return kubeEventsConfig{
 		SyncPeriod:       10 * time.Minute,
+		KubeAdm:          true,
 		LabelsDedot:      true,
 		AnnotationsDedot: true,
 		SkipOlder:        true,

metricbeat/module/kubernetes/util/kubernetes.go

@@ -42,9 +42,9 @@
 type kubernetesConfig struct {
 	KubeConfig        string                       `config:"kube_config"`
 	KubeClientOptions kubernetes.KubeClientOptions `config:"kube_client_options"`
-
-	Node       string        `config:"node"`
-	SyncPeriod time.Duration `config:"sync_period"`
+	KubeAdm           bool                         `config:"use_kubeadm"`
+	Node              string                       `config:"node"`
+	SyncPeriod        time.Duration                `config:"sync_period"`
 
 	// AddMetadata enables enriching metricset events with metadata from the API server
 	AddMetadata         bool                                `config:"add_metadata"`
@@ -464,7 +464,7 @@
 
 // createMetadataGen creates and returns the metadata generator for resources other than pod and service
 // metaGen is a struct of type Resource and implements Generate method for metadata generation for a given resource kind.
-func createMetadataGen(client k8sclient.Interface, commonConfig *conf.C, addResourceMetadata *metadata.AddResourceMetadataConfig,
+func createMetadataGen(client k8sclient.Interface, commonConfig *conf.C, addResourceMetadata *metadata.AddResourceMetadataConfig, kubeadm bool,
 	resourceName string, resourceWatchers *Watchers) (*metadata.Resource, error) {
 
 	resourceWatchers.lock.RLock()
@@ -477,9 +477,10 @@
 	}
 
 	var metaGen *metadata.Resource
-
 	namespaceMetaWatcher := resourceWatchers.metaWatchersMap[NamespaceResource]
 	if namespaceMetaWatcher != nil {
+		// We initialise the use_kubeadm variable based on modules KubeAdm base configuration
+		addResourceMetadata.Namespace.SetBool("use_kubeadm", -1, kubeadm)
 		n := metadata.NewNamespaceMetadataGenerator(addResourceMetadata.Namespace,
 			(*namespaceMetaWatcher).watcher.Store(), client)
 		metaGen = metadata.NewNamespaceAwareResourceMetadataGenerator(commonConfig, client, n)
@@ -492,7 +493,7 @@
 
 // createMetadataGenSpecific creates and returns the metadata generator for a specific resource - pod or service
 // A metaGen struct implements a MetaGen interface and is designed to utilize the necessary watchers to collect(Generate) metadata for a specific resource.
-func createMetadataGenSpecific(client k8sclient.Interface, commonConfig *conf.C, addResourceMetadata *metadata.AddResourceMetadataConfig,
+func createMetadataGenSpecific(client k8sclient.Interface, commonConfig *conf.C, addResourceMetadata *metadata.AddResourceMetadataConfig, kubeadm bool,
 	resourceName string, resourceWatchers *Watchers) (metadata.MetaGen, error) {
 
 	resourceWatchers.lock.RLock()
@@ -527,6 +528,9 @@
 		}
 		// For example for pod named redis in namespace default, the generator uses the pod watcher for pod metadata,
 		// collects all node metadata using the node watcher's store and all namespace metadata using the namespacewatcher's store.
+		// We initialise the use_kubeadm variable based on modules KubeAdm base configuration
+		addResourceMetadata.Namespace.SetBool("use_kubeadm", -1, kubeadm)
+		addResourceMetadata.Node.SetBool("use_kubeadm", -1, kubeadm)
 		metaGen = metadata.GetPodMetaGen(commonConfig, mainWatcher, nodeWatcher, namespaceWatcher, replicaSetWatcher,
 			jobWatcher, addResourceMetadata)
 		return metaGen, nil
@@ -535,6 +539,8 @@
 		if namespaceMetaWatcher == nil {
 			return nil, fmt.Errorf("could not create the metadata generator, as the watcher for namespace does not exist")
 		}
+
+		addResourceMetadata.Namespace.SetBool("use_kubeadm", -1, kubeadm)
 		namespaceMeta := metadata.NewNamespaceMetadataGenerator(addResourceMetadata.Namespace,
 			(*namespaceMetaWatcher).watcher.Store(), client)
 		metaGen = metadata.NewServiceMetadataGenerator(commonConfig, (*resourceMetaWatcher).watcher.Store(),
@@ -574,7 +580,6 @@
 		return &nilEnricher{}
 	}
 	commonConfig, _ := conf.NewConfigFrom(&commonMetaConfig)
-
 	client, err := kubernetes.GetKubernetesClient(config.KubeConfig, config.KubeClientOptions)
 	if err != nil {
 		log.Errorf("Error creating Kubernetes client: %s", err)
@@ -590,14 +595,14 @@
 		return &nilEnricher{}
 	}
 
 	var specificMetaGen metadata.MetaGen
 	var generalMetaGen *metadata.Resource
 	// Create the metadata generator to be used in the watcher's event handler.
 	// Both specificMetaGen and generalMetaGen implement Generate method for metadata collection.
 	if resourceName == ServiceResource || resourceName == PodResource {
-		specificMetaGen, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, resourceName, resourceWatchers)
+		specificMetaGen, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, resourceName, resourceWatchers)
 	} else {
-		generalMetaGen, err = createMetadataGen(client, commonConfig, config.AddResourceMetadata, resourceName, resourceWatchers)
+		generalMetaGen, err = createMetadataGen(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, resourceName, resourceWatchers)
 	}
 	if err != nil {
 		log.Errorf("Error trying to create the metadata generators: %s", err)
@@ -741,7 +746,6 @@
 		return &nilEnricher{}
 	}
 	commonConfig, _ := conf.NewConfigFrom(&commonMetaConfig)
-
 	client, err := kubernetes.GetKubernetesClient(config.KubeConfig, config.KubeClientOptions)
 	if err != nil {
 		log.Errorf("Error creating Kubernetes client: %s", err)
@@ -756,7 +760,7 @@
 		return &nilEnricher{}
 	}
 
-	metaGen, err := createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, PodResource, resourceWatchers)
+	metaGen, err := createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, commonMetaConfig.KubeAdm, PodResource, resourceWatchers)
 	if err != nil {
 		log.Errorf("Error trying to create the metadata generators: %s", err)
 		return &nilEnricher{}
@@ -883,6 +887,7 @@
 	config := &kubernetesConfig{
 		AddMetadata:         true,
 		SyncPeriod:          time.Minute * 10,
+		KubeAdm:             true,
 		AddResourceMetadata: metadata.GetDefaultResourceMetadataConfig(),
 	}
 

metricbeat/module/kubernetes/util/kubernetes_test.go

@@ -235,6 +235,7 @@ func TestCreateMetaGen(t *testing.T) {
 	config := &kubernetesConfig{
 		Namespace:  "test-ns",
 		SyncPeriod: time.Minute,
+		KubeAdm:    true,
 		Node:       "test-node",
 		AddResourceMetadata: &metadata.AddResourceMetadataConfig{
 			CronJob:    false,
@@ -243,7 +244,7 @@ func TestCreateMetaGen(t *testing.T) {
 	}
 	client := k8sfake.NewSimpleClientset()
 
-	_, err = createMetadataGen(client, commonConfig, config.AddResourceMetadata, DeploymentResource, resourceWatchers)
+	_, err = createMetadataGen(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, DeploymentResource, resourceWatchers)
 	// At this point, no watchers were created
 	require.Error(t, err)
 
@@ -253,7 +254,7 @@ func TestCreateMetaGen(t *testing.T) {
 	require.NoError(t, err)
 
 	// Create the generators, this time without error
-	_, err = createMetadataGen(client, commonConfig, config.AddResourceMetadata, DeploymentResource, resourceWatchers)
+	_, err = createMetadataGen(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, DeploymentResource, resourceWatchers)
 	require.NoError(t, err)
 }
 
@@ -271,34 +272,40 @@ func TestCreateMetaGenSpecific(t *testing.T) {
 	})
 	require.NoError(t, err)
 
+	nodeConfig, err := conf.NewConfigFrom(map[string]interface{}{
+		"enabled": true,
+	})
+	require.NoError(t, err)
 	config := &kubernetesConfig{
 		Namespace:  "test-ns",
 		SyncPeriod: time.Minute,
 		Node:       "test-node",
+		KubeAdm:    true,
 		AddResourceMetadata: &metadata.AddResourceMetadataConfig{
 			CronJob:    false,
 			Deployment: true,
 			Namespace:  namespaceConfig,
+			Node:       nodeConfig,
 		},
 	}
 	client := k8sfake.NewSimpleClientset()
 
 	// For pod:
 	metricsetPod := "pod"
 
-	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, PodResource, resourceWatchers)
+	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, PodResource, resourceWatchers)
 	// At this point, no watchers were created
 	require.Error(t, err)
 
 	// Create the pod resource + the extras
 	err = createAllWatchers(client, metricsetPod, PodResource, false, config, log, resourceWatchers)
 	require.NoError(t, err)
 
-	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, PodResource, resourceWatchers)
+	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, PodResource, resourceWatchers)
 	require.NoError(t, err)
 
 	// For service:
-	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, ServiceResource, resourceWatchers)
+	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, ServiceResource, resourceWatchers)
 	// At this point, no watchers were created
 	require.Error(t, err)
 
@@ -307,7 +314,7 @@ func TestCreateMetaGenSpecific(t *testing.T) {
 	err = createAllWatchers(client, metricsetService, ServiceResource, false, config, log, resourceWatchers)
 	require.NoError(t, err)
 
-	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, ServiceResource, resourceWatchers)
+	_, err = createMetadataGenSpecific(client, commonConfig, config.AddResourceMetadata, config.KubeAdm, ServiceResource, resourceWatchers)
 	require.NoError(t, err)
 }
 
@@ -341,6 +348,7 @@ func TestBuildMetadataEnricher_Start_Stop(t *testing.T) {
 		Namespace:  "test-ns",
 		SyncPeriod: time.Minute,
 		Node:       "test-node",
+		KubeAdm:    true,
 		AddResourceMetadata: &metadata.AddResourceMetadataConfig{
 			CronJob:    false,
 			Deployment: false,
@@ -425,6 +433,7 @@ func TestBuildMetadataEnricher_Start_Stop_SameResources(t *testing.T) {
 		Namespace:  "test-ns",
 		SyncPeriod: time.Minute,
 		Node:       "test-node",
+		KubeAdm:    true,
 		AddResourceMetadata: &metadata.AddResourceMetadataConfig{
 			CronJob:    false,
 			Deployment: false,
@@ -496,6 +505,7 @@ func TestBuildMetadataEnricher_EventHandler(t *testing.T) {
 		Namespace:  "test-ns",
 		SyncPeriod: time.Minute,
 		Node:       "test-node",
+		KubeAdm:    true,
 		AddResourceMetadata: &metadata.AddResourceMetadataConfig{
 			CronJob:    false,
 			Deployment: false,
@@ -639,6 +649,7 @@ func TestBuildMetadataEnricher_EventHandler_PastObjects(t *testing.T) {
 		Namespace:  "test-ns",
 		SyncPeriod: time.Minute,
 		Node:       "test-node",
+		KubeAdm:    true,
 		AddResourceMetadata: &metadata.AddResourceMetadataConfig{
 			CronJob:    false,
 			Deployment: false,