resolved comments

CHANGELOG.next.asciidoc

@@ -59,7 +59,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Mark system process metricsets as running if metrics are partially available {pull}40565[40565]
 - Added back `elasticsearch.node.stats.jvm.mem.pools.*` to the `node_stats` metricset {pull}40571[40571]
 - Add GCP organization and project details to ECS cloud fields. {pull}40461[40461]
-- Add `endpoint` field to the GCP configuration in order to append it to the metric client. {issue}40848[40848] {pull}40918[40918]
+- Add support for specifying a custom endpoint for GCP service clients. {issue}40848[40848] {pull}40918[40918]
 
 *Osquerybeat*
 

metricbeat/docs/modules/gcp.asciidoc

@@ -379,18 +379,9 @@ metricbeat.modules:
   period: 24h
   project_id: "your project id"
   credentials_file_path: "your JSON credentials file path"
+  endpoint: http://your-endpoint
   dataset_id: "dataset id"
   table_pattern: "table pattern"
-
- - module: gcp
-  metricsets:
-    - compute
-  region: "us-"
-  project_id: "your project id"
-  credentials_file_path: "your JSON credentials file path"
-  endpoint: http://your-endpoint
-  exclude_labels: false
-  period: 1m 
 ----
 
 [float]

x-pack/metricbeat/metricbeat.reference.yml

@@ -641,19 +641,10 @@ metricbeat.modules:
   period: 24h
   project_id: "your project id"
   credentials_file_path: "your JSON credentials file path"
+  endpoint: http://your-endpoint
   dataset_id: "dataset id"
   table_pattern: "table pattern"
 
- - module: gcp
-  metricsets:
-    - compute
-  region: "us-"
-  project_id: "your project id"
-  credentials_file_path: "your JSON credentials file path"
-  endpoint: http://your-endpoint
-  exclude_labels: false
-  period: 1m 
-
 #-------------------------------- Golang Module --------------------------------
 - module: golang
   #metricsets:

x-pack/metricbeat/module/gcp/_meta/config.yml

@@ -67,15 +67,6 @@
   period: 24h
   project_id: "your project id"
   credentials_file_path: "your JSON credentials file path"
+  endpoint: http://your-endpoint
   dataset_id: "dataset id"
   table_pattern: "table pattern"
-
- - module: gcp
-  metricsets:
-    - compute
-  region: "us-"
-  project_id: "your project id"
-  credentials_file_path: "your JSON credentials file path"
-  endpoint: http://your-endpoint
-  exclude_labels: false
-  period: 1m 

x-pack/metricbeat/module/gcp/metrics/metricset.go

@@ -108,6 +108,7 @@ type config struct {
 	CredentialsFilePath string   `config:"credentials_file_path"`
 	CredentialsJSON     string   `config:"credentials_json"`
 	Endpoint            string   `config:"endpoint"`
+
 	opt                 []option.ClientOption
 	period              *durationpb.Duration
 	organizationID      string
@@ -143,6 +144,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	} else {
 		return m, fmt.Errorf("no credentials_file_path or credentials_json specified")
 	}
+
 	if m.config.Endpoint != "" {
 		m.Logger().Warnf("You are using a custom endpoint '%s' for the GCP API calls.", m.config.Endpoint)
 		m.config.opt = append(m.config.opt, option.WithEndpoint(m.config.Endpoint))

x-pack/metricbeat/modules.d/gcp.yml.disabled

@@ -70,15 +70,6 @@
   period: 24h
   project_id: "your project id"
   credentials_file_path: "your JSON credentials file path"
+  endpoint: http://your-endpoint
   dataset_id: "dataset id"
   table_pattern: "table pattern"
-
- - module: gcp
-  metricsets:
-    - compute
-  region: "us-"
-  project_id: "your project id"
-  credentials_file_path: "your JSON credentials file path"
-  endpoint: http://your-endpoint
-  exclude_labels: false
-  period: 1m