From 760ccd8843ea15bb53c2c796ecd1b947a9d6d649 Mon Sep 17 00:00:00 2001 From: alex prozorov Date: Thu, 18 Jun 2026 12:54:54 +0300 Subject: [PATCH 1/2] Remove host.id assignment from target host entities --- packages/aws/changelog.yml | 5 +++++ .../pipeline/test-get-password-data-json.log-expected.json | 1 - .../test-send-command-targets-json.log-expected.json | 1 - ...send-serial-console-ssh-public-key-json.log-expected.json | 1 - .../pipeline/test-send-ssh-public-key-json.log-expected.json | 1 - .../test/pipeline/test-start-session-json.log-expected.json | 1 - .../cloudtrail/elasticsearch/ingest_pipeline/default.yml | 1 - packages/aws/manifest.yml | 2 +- 8 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml index dff3faf7548..8c872230a8f 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "6.20.1" + changes: + - description: Remove assignment of host.id from CloudTrail target hosts + type: bugfix + link: https://github.com/elastic/integrations/issues/19628 - version: "6.20.0" changes: - description: Enable agentless deployment mode for CloudWatch, EBS, EC2, ECS, and S3 policy templates. diff --git a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-get-password-data-json.log-expected.json b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-get-password-data-json.log-expected.json index 487cd8c32a6..4909a003f31 100644 --- a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-get-password-data-json.log-expected.json +++ b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-get-password-data-json.log-expected.json @@ -52,7 +52,6 @@ ] }, "host": { - "id": "i-003e90a87a9e72f06", "target": { "entity": { "id": [ diff --git a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-command-targets-json.log-expected.json b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-command-targets-json.log-expected.json index d92f4e5e375..16364feab59 100644 --- a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-command-targets-json.log-expected.json +++ b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-command-targets-json.log-expected.json @@ -99,7 +99,6 @@ "provider": "ssm.amazonaws.com" }, "host": { - "id": "i-0ddf9acf8eeb33959", "target": { "entity": { "id": [ diff --git a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-serial-console-ssh-public-key-json.log-expected.json b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-serial-console-ssh-public-key-json.log-expected.json index 2bab124fe27..58a402392fe 100644 --- a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-serial-console-ssh-public-key-json.log-expected.json +++ b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-serial-console-ssh-public-key-json.log-expected.json @@ -60,7 +60,6 @@ ] }, "host": { - "id": "i-097069fd5068721f3", "target": { "entity": { "id": [ diff --git a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-ssh-public-key-json.log-expected.json b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-ssh-public-key-json.log-expected.json index 171aeb9a449..6661d39b0df 100644 --- a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-ssh-public-key-json.log-expected.json +++ b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-send-ssh-public-key-json.log-expected.json @@ -60,7 +60,6 @@ ] }, "host": { - "id": "i-097069fd5068721f3", "target": { "entity": { "id": [ diff --git a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-start-session-json.log-expected.json b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-start-session-json.log-expected.json index 6eff78cea5c..644a5d710a8 100644 --- a/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-start-session-json.log-expected.json +++ b/packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-start-session-json.log-expected.json @@ -55,7 +55,6 @@ ] }, "host": { - "id": "i-1234567890abcdef0", "target": { "entity": { "id": [ diff --git a/packages/aws/data_stream/cloudtrail/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/cloudtrail/elasticsearch/ingest_pipeline/default.yml index a9cec976b2e..1a3f8f9e766 100644 --- a/packages/aws/data_stream/cloudtrail/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/cloudtrail/elasticsearch/ingest_pipeline/default.yml @@ -935,7 +935,6 @@ processors: } if (!hostTargets.isEmpty()) { field("host.target.entity.id").set(hostTargets); - field("host.id").set(hostTargets.first()); } if (!serviceTargets.isEmpty()) { field("service.target.entity.id").set(serviceTargets); diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml index e199d0f057d..096974cd57e 100644 --- a/packages/aws/manifest.yml +++ b/packages/aws/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.4.0 name: aws title: AWS -version: 6.20.0 +version: 6.20.1 description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent. type: integration categories: From 8cb2ccb1bbaaf01eeeb178268f4b8210fa9d8f2e Mon Sep 17 00:00:00 2001 From: alex prozorov Date: Thu, 18 Jun 2026 13:09:35 +0300 Subject: [PATCH 2/2] update changelog.yml pr link --- packages/aws/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml index 8c872230a8f..e7052d560b6 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Remove assignment of host.id from CloudTrail target hosts type: bugfix - link: https://github.com/elastic/integrations/issues/19628 + link: https://github.com/elastic/integrations/pull/19630 - version: "6.20.0" changes: - description: Enable agentless deployment mode for CloudWatch, EBS, EC2, ECS, and S3 policy templates.