Fix rds metadata in cloudwatch metricset (#29106) (#29130)

(cherry picked from commit 5594923) Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
elastic · Nov 24, 2021 · dd47e88 · dd47e88
1 parent 6b4dc96
commit dd47e88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -244,6 +244,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - `beat` module respects `basepath` config option. {pull}28162[28162]
 - Fix list_docker.go {pull}28374[28374]
 - 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
 }