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

…22287) (#22312) (cherry picked from commit f23f05a)
elastic · Oct 30, 2020 · 66d99f7 · 66d99f7
1 parent 172066a
commit 66d99f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
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,
  }