From f430b46e3543e4534071ee7cab4eef37e0942d4c Mon Sep 17 00:00:00 2001
From: kaiyan-sheng <kaiyan.sheng@elastic.co>
Date: Wed, 8 Sep 2021 12:53:23 -0600
Subject: [PATCH 1/2] Fix aws.billing.EstimatedCharges field name

---
 packages/aws/changelog.yml                    |  4 +++
 .../aws/data_stream/billing/fields/fields.yml |  2 +-
 .../aws/data_stream/billing/sample_event.json | 32 +++++++++++------
 packages/aws/docs/billing.md                  | 34 +++++++++++++------
 packages/aws/manifest.yml                     |  2 +-
 5 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml
index 74e172ca4f4..805002921ad 100644
--- a/packages/aws/changelog.yml
+++ b/packages/aws/changelog.yml
@@ -1,4 +1,8 @@
 # newer versions go on top
+- version: "0.10.6"
+  changes:
+    - description: Fix aws.billing.EstimatedCharges field name
+      type: bugfix
 - version: "0.10.5"
   changes:
     - description: Add event.created field
diff --git a/packages/aws/data_stream/billing/fields/fields.yml b/packages/aws/data_stream/billing/fields/fields.yml
index 5b3ee582a6e..b91f8f3645e 100644
--- a/packages/aws/data_stream/billing/fields/fields.yml
+++ b/packages/aws/data_stream/billing/fields/fields.yml
@@ -4,7 +4,7 @@
     - name: billing
       type: group
       fields:
-        - name: EstimatedCharges.max
+        - name: EstimatedCharges
           type: long
           description: Maximum estimated charges for AWS acccount.
         - name: Currency
diff --git a/packages/aws/data_stream/billing/sample_event.json b/packages/aws/data_stream/billing/sample_event.json
index 0a252492f01..832bb00231c 100644
--- a/packages/aws/data_stream/billing/sample_event.json
+++ b/packages/aws/data_stream/billing/sample_event.json
@@ -22,17 +22,29 @@
     },
     "aws": {
         "billing": {
-            "metrics": {
-                "EstimatedCharges": {
-                    "max": 1625.41
-                }
+            "Currency": "USD",
+            "EstimatedCharges": 39.26,
+            "ServiceName": "AmazonEKS",
+            "AmortizedCost": {
+                "amount": 51.6,
+                "unit": "USD"
+            },
+            "BlendedCost": {
+                "amount": 51.6,
+                "unit": "USD"
+            },
+            "NormalizedUsageAmount": {
+                "amount": 672,
+                "unit": "N/A"
+            },
+            "UnblendedCost": {
+                "amount": 51.6,
+                "unit": "USD"
+            },
+            "UsageQuantity": {
+                "amount": 168,
+                "unit": "N/A"
             }
-        },
-        "cloudwatch": {
-            "namespace": "AWS/Billing"
-        },
-        "dimensions": {
-            "Currency": "USD"
         }
     },
     "service": {
diff --git a/packages/aws/docs/billing.md b/packages/aws/docs/billing.md
index e873417effc..0dc587fbc24 100644
--- a/packages/aws/docs/billing.md
+++ b/packages/aws/docs/billing.md
@@ -29,17 +29,29 @@ An example event for `billing` looks as following:
     },
     "aws": {
         "billing": {
-            "metrics": {
-                "EstimatedCharges": {
-                    "max": 1625.41
-                }
+            "Currency": "USD",
+            "EstimatedCharges": 39.26,
+            "ServiceName": "AmazonEKS",
+            "AmortizedCost": {
+                "amount": 51.6,
+                "unit": "USD"
+            },
+            "BlendedCost": {
+                "amount": 51.6,
+                "unit": "USD"
+            },
+            "NormalizedUsageAmount": {
+                "amount": 672,
+                "unit": "N/A"
+            },
+            "UnblendedCost": {
+                "amount": 51.6,
+                "unit": "USD"
+            },
+            "UsageQuantity": {
+                "amount": 168,
+                "unit": "N/A"
             }
-        },
-        "cloudwatch": {
-            "namespace": "AWS/Billing"
-        },
-        "dimensions": {
-            "Currency": "USD"
         }
     },
     "service": {
@@ -66,7 +78,7 @@ An example event for `billing` looks as following:
 | aws.billing.BlendedCost.amount | Blended cost amount. | double |
 | aws.billing.BlendedCost.unit | Blended cost unit. | keyword |
 | aws.billing.Currency | Currency name. | keyword |
-| aws.billing.EstimatedCharges.max | Maximum estimated charges for AWS acccount. | long |
+| aws.billing.EstimatedCharges | Maximum estimated charges for AWS acccount. | long |
 | aws.billing.NormalizedUsageAmount.amount | Normalized usage amount. | double |
 | aws.billing.NormalizedUsageAmount.unit | Normalized usage amount unit. | keyword |
 | aws.billing.ServiceName | AWS service name. | keyword |
diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
index 34f45ac6526..b968dc03356 100644
--- a/packages/aws/manifest.yml
+++ b/packages/aws/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: aws
 title: AWS
-version: 0.10.5
+version: 0.10.6
 license: basic
 description: This integration collects logs and metrics from Amazon Web Services (AWS)
 type: integration

From 258817cfd199634a26ab133ece6a6e6f9c9aa6b4 Mon Sep 17 00:00:00 2001
From: kaiyan-sheng <kaiyan.sheng@elastic.co>
Date: Wed, 8 Sep 2021 13:00:50 -0600
Subject: [PATCH 2/2] add changelog

---
 packages/aws/changelog.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml
index 805002921ad..5b82dfe54ff 100644
--- a/packages/aws/changelog.yml
+++ b/packages/aws/changelog.yml
@@ -3,6 +3,7 @@
   changes:
     - description: Fix aws.billing.EstimatedCharges field name
       type: bugfix
+      link: https://github.com/elastic/integrations/pull/1606
 - version: "0.10.5"
   changes:
     - description: Add event.created field