Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cloud.account.id into add_cloud_metadata for gcp #21776

Merged
merged 4 commits into from
Oct 15, 2020
Merged

Add cloud.account.id into add_cloud_metadata for gcp #21776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
feec70a
Add cloud.account.id into add_cloud_metadata for gcp
kaiyan-sheng Oct 13, 2020
3ff9bf6
add changelog
kaiyan-sheng Oct 13, 2020
6bddd20
Merge remote-tracking branch 'upstream/master' into add_account_info
kaiyan-sheng Oct 14, 2020
df9a217
Merge remote-tracking branch 'upstream/master' into add_account_info
kaiyan-sheng Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add istiod metricset. {pull}21519[21519]
- Release `add_cloudfoundry_metadata` as GA. {pull}21525[21525]
- Add support for OpenStack SSL metadata APIs in `add_cloud_metadata`. {pull}21590[21590]
- Add cloud.account.id for GCP into add_cloud_metadata processor. {pull}21776[21776]
- Add proxy metricset for istio module. {pull}21751[21751]

*Auditbeat*
Expand Down
3 changes: 3 additions & 0 deletions libbeat/processors/add_cloud_metadata/provider_google_gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ var gceMetadataFetcher = provider{
"project": s.Object{
"id": c.Str("projectId"),
},
"account": s.Object{
"id": c.Str("projectId"),
},
}.ApplyTo(out, project)
}

Expand Down
3 changes: 3 additions & 0 deletions libbeat/processors/add_cloud_metadata/provider_google_gce_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ func TestRetrieveGCEMetadata(t *testing.T) {

expected := common.MapStr{
"cloud": common.MapStr{
"account": common.MapStr{
"id": "test-dev",
},
"provider": "gcp",
"instance": common.MapStr{
"id": "3910564293633576924",
Expand Down