volume metricset: replace adding ECS orchestrator fields with util.Ad…

…dClusterECSMeta

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

metricbeat/module/kubernetes/volume/volume.go

@@ -25,8 +25,6 @@ import (
 	"github.com/elastic/beats/v7/metricbeat/mb/parse"
 	k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes"
 	"github.com/elastic/beats/v7/metricbeat/module/kubernetes/util"
-	"github.com/elastic/elastic-agent-autodiscover/kubernetes"
-	conf "github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/mapstr"
 )
@@ -82,26 +80,9 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 		BaseMetricSet: base,
 		http:          http,
 		mod:           mod,
+		clusterMeta:   util.AddClusterECSMeta(base),
 	}
 
-	// add ECS orchestrator fields
-	config, err := util.GetValidatedConfig(base)
-	if err != nil {
-		logp.Info("Kubernetes metricset enriching is disabled")
-	} else {
-		client, err := kubernetes.GetKubernetesClient(config.KubeConfig, config.KubeClientOptions)
-		if err != nil {
-			return nil, fmt.Errorf("fail to get kubernetes client: %w", err)
-		}
-		cfg, _ := conf.NewConfigFrom(&config)
-		ecsClusterMeta, err := util.GetClusterECSMeta(cfg, client, ms.Logger())
-		if err != nil {
-			ms.Logger().Debugf("could not retrieve cluster metadata: %w", err)
-		}
-		if ecsClusterMeta != nil {
-			ms.clusterMeta = ecsClusterMeta
-		}
-	}
 	return ms, nil
 }