elastic · kaiyan-sheng · Dec 6, 2019 · Nov 26, 2019 · Dec 2, 2019 · Dec 2, 2019
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -532,6 +532,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release kubernetes modules `controllermanager`, `scheduler`, `proxy`, `state_cronjob` and `state_resourcequota` as GA. {pull}14584[14584]
 - Add module for ActiveMQ. {pull}14580[14580]
 - Enable script processor. {pull}14711[14711]
+- Add billing metricset in aws modules. {pull}14801[14801] {issue}14934[14934]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -1541,6 +1541,12 @@ type: keyword
 
 --
 
+[float]
+=== billing
+
+`billing` contains the estimated charges for your AWS account in Cloudwatch.
+
+
 [float]
 === cloudwatch
 

diff --git a/metricbeat/docs/images/metricbeat-aws-billing-overview.png b/metricbeat/docs/images/metricbeat-aws-billing-overview.png
diff --git a/metricbeat/docs/modules/aws.asciidoc b/metricbeat/docs/modules/aws.asciidoc
@@ -149,6 +149,8 @@ metricbeat.modules:
 
 The following metricsets are available:
 
+* <<metricbeat-metricset-aws-billing,billing>>
+
 * <<metricbeat-metricset-aws-cloudwatch,cloudwatch>>
 
 * <<metricbeat-metricset-aws-ebs,ebs>>
@@ -165,6 +167,8 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-aws-sqs,sqs>>
 
+include::aws/billing.asciidoc[]
+
 include::aws/cloudwatch.asciidoc[]
 
 include::aws/ebs.asciidoc[]

diff --git a/metricbeat/docs/modules/aws/billing.asciidoc b/metricbeat/docs/modules/aws/billing.asciidoc
@@ -0,0 +1,24 @@
+////
+This file is generated! See scripts/mage/docs_collector.go
+////
+
+[[metricbeat-metricset-aws-billing]]
+=== aws billing metricset
+
+beta[]
+
+include::../../../../x-pack/metricbeat/module/aws/billing/_meta/docs.asciidoc[]
+
+This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-aws,exported fields>> section.
+
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../../x-pack/metricbeat/module/aws/billing/_meta/data.json[]
+----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -16,7 +16,8 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-module-appsearch,App Search>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-appsearch-stats,stats>> beta[]  
 |<<metricbeat-module-aws,aws>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.8+| .8+|  |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>>   
+.9+| .9+|  |<<metricbeat-metricset-aws-billing,billing>> beta[]  
+|<<metricbeat-metricset-aws-cloudwatch,cloudwatch>>   
 |<<metricbeat-metricset-aws-ebs,ebs>>   
 |<<metricbeat-metricset-aws-ec2,ec2>>   
 |<<metricbeat-metricset-aws-elb,elb>> beta[]
-Original file line number
+Diff line change
@@ Expand Up / @@ -1541,6 +1541,12 @@ type: keyword @@
     --
+    [float]
+    === billing
+    `billing` contains the estimated charges for your AWS account in Cloudwatch.
     [float]
     === cloudwatch
@@ Expand Down @@