Skip to content

Commit fe0649d

Browse files
authored
Change cloud.provider from googlecloud to gcp (elastic#21775) (elastic#21811)
(cherry picked from commit de88c55)
1 parent fa3ac1c commit fe0649d

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ field. You can revert this change by configuring tags for the module and omittin
108108
- Fix ECS compliance of user.id field in system/users metricset {pull}19019[19019]
109109
- Rename googlecloud stackdriver metricset to metrics. {pull}19718[19718]
110110
- Remove "invalid zero" metrics on Windows and Darwin, don't report linux-only memory and diskio metrics when running under agent. {pull}21457[21457]
111+
- Change cloud.provider from googlecloud to gcp. {pull}21775[21775]
111112
- API address and shard ID are required settings in the Cloud Foundry module. {pull}21759[21759]
112113

113114
*Packetbeat*

x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22
"@timestamp": "2017-10-12T08:05:34.853Z",
33
"cloud": {
44
"account": {
5-
"id": "elastic-apm"
5+
"id": "elastic-observability",
6+
"name": "elastic-observability"
67
},
78
"instance": {
8-
"id": "8867356942891823986",
9-
"name": "apm-ui-dev"
9+
"id": "2029454349697438698",
10+
"name": "nchaulet-loadtest-elasticsearch"
1011
},
11-
"provider": "googlecloud"
12+
"machine": {
13+
"type": "n1-standard-8"
14+
},
15+
"provider": "gcp"
1216
},
13-
"cloud.availability_zone": "europe-west4-a",
17+
"cloud.availability_zone": "us-central1-a",
18+
"cloud.region": "us-central1",
1419
"event": {
1520
"dataset": "googlecloud.metrics",
1621
"duration": 115000,
@@ -21,11 +26,15 @@
2126
"metrics": {
2227
"instance": {
2328
"uptime": {
24-
"value": 60
29+
"value": 60.00000000093132
2530
}
2631
}
2732
}
2833
},
34+
"host": {
35+
"id": "2029454349697438698",
36+
"name": "nchaulet-loadtest-elasticsearch"
37+
},
2938
"metricset": {
3039
"name": "metrics",
3140
"period": 10000

x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (s *StackdriverTimeSeriesMetadataCollector) Metadata(ctx context.Context, i
5858
ECSCloudAccountID: accountID,
5959
ECSCloudAccountName: accountID,
6060
},
61-
ECSCloudProvider: "googlecloud",
61+
ECSCloudProvider: "gcp",
6262
},
6363
}
6464

0 commit comments

Comments
 (0)