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

x-pack/filebeat/module/o365: fix handling of o365.audit.OperationProperties #38709

Merged
merged 1 commit into from
Apr 6, 2024

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Apr 3, 2024

Proposed commit message

In some cases, this field may be a string. This results in a mapping failure. So in cases where the field is a string, conditionally parse out the JSON.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added Filebeat Filebeat backport-7.17 Automated backport to the 7.17 branch with mergify bugfix Team:Security-Service Integrations Security Service Integrations Team labels Apr 3, 2024
@efd6 efd6 self-assigned this Apr 3, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 3, 2024
…erties

In some cases, this field may be a string. This results in a mapping
failure. So in cases where the field is a string, conditionally parse
out the JSON.

Use the ingest pipeline rather than modifying the js processor due to
clarity.
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 135 min 5 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 marked this pull request as ready for review April 3, 2024 04:08
@efd6 efd6 requested a review from a team as a code owner April 3, 2024 04:08
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

Copy link
Contributor

@kcreddy kcreddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍🏼

@efd6
Copy link
Contributor Author

efd6 commented Apr 4, 2024

Waiting on input from reporter for answer to question (here and here) before merging.

@efd6 efd6 merged commit 8105935 into elastic:main Apr 6, 2024
36 of 40 checks passed
mergify bot pushed a commit that referenced this pull request Apr 6, 2024
…erties (#38709)

In some cases, this field may be a string. This results in a mapping
failure. So in cases where the field is a string, conditionally parse
out the JSON.

Use the ingest pipeline rather than modifying the js processor due to
clarity.

(cherry picked from commit 8105935)

# Conflicts:
#	x-pack/filebeat/module/o365/fields.go
zeynepyz pushed a commit to zeynepyz/beats that referenced this pull request Apr 7, 2024
…erties (elastic#38709)

In some cases, this field may be a string. This results in a mapping
failure. So in cases where the field is a string, conditionally parse
out the JSON.

Use the ingest pipeline rather than modifying the js processor due to
clarity.
efd6 added a commit that referenced this pull request Apr 8, 2024
…o365.audit.OperationProperties (#38751)

* x-pack/filebeat/module/o365: fix handling of o365.audit.OperationProperties (#38709)

In some cases, this field may be a string. This results in a mapping
failure. So in cases where the field is a string, conditionally parse
out the JSON.

Use the ingest pipeline rather than modifying the js processor due to
clarity.

(cherry picked from commit 8105935)

# Conflicts:
#	x-pack/filebeat/module/o365/fields.go

* remove irrelevant changelog entries
* fix conflict
* fix test expectation

---------

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify bugfix Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[filebeat][o365] Mapping problem on o365.audit.AdditionalInfo [o365] Could not index event to Elasticsearch
3 participants