[7.16](backport #29106) Fix rds metadata in cloudwatch metricset (#29129)

mergify[bot] · kaiyan-sheng · web-flow · commit d490c1ca002c · 2021-11-24T14:54:22.000-07:00
* Fix rds metadata in cloudwatch metricset (#29106) (cherry picked from commit 5594923) * Update CHANGELOG.next.asciidoc Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -212,6 +212,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Groups same timestamp metric values to one event in the app_insights metricset. {pull}20403[20403]
 - `beat` module respects `basepath` config option. {pull}28162[28162]
 - Fix list_docker.go {pull}28374[28374]
+- 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`	`}`