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

) * 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>
elastic · Nov 24, 2021 · d490c1c · d490c1c
1 parent 8f9d9e8
commit d490c1c
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
@@ -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
 }