From 5bddfcf5105831da67a56bad9a06d92b1895213d Mon Sep 17 00:00:00 2001 From: Ishleen Kaur Date: Fri, 22 Sep 2023 11:46:05 +0530 Subject: [PATCH 1/4] Add the ignore_missing and null checks to rename processor --- packages/aws/changelog.yml | 5 +++++ .../elasticsearch/ingest_pipeline/default.yml | 3 ++- .../guardduty/elasticsearch/ingest_pipeline/default.yml | 1 + .../inspector/elasticsearch/ingest_pipeline/default.yml | 1 + .../elasticsearch/ingest_pipeline/default.yml | 1 + .../elasticsearch/ingest_pipeline/default.yml | 1 + packages/aws/manifest.yml | 2 +- 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml index 4127f05d915..8d53113b194 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.2.2" + changes: + - description: Add null checks and ignore_missing checks to the rename processor + type: bugfix + link: https://github.com/elastic/integrations/pull/1234 - version: "2.2.1" changes: - description: Fix GuardDuty API call parameter. diff --git a/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml index af22902c87e..c39a8cbe993 100644 --- a/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml @@ -8,7 +8,8 @@ processors: - set: field: event.original copy_from: message - override: false + ignore_missing: true + if: 'ctx.event?.original == null' - set: field: cloud.provider value: aws diff --git a/packages/aws/data_stream/guardduty/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/guardduty/elasticsearch/ingest_pipeline/default.yml index ce55dee867b..1442863a9b6 100644 --- a/packages/aws/data_stream/guardduty/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/guardduty/elasticsearch/ingest_pipeline/default.yml @@ -14,6 +14,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/aws/data_stream/inspector/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/inspector/elasticsearch/ingest_pipeline/default.yml index d8dfd4998f6..7bc529093af 100644 --- a/packages/aws/data_stream/inspector/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/inspector/elasticsearch/ingest_pipeline/default.yml @@ -14,6 +14,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/aws/data_stream/securityhub_findings/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/securityhub_findings/elasticsearch/ingest_pipeline/default.yml index 33c2631f50d..a57c1a36708 100644 --- a/packages/aws/data_stream/securityhub_findings/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/securityhub_findings/elasticsearch/ingest_pipeline/default.yml @@ -14,6 +14,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/aws/data_stream/securityhub_insights/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/securityhub_insights/elasticsearch/ingest_pipeline/default.yml index 05a354c5398..43888c7671b 100644 --- a/packages/aws/data_stream/securityhub_insights/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/securityhub_insights/elasticsearch/ingest_pipeline/default.yml @@ -14,6 +14,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml index 9a308134d08..ff8671b694b 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: 2.2.1 +version: 2.2.2 license: basic description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent. type: integration From 5d2632c4cddf88c60af841b1579b9e6ff4d55f80 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur Date: Fri, 22 Sep 2023 11:50:25 +0530 Subject: [PATCH 2/4] update changelog: PR ID --- 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 8d53113b194..9307ba71acd 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Add null checks and ignore_missing checks to the rename processor type: bugfix - link: https://github.com/elastic/integrations/pull/1234 + link: https://github.com/elastic/integrations/pull/7933 - version: "2.2.1" changes: - description: Fix GuardDuty API call parameter. From 540ed5d83bd4b928e91760e3cfcdc93d49eb809d Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:07:32 +0530 Subject: [PATCH 3/4] Update default.yml --- .../cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml b/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml index c39a8cbe993..d5b4b356a3a 100644 --- a/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml +++ b/packages/aws/data_stream/cloudwatch_logs/elasticsearch/ingest_pipeline/default.yml @@ -8,7 +8,7 @@ processors: - set: field: event.original copy_from: message - ignore_missing: true + ignore_empty_value: true if: 'ctx.event?.original == null' - set: field: cloud.provider From 3878b466b1a81976c8870dfc383ca5f8c1eded43 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:52:33 +0530 Subject: [PATCH 4/4] Update manifest.yml --- packages/aws/manifest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml index aaa26eca4c1..e6156404472 100644 --- a/packages/aws/manifest.yml +++ b/packages/aws/manifest.yml @@ -2,7 +2,6 @@ format_version: 3.0.0 name: aws title: AWS version: 2.8.2 -license: basic description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent. type: integration categories: