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

[7.17](backport #38709) x-pack/filebeat/module/o365: fix handling of o365.audit.OperationProperties #38751

Merged
merged 4 commits into from Apr 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 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


This is an automatic backport of pull request #38709 done by [Mergify](https://mergify.com).

…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
@mergify mergify bot requested a review from a team as a code owner April 6, 2024 01:36
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 6, 2024
@mergify mergify bot assigned efd6 Apr 6, 2024
Copy link
Contributor Author

mergify bot commented Apr 6, 2024

Cherry-pick of 8105935 has failed:

On branch mergify/bp/7.17/pr-38709
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 8105935e24.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/module/o365/audit/_meta/fields.yml
	modified:   x-pack/filebeat/module/o365/audit/ingest/pipeline.yml
	new file:   x-pack/filebeat/module/o365/audit/test/stringly-json.log
	new file:   x-pack/filebeat/module/o365/audit/test/stringly-json.log-expected.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/o365/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 6, 2024
@botelastic
Copy link

botelastic bot commented Apr 6, 2024

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 6, 2024

💚 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

  • Start Time: 2024-04-07T22:58:43.528+0000

  • Duration: 65 min 32 sec

Test stats 🧪

Test Results
Failed 0
Passed 2599
Skipped 155
Total 2754

💚 Flaky test report

Tests succeeded.

🤖 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!)

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@efd6 efd6 merged commit d53d1a8 into 7.17 Apr 8, 2024
20 of 22 checks passed
@efd6 efd6 deleted the mergify/bp/7.17/pr-38709 branch April 8, 2024 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants