Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sei] Add checks to avoid overriding event.original if present #8269

Merged
merged 103 commits into from
Oct 24, 2023

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Oct 23, 2023

Proposed commit message

Add checks to avoid overriding event.original if present.
On some setups (ie Logstash sends data to ES) event.original might be already present in the event body. Currently most of our integrations do not have a null check for it before trying to set it, leading to errors on these circumstances. By adding the required checks we improve handling in this setups.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.

Related issues

marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/1password
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/akamai
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/amazon_security_lake
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/arista_ngfw
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/atlassian_bitbucket
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/atlassian_confluence
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/atlassian_jira
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/auditd
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/auth0
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/azure_frontdoor
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/barracuda
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/barracuda_cloudgen_firewall
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/bitdefender
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/bitwarden
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/bluecoat
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/box_events
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/carbon_black_cloud
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cef
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/checkpoint
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_aironet
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_asa
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_duo
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_ftd
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_ios
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_ise
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_meraki
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
marc-gr added a commit to marc-gr/integrations that referenced this pull request Oct 23, 2023
        [git-generate]
        #!/bin/bash

        cd /Users/marcguasch/go/src/github.com/elastic/integrations/packages/cisco_nexus
        glob="./data_stream/**/elasticsearch/ingest_pipeline/default.yml"
        files=$(echo $glob | tr " " "\n")
        for file in $files; do
            if grep -q "field: event.original" $file; then
                yq e -i '(.processors | .[] | select(.rename.target_field == "event.original")) *= {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
                yq e -i '(.processors | .[] | select(.set.field == "event.original" and .set.copy_from != "_temp_.result._raw")) = {"rename":{"field": "message", "target_field": "event.original", "ignore_missing": true, "if": "ctx.event?.original == null"}}' $file
            fi
        done
        if ! git diff --quiet --exit-code .; then
            elastic-package changelog add --next minor --type enhancement --link elastic#8269 --description "Improve 'event.original' check to avoid errors if set."
            elastic-package check
        fi
@elasticmachine
Copy link

Package vectra_detect - 1.5.0 containing this change is available at https://epr.elastic.co/search?package=vectra_detect

@elasticmachine
Copy link

Package zeek - 2.20.0 containing this change is available at https://epr.elastic.co/search?package=zeek

@elasticmachine
Copy link

Package zerofox - 1.20.0 containing this change is available at https://epr.elastic.co/search?package=zerofox

@elasticmachine
Copy link

Package zeronetworks - 1.9.0 containing this change is available at https://epr.elastic.co/search?package=zeronetworks

@elasticmachine
Copy link

Package zscaler_zia - 2.16.0 containing this change is available at https://epr.elastic.co/search?package=zscaler_zia

@elasticmachine
Copy link

Package zscaler_zpa - 1.15.0 containing this change is available at https://epr.elastic.co/search?package=zscaler_zpa

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[SEI] Add check for event.original rename/set to avoid issues with Logstash events
5 participants