From fe0649daa3bff8e9d27a19e552808a299ee352ea Mon Sep 17 00:00:00 2001
From: kaiyan-sheng <kaiyan.sheng@elastic.co>
Date: Wed, 14 Oct 2020 12:22:05 -0600
Subject: [PATCH] Change cloud.provider from googlecloud to gcp (#21775)
 (#21811)

(cherry picked from commit de88c5515fa2d1ea2dd348bf3578a51154040128)
---
 CHANGELOG.next.asciidoc                       |  1 +
 .../googlecloud/metrics/_meta/data.json       | 21 +++++++++++++------
 .../timeseries_metadata_collector.go          |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index d942faa20c09..029b62f37114 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -108,6 +108,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - Fix ECS compliance of user.id field in system/users  metricset {pull}19019[19019]
 - Rename googlecloud stackdriver metricset to metrics. {pull}19718[19718]
 - Remove "invalid zero" metrics on Windows and Darwin, don't report linux-only memory and diskio metrics when running under agent. {pull}21457[21457]
+- Change cloud.provider from googlecloud to gcp. {pull}21775[21775]
 - API address and shard ID are required settings in the Cloud Foundry module. {pull}21759[21759]
 
 *Packetbeat*
diff --git a/x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json b/x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json
index c14017dd7df1..43fb0505dc30 100644
--- a/x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json
+++ b/x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json
@@ -2,15 +2,20 @@
     "@timestamp": "2017-10-12T08:05:34.853Z",
     "cloud": {
         "account": {
-            "id": "elastic-apm"
+            "id": "elastic-observability",
+            "name": "elastic-observability"
         },
         "instance": {
-            "id": "8867356942891823986",
-            "name": "apm-ui-dev"
+            "id": "2029454349697438698",
+            "name": "nchaulet-loadtest-elasticsearch"
         },
-        "provider": "googlecloud"
+        "machine": {
+            "type": "n1-standard-8"
+        },
+        "provider": "gcp"
     },
-    "cloud.availability_zone": "europe-west4-a",
+    "cloud.availability_zone": "us-central1-a",
+    "cloud.region": "us-central1",
     "event": {
         "dataset": "googlecloud.metrics",
         "duration": 115000,
@@ -21,11 +26,15 @@
         "metrics": {
             "instance": {
                 "uptime": {
-                    "value": 60
+                    "value": 60.00000000093132
                 }
             }
         }
     },
+    "host": {
+        "id": "2029454349697438698",
+        "name": "nchaulet-loadtest-elasticsearch"
+    },
     "metricset": {
         "name": "metrics",
         "period": 10000
diff --git a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go b/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go
index d309d78714b1..75441e53853f 100644
--- a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go
+++ b/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go
@@ -58,7 +58,7 @@ func (s *StackdriverTimeSeriesMetadataCollector) Metadata(ctx context.Context, i
 				ECSCloudAccountID:   accountID,
 				ECSCloudAccountName: accountID,
 			},
-			ECSCloudProvider: "googlecloud",
+			ECSCloudProvider: "gcp",
 		},
 	}