fix ecs cloud region and AZ bug

Scholar-Li · Aug 15, 2023 · 349bf6b · 349bf6b
1 parent 89f6ab5
commit 349bf6b
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/x-pack/metricbeat/module/gcp/timeseries_metadata_collector.go b/x-pack/metricbeat/module/gcp/timeseries_metadata_collector.go
@@ -51,23 +51,25 @@ func (s *StackdriverTimeSeriesMetadataCollector) Metadata(ctx context.Context, i
 		accountID = in.Resource.Labels[TimeSeriesResponsePathForECSAccountID]
 	}
 
-	ecs := mapstr.M{
-		ECSCloud: mapstr.M{
-			ECSCloudAccount: mapstr.M{
-				ECSCloudAccountID:   accountID,
-				ECSCloudAccountName: accountID,
-			},
-			ECSCloudProvider: "gcp",
+	ecsCloud := mapstr.M{
+		ECSCloudAccount: mapstr.M{
+			ECSCloudAccountID:   accountID,
+			ECSCloudAccountName: accountID,
 		},
+		ECSCloudProvider: "gcp",
+	}
+
+	ecs := mapstr.M{
+		ECSCloud: ecsCloud,
 	}
 
 	if availabilityZone != "" {
-		ecs[ECSCloud+"."+ECSCloudAvailabilityZone] = availabilityZone
+		_, _ = ecsCloud.Put(ECSCloudAvailabilityZone, availabilityZone)
 
 		// Get region name from availability zone name
 		region := getRegionName(availabilityZone)
 		if region != "" {
-			ecs[ECSCloud+"."+ECSCloudRegion] = region
+			_, _ = ecsCloud.Put(ECSCloudRegion, region)
 		}
 	}