Add cloud.account.id into add_cloud_metadata for gcp (#21776) (#21868)

(cherry picked from commit 325ee32)
elastic · Oct 19, 2020 · f556a8a · f556a8a
1 parent 9ef6bd8
commit f556a8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -530,6 +530,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - 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*

diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce.go b/libbeat/processors/add_cloud_metadata/provider_google_gce.go
@@ -69,6 +69,9 @@ var gceMetadataFetcher = provider{
 					"project": s.Object{
 						"id": c.Str("projectId"),
 					},
+					"account": s.Object{
+						"id": c.Str("projectId"),
+					},
 				}.ApplyTo(out, project)
 			}
 

diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go b/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go
@@ -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",