Cherry-pick elastic#14702 to 7.x: Fix rds metricset from reporting th…

…e same value for different instances (elastic#14832)

* Fix rds metricset from reporting the same value for different instances (elastic#14702)

* Fix rds metricset from reporting the same value for different instances
* Change cpu.total.pct to be percent (devide by 100)

(cherry picked from commit bd82c06)

* update changelog

CHANGELOG.next.asciidoc

@@ -266,6 +266,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fixed bug with `elasticsearch/cluster_stats` metricset not recording license ID in the correct field. {pull}14592[14592]
 - Vshpere module splits `virtualmachine.host` into `virtualmachine.host.id` and `virtualmachine.host.hostname`. {issue}7187[7187] {pull}7213[7213]
 - Log bulk failures from bulk API requests to monitoring cluster. {issue}14303[14303] {pull}14356[14356]
+- Fix rds metricset from reporting same values for different instances. {pull}14702[14702]
 - Closing handler after verifying the registry key in diskio metricset. {issue}14683[14683] {pull}14759[14759]
 - Fix docker network stats when multiple interfaces are configured. {issue}14586[14586] {pull}14825[14825]
 

metricbeat/docs/fields.asciidoc

@@ -2474,6 +2474,36 @@ type: long
 
 --
 
+*`aws.rds.db_instance.db_cluster_identifier`*::
++
+--
+This identifier is the unique key that identifies a DB cluster specifically for Amazon Aurora DB cluster.
+
+
+type: keyword
+
+--
+
+*`aws.rds.db_instance.role`*::
++
+--
+DB roles like WRITER or READER, specifically for Amazon Aurora DB cluster.
+
+
+type: keyword
+
+--
+
+*`aws.rds.db_instance.engine_name`*::
++
+--
+Each DB instance runs a DB engine, like MySQL, MariaDB, PostgreSQL and etc.
+
+
+type: keyword
+
+--
+
 [float]
 === s3_daily_storage
 

x-pack/metricbeat/module/aws/rds/_meta/fields.yml

@@ -216,3 +216,15 @@
       type: long
       description: >
         The average number of transactions in the database that are blocked per second.
+    - name: db_instance.db_cluster_identifier
+      type: keyword
+      description: >
+        This identifier is the unique key that identifies a DB cluster specifically for Amazon Aurora DB cluster.
+    - name: db_instance.role
+      type: keyword
+      description: >
+        DB roles like WRITER or READER, specifically for Amazon Aurora DB cluster.
+    - name: db_instance.engine_name
+      type: keyword
+      description: >
+        Each DB instance runs a DB engine, like MySQL, MariaDB, PostgreSQL and etc.

x-pack/metricbeat/module/aws/rds/data.go

@@ -69,5 +69,11 @@ var (
 			"blocked": c.Float("BlockedTransactions"),
 		},
 		"login_failures": c.Float("LoginFailures"),
+
+		"db_instance.identifier":            c.Str("DBInstanceIdentifier"),
+		"db_instance.db_cluster_identifier": c.Str("DBClusterIdentifier"),
+		"db_instance.class":                 c.Str("DatabaseClass"),
+		"db_instance.role":                  c.Str("Role"),
+		"db_instance.engine_name":           c.Str("EngineName"),
 	}
 )