Add null and ignore_missing check to handle event.original field. (#8624

) * Add null and ignore_missing check to handle event.original field.
elastic · Dec 5, 2023 · c28d057 · c28d057
1 parent de067e9
commit c28d057
Show file tree

Hide file tree

Showing 28 changed files with 58 additions and 16 deletions.
diff --git a/packages/activemq/changelog.yml b/packages/activemq/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 0.14.1
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: 0.14.0
   changes:
     - description: Update the package format_version to 3.0.0.

diff --git a/packages/activemq/data_stream/audit/elasticsearch/ingest_pipeline/default.yml b/packages/activemq/data_stream/audit/elasticsearch/ingest_pipeline/default.yml
@@ -15,7 +15,7 @@ processors:
       field: event.original
       value: "{{{message}}}"
       ignore_empty_value: true
-      ignore_failure: true
+      if: 'ctx.event?.original == null'
   - grok:
       field: message
       pattern_definitions:

diff --git a/packages/activemq/data_stream/log/elasticsearch/ingest_pipeline/default.yml b/packages/activemq/data_stream/log/elasticsearch/ingest_pipeline/default.yml
@@ -15,7 +15,7 @@ processors:
       field: event.original
       value: "{{{message}}}"
       ignore_empty_value: true
-      ignore_failure: true
+      if: 'ctx.event?.original == null'
   - grok:
       field: message
       pattern_definitions:

diff --git a/packages/activemq/manifest.yml b/packages/activemq/manifest.yml
@@ -1,6 +1,6 @@
 name: activemq
 title: ActiveMQ
-version: "0.14.0"
+version: "0.14.1"
 description: Collect logs and metrics from ActiveMQ instances with Elastic Agent.
 type: integration
 icons:

diff --git a/packages/coredns/changelog.yml b/packages/coredns/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 0.6.1
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: 0.6.0
   changes:
     - description: Update the package format_version to 3.0.0.

diff --git a/packages/coredns/data_stream/log/elasticsearch/ingest_pipeline/default.yml b/packages/coredns/data_stream/log/elasticsearch/ingest_pipeline/default.yml
@@ -8,6 +8,7 @@ processors:
       field: event.original
       copy_from: message
       ignore_empty_value: true
+      if: 'ctx.event?.original == null'
   - set:
       field: event.created
       copy_from: "@timestamp"

diff --git a/packages/coredns/manifest.yml b/packages/coredns/manifest.yml
@@ -1,7 +1,7 @@
 format_version: "3.0.0"
 name: coredns
 title: "CoreDNS"
-version: "0.6.0"
+version: "0.6.1"
 description: "Collect logs from CoreDNS instances with Elastic Agent."
 type: integration
 categories:

diff --git a/packages/ibmmq/changelog.yml b/packages/ibmmq/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.2.4"
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: "1.2.3"
   changes:
     - description: Remove forwarded tag from metrics data stream.

diff --git a/packages/ibmmq/data_stream/errorlog/elasticsearch/ingest_pipeline/default.yml b/packages/ibmmq/data_stream/errorlog/elasticsearch/ingest_pipeline/default.yml
@@ -89,7 +89,7 @@ processors:
     field: message
     target_field: event.original
     ignore_missing: true
-    ignore_failure: true
+    if: 'ctx.event?.original == null'
 - remove:
     field:
     - log_timestamp

diff --git a/packages/ibmmq/manifest.yml b/packages/ibmmq/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: ibmmq
 title: IBM MQ
-version: "1.2.3"
+version: "1.2.4"
 license: basic
 description: Collect logs and metrics from IBM MQ with Elastic Agent.
 type: integration

diff --git a/packages/mongodb/changelog.yml b/packages/mongodb/changelog.yml
@@ -1,3 +1,8 @@
+- version: 1.12.1
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: 1.12.0
   changes:
     - description: Update the package format_version to 3.0.0.

diff --git a/packages/mongodb/data_stream/log/elasticsearch/ingest_pipeline/pipeline-json.yml b/packages/mongodb/data_stream/log/elasticsearch/ingest_pipeline/pipeline-json.yml
@@ -21,6 +21,8 @@ processors:
 - rename:
     field: message
     target_field: event.original
+    ignore_missing: true
+    if: 'ctx.event?.original == null'
 - rename:
     field: mongodb.log.msg
     target_field: message

diff --git a/packages/mongodb/manifest.yml b/packages/mongodb/manifest.yml
@@ -1,6 +1,6 @@
 name: mongodb
 title: MongoDB
-version: "1.12.0"
+version: "1.12.1"
 description: Collect logs and metrics from MongoDB instances with Elastic Agent.
 type: integration
 categories:

diff --git a/packages/salesforce/changelog.yml b/packages/salesforce/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.12.1"
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: "0.12.0"
   changes:
     - description: Limit request tracer log count to five.

diff --git a/packages/salesforce/data_stream/apex/elasticsearch/ingest_pipeline/default.yml b/packages/salesforce/data_stream/apex/elasticsearch/ingest_pipeline/default.yml
@@ -8,8 +8,8 @@ processors:
 - set:
     field: event.original
     value: '{{{message}}}'
-    ignore_failure: true
     ignore_empty_value: true
