Fix rds metadata in cloudwatch metricset (#29106)

kaiyan-sheng · web-flow · commit 559492373b6b · 2021-11-24T09:02:07.000-07:00
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -237,6 +237,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix list_docker.go {pull}28374[28374]
 - Use xpack.enabled on SM modules to write into .monitoring indices when using Metricbeat standalone {pull}28365[28365]
 - Fix in rename processor to ingest metrics for `write.iops` to proper field instead of `write_iops` in rds metricset. {pull}28960[28960]
+- Fix rds metadata in cloudwatch metricset. {pull}29106[29106]
 
 *Packetbeat*
 
diff --git a/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go b/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go
@@ -87,7 +87,8 @@ func getDBInstancesPerRegion(svc rdsiface.ClientAPI) (map[string]*rds.DBInstance
 
 	instancesOutputs := map[string]*rds.DBInstance{}
 	for _, dbInstance := range output.DBInstances {
-		instancesOutputs[*dbInstance.DBInstanceIdentifier] = &dbInstance
+		instance := dbInstance
+		instancesOutputs[*instance.DBInstanceIdentifier] = &instance
 	}
 	return instancesOutputs, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ func getDBInstancesPerRegion(svc rdsiface.ClientAPI) (map[string]*rds.DBInstance`
`87`	`87`
`88`	`88`	`instancesOutputs := map[string]*rds.DBInstance{}`
`89`	`89`	`for _, dbInstance := range output.DBInstances {`
`90`		`- instancesOutputs[*dbInstance.DBInstanceIdentifier] = &dbInstance`
	`90`	`+ instance := dbInstance`
	`91`	`+ instancesOutputs[*instance.DBInstanceIdentifier] = &instance`
`91`	`92`	`}`
`92`	`93`	`return instancesOutputs, nil`
`93`	`94`	`}`