Change cloud.provider from googlecloud to gcp in billing metricset (#22287)

kaiyan-sheng · web-flow · commit f23f05a33fb5 · 2020-10-30T07:26:39.000-06:00
diff --git a/x-pack/metricbeat/module/googlecloud/billing/_meta/data.json b/x-pack/metricbeat/module/googlecloud/billing/_meta/data.json
@@ -1,12 +1,8 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "cloud": {
-        "account": {
-            "id": "elastic-bi",
-            "name": "elastic-bi"
-        },
-        "provider": "googlecloud"
-    },
+    "cloud.account.id": "elastic-bi",
+    "cloud.account.name": "elastic-bi",
+    "cloud.provider": "gcp",
     "event": {
         "dataset": "googlecloud.billing",
         "duration": 115000,
@@ -15,9 +11,9 @@
     "googlecloud": {
         "billing": {
             "cost_type": "regular",
-            "invoice_month": "202008",
+            "invoice_month": "202010",
             "project_id": "elastic-fin-bi",
-            "total": 170.811692
+            "total": 77.897328
         }
     },
     "metricset": {
diff --git a/x-pack/metricbeat/module/googlecloud/billing/billing.go b/x-pack/metricbeat/module/googlecloud/billing/billing.go
@@ -278,7 +278,7 @@ func createEvents(rowItems []bigquery.Value, accountID string) mb.Event {
 	}
 
 	event.RootFields = common.MapStr{
-		"cloud.provider":     "googlecloud",
+		"cloud.provider":     "gcp",
 		"cloud.account.id":   accountID,
 		"cloud.account.name": accountID,
 	}

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ func createEvents(rowItems []bigquery.Value, accountID string) mb.Event {`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`event.RootFields = common.MapStr{`
`281`		`- "cloud.provider": "googlecloud",`
	`281`	`+ "cloud.provider": "gcp",`
`282`	`282`	`"cloud.account.id": accountID,`
`283`	`283`	`"cloud.account.name": accountID,`
`284`	`284`	`}`