+    if: 'ctx.event?.original == null'
 - fingerprint:
     fields:
     - json.REQUEST_ID

diff --git a/packages/salesforce/data_stream/login_rest/elasticsearch/ingest_pipeline/default.yml b/packages/salesforce/data_stream/login_rest/elasticsearch/ingest_pipeline/default.yml
@@ -8,8 +8,8 @@ processors:
 - set:
     field: event.original
     value: '{{{message}}}'
-    ignore_failure: true
     ignore_empty_value: true
+    if: 'ctx.event?.original == null'
 - fingerprint:
     fields:
     - json.REQUEST_ID

diff --git a/packages/salesforce/data_stream/login_stream/elasticsearch/ingest_pipeline/default.yml b/packages/salesforce/data_stream/login_stream/elasticsearch/ingest_pipeline/default.yml
@@ -8,8 +8,8 @@ processors:
 - set:
     field: event.original
     value: '{{{message}}}'
-    ignore_failure: true
     ignore_empty_value: true
+    if: 'ctx.event?.original == null'
 - set:
     field: salesforce.login.access_mode
     value: Stream

diff --git a/packages/salesforce/data_stream/logout_rest/elasticsearch/ingest_pipeline/default.yml b/packages/salesforce/data_stream/logout_rest/elasticsearch/ingest_pipeline/default.yml
@@ -8,8 +8,8 @@ processors:
 - set:
     field: event.original
     value: '{{{message}}}'
-    ignore_failure: true
     ignore_empty_value: true
+    if: 'ctx.event?.original == null'
 - fingerprint:
     fields:
     - json.REQUEST_ID

diff --git a/packages/salesforce/data_stream/logout_stream/elasticsearch/ingest_pipeline/default.yml b/packages/salesforce/data_stream/logout_stream/elasticsearch/ingest_pipeline/default.yml
@@ -9,7 +9,7 @@ processors:
     field: message
     target_field: event.original
     ignore_missing: true
-    ignore_failure: true
+    if: 'ctx.event?.original == null'
 - set:
     field: salesforce.logout.access_mode
     value: Stream

diff --git a/packages/salesforce/data_stream/setupaudittrail/elasticsearch/ingest_pipeline/default.yml b/packages/salesforce/data_stream/setupaudittrail/elasticsearch/ingest_pipeline/default.yml
@@ -9,7 +9,7 @@ processors:
     field: message
     target_field: event.original
     ignore_missing: true
-    ignore_failure: true
+    if: 'ctx.event?.original == null'
 - set:
     field: salesforce.setup_audit_trail.access_mode
     value: "REST"

diff --git a/packages/salesforce/manifest.yml b/packages/salesforce/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 3.0.0
 name: salesforce
 title: Salesforce
-version: "0.12.0"
+version: "0.12.1"
 description: Collect logs from Salesforce with Elastic Agent.
 type: integration
 categories:

diff --git a/packages/spring_boot/changelog.yml b/packages/spring_boot/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.2.1"
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: "1.2.0"
   changes:
     - description: Add support for GC datastream on Spring Boot 2.x with LTS JDK versions 11, 17, and 21.

diff --git a/packages/spring_boot/data_stream/audit_events/elasticsearch/ingest_pipeline/default.yml b/packages/spring_boot/data_stream/audit_events/elasticsearch/ingest_pipeline/default.yml
@@ -8,6 +8,7 @@ processors:
       field: message
       target_field: event.original
       ignore_missing: true
+      if: 'ctx.event?.original == null'
   - set:
       field: event.dataset
       value: spring_boot.audit_events

diff --git a/packages/spring_boot/data_stream/http_trace/elasticsearch/ingest_pipeline/default.yml b/packages/spring_boot/data_stream/http_trace/elasticsearch/ingest_pipeline/default.yml
@@ -8,6 +8,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/spring_boot/manifest.yml b/packages/spring_boot/manifest.yml
@@ -1,7 +1,7 @@
 format_version: "3.0.0"
 name: spring_boot
 title: Spring Boot
-version: "1.2.0"
+version: "1.2.1"
 description: This Elastic integration collects logs and metrics from Spring Boot integration.
 type: integration
 categories:

diff --git a/packages/vsphere/changelog.yml b/packages/vsphere/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.9.2"
+  changes:
+    - description: Add null and ignore_missing check to handle event.original field.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/8624
 - version: 1.9.1
   changes:
     - description: Update the README with limitations in Virtual Machine metrics.

diff --git a/packages/vsphere/data_stream/log/elasticsearch/ingest_pipeline/default.yml b/packages/vsphere/data_stream/log/elasticsearch/ingest_pipeline/default.yml
@@ -7,6 +7,8 @@ processors:
   - rename:
       field: message
       target_field: event.original
+      ignore_missing: true
+      if: 'ctx.event?.original == null'
   - grok:
       description: Parse syslog header
       field: event.original

diff --git a/packages/vsphere/manifest.yml b/packages/vsphere/manifest.yml
@@ -1,7 +1,7 @@
 format_version: "3.0.0"
 name: vsphere
 title: VMware vSphere
-version: "1.9.1"
+version: "1.9.2"
 description: This Elastic integration collects metrics and logs from vSphere/vCenter servers
 type: integration
 categories: