From 10ad3934526afae88988b0ccaf853f95e5a0a2f5 Mon Sep 17 00:00:00 2001
From: Rajvi Patel <124889398+rajvi-elastic@users.noreply.github.com>
Date: Wed, 31 May 2023 10:31:49 +0530
Subject: [PATCH] [O11y][AWS] Fix Incorrect fields in AWS Metrics Overview
 dashboard  (#6353)

* Fix incorrect fields on multiple visualizations

* Update changelog

* Remove comment from changelog
---
 packages/aws/changelog.yml                       |  8 ++++----
 .../aws/data_stream/kinesis/fields/fields.yml    |  2 --
 ...aws-fac28650-7349-11e9-816b-07687310a99a.json | 16 ++++++++--------
 packages/aws/manifest.yml                        |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml
index 9bf6d87f773..4b6d736c353 100644
--- a/packages/aws/changelog.yml
+++ b/packages/aws/changelog.yml
@@ -1,9 +1,9 @@
 # newer versions go on top
-- version: "1.38.0"
+- version: "1.37.3"
   changes:
-    - description: TSDB Enabled for AWS Redshift.
-      type: enhancement
-      link: https://github.com/elastic/integrations/pull/0
+    - description: Fix incorrect fields on multiple visualizations.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/6353
 - version: "1.37.2"
   changes:
     - description: Migrate AWS RDS metrics dashboard to lenses.
diff --git a/packages/aws/data_stream/kinesis/fields/fields.yml b/packages/aws/data_stream/kinesis/fields/fields.yml
index 3b36d827f3a..2b1708d57eb 100644
--- a/packages/aws/data_stream/kinesis/fields/fields.yml
+++ b/packages/aws/data_stream/kinesis/fields/fields.yml
@@ -8,7 +8,6 @@
           dimension: true
           type: keyword
           description: The name of the Kinesis stream. All available statistics are filtered by StreamName.
-
     - name: kinesis.metrics
       type: group
       fields:
@@ -90,7 +89,6 @@
           description: >
             The total number of PutRecords operations where at least one record succeeded, per Kinesis stream, measured over the specified time period.
 
-
         - name: PutRecords_TotalRecords.sum
           type: long
           metric_type: gauge
diff --git a/packages/aws/kibana/dashboard/aws-fac28650-7349-11e9-816b-07687310a99a.json b/packages/aws/kibana/dashboard/aws-fac28650-7349-11e9-816b-07687310a99a.json
index 1e707158482..ac2b02cc5e2 100644
--- a/packages/aws/kibana/dashboard/aws-fac28650-7349-11e9-816b-07687310a99a.json
+++ b/packages/aws/kibana/dashboard/aws-fac28650-7349-11e9-816b-07687310a99a.json
@@ -199,7 +199,7 @@
                                     "line_width": 1,
                                     "metrics": [
                                         {
-                                            "field": "aws.ec2.cpu.total.pct",
+                                            "field": "host.cpu.usage",
                                             "id": "61ca57f2-469d-11e7-af02-69e470af7417",
                                             "type": "avg"
                                         }
@@ -636,7 +636,7 @@
                                     "line_width": 1,
                                     "metrics": [
                                         {
-                                            "field": "aws.elb.metrics.Latency",
+                                            "field": "aws.elb.metrics.Latency.avg",
                                             "id": "61ca57f2-469d-11e7-af02-69e470af7417",
                                             "type": "avg"
                                         }
@@ -713,7 +713,7 @@
                                     "line_width": 1,
                                     "metrics": [
                                         {
-                                            "field": "aws.elb.metrics.UnHealthyHostCount",
+                                            "field": "aws.elb.metrics.UnHealthyHostCount.max",
                                             "id": "61ca57f2-469d-11e7-af02-69e470af7417",
                                             "type": "sum"
                                         }
@@ -789,7 +789,7 @@
                                     "line_width": 1,
                                     "metrics": [
                                         {
-                                            "field": "aws.lambda.metrics.Invocations",
+                                            "field": "aws.lambda.metrics.Invocations.avg",
                                             "id": "61ca57f2-469d-11e7-af02-69e470af7417",
                                             "type": "avg"
                                         }
@@ -1017,12 +1017,12 @@
                                     "line_width": 1,
                                     "metrics": [
                                         {
-                                            "field": "aws.ecs.metrics.CPUUtilization",
+                                            "field": "aws.ecs.metrics.CPUUtilization.avg",
                                             "id": "17f8ddf0-830d-11e9-9f3d-ed346f48a007",
                                             "type": "sum"
                                         },
                                         {
-                                            "field": "aws.ecs.metrics.CPUReservation",
+                                            "field": "aws.ecs.metrics.CPUReservation.avg",
                                             "id": "61ca57f2-469d-11e7-af02-69e470af7417",
                                             "type": "sum"
                                         },
@@ -1114,12 +1114,12 @@
                                     "line_width": 1,
                                     "metrics": [
                                         {
-                                            "field": "aws.ecs.metrics.MemoryUtilization",
+                                            "field": "aws.ecs.metrics.MemoryUtilization.avg",
                                             "id": "17f8ddf0-830d-11e9-9f3d-ed346f48a007",
                                             "type": "sum"
                                         },
                                         {
-                                            "field": "aws.ecs.metrics.MemoryReservation",
+                                            "field": "aws.ecs.metrics.MemoryReservation.avg",
                                             "id": "61ca57f2-469d-11e7-af02-69e470af7417",
                                             "type": "sum"
                                         },
diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
index 8b26f0e82e3..7a05bd76ffd 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: 1.37.2
+version: 1.37.3
 license: basic
 description: Collect logs and metrics from Amazon Web Services with Elastic Agent.
 type: integration