From c0713259b6c4ace42629ac57c9ffaae736a0b84e Mon Sep 17 00:00:00 2001
From: kaiyan-sheng <kaiyan.sheng@elastic.co>
Date: Mon, 26 Aug 2024 14:44:19 -0600
Subject: [PATCH 1/2] Eliminate dimensions fingerprint for AWS integration

---
 .../elasticsearch/ingest_pipeline/default.yml         | 11 -----------
 .../cloudwatch_metrics/fields/package-fields.yml      | 10 +++-------
 packages/aws/docs/cloudwatch.md                       |  3 +--
 3 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 packages/aws/data_stream/cloudwatch_metrics/elasticsearch/ingest_pipeline/default.yml

diff --git a/packages/aws/data_stream/cloudwatch_metrics/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/cloudwatch_metrics/elasticsearch/ingest_pipeline/default.yml
deleted file mode 100644
index ee7ddcca0dc..00000000000
--- a/packages/aws/data_stream/cloudwatch_metrics/elasticsearch/ingest_pipeline/default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-description: "Pipeline for AWS CloudWatch metrics"
-processors:
-  - fingerprint:
-      fields: ["aws.dimensions"]
-      target_field: 'aws.dimensions_fingerprint'
-      ignore_missing: true
-on_failure:
-  - set:
-      field: error.message
-      value: "{{ _ingest.on_failure_message }}"
diff --git a/packages/aws/data_stream/cloudwatch_metrics/fields/package-fields.yml b/packages/aws/data_stream/cloudwatch_metrics/fields/package-fields.yml
index 3686533ed80..75838299b2e 100644
--- a/packages/aws/data_stream/cloudwatch_metrics/fields/package-fields.yml
+++ b/packages/aws/data_stream/cloudwatch_metrics/fields/package-fields.yml
@@ -5,15 +5,11 @@
       type: flattened
       description: |
         Tag key value pairs from aws resources.
-    - name: dimensions
-      type: flattened
-      description: |
-        Metric dimensions.
-    - name: dimensions_fingerprint
+    - name: dimensions.*
       type: keyword
-      description: |
-        Autogenerated ID representing the fingerprint of the aws.dimensions object
       dimension: true
+      description: |
+        Metric dimensions.
 - name: 'aws.*.metrics.*.*'
   type: object
   object_type: double
diff --git a/packages/aws/docs/cloudwatch.md b/packages/aws/docs/cloudwatch.md
index 9d20452aed1..1072af89bd4 100644
--- a/packages/aws/docs/cloudwatch.md
+++ b/packages/aws/docs/cloudwatch.md
@@ -183,8 +183,7 @@ Please refer to the following [document](https://www.elastic.co/guide/en/ecs/cur
 | agent.id | Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id. | keyword |  |
 | aws.\*.metrics.\*.\* | Metrics that returned from Cloudwatch API query. | object | gauge |
 | aws.cloudwatch.namespace | The namespace specified when query cloudwatch api. | keyword |  |
-| aws.dimensions | Metric dimensions. | flattened |  |
-| aws.dimensions_fingerprint | Autogenerated ID representing the fingerprint of the aws.dimensions object | keyword |  |
+| aws.dimensions.\* | Metric dimensions. | keyword |  |
 | aws.tags | Tag key value pairs from aws resources. | flattened |  |
 | cloud.account.id | The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier. | keyword |  |
 | cloud.image.id | Image ID for the cloud instance. | keyword |  |

From a6e9ec7efed1cc336354fa22dccfc7eab5050703 Mon Sep 17 00:00:00 2001
From: kaiyan-sheng <kaiyan.sheng@elastic.co>
Date: Mon, 26 Aug 2024 14:48:01 -0600
Subject: [PATCH 2/2] add changelog

---
 packages/aws/changelog.yml | 5 +++++
 packages/aws/manifest.yml  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml
index 310f6d39b85..92e82207fd2 100644
--- a/packages/aws/changelog.yml
+++ b/packages/aws/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "2.25.0"
+  changes:
+    - description: Remove dimensions fingerprint.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/10890
 - version: "2.24.0"
   changes:
     - description: Add dot_expander processor into metrics ingest pipeline.
diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
index 965d8014607..12145bf7499 100644
--- a/packages/aws/manifest.yml
+++ b/packages/aws/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 3.0.0
 name: aws
 title: AWS
-version: 2.24.0
+version: 2.25.0
 description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent.
 type: integration
 categories: