merging with main

Signed-off-by: Andreas Gkizas <[email protected]>

Author: gizas

packages/istio/data_stream/access_logs/elasticsearch/ingest_pipeline/default.yml

@@ -13,7 +13,6 @@ processors:
       ignore_failure: true
   - rename:
       field: message
-<<<<<<< HEAD
       tag: rename_message_to_event_original
       target_field: event.original
       ignore_missing: true
@@ -24,11 +23,7 @@ processors:
       ignore_missing: true
       description: The `message` field is no longer required if the document has an `event.original` field.
       if: ctx.event?.original != null
-=======
       target_field: event.original
-      ignore_missing: true
-      if: 'ctx.event?.original == null'
->>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
   - drop:
       if: "ctx?.event?.original == null"
   - grok: