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 #34549) winlogbeat/sys/winevent: do not interpret dots as JSON path separators #34593

Merged
merged 3 commits into from
Feb 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 15, 2023

This is an automatic backport of pull request #34549 done by Mergify.
Cherry-pick of ab589ce has failed:

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

You are currently cherry-picking commit ab589cebe2.
  (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:   winlogbeat/sys/winevent/event_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   winlogbeat/sys/winevent/maputil.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

#34549)

In some locales, Windows abbreviates event data keys with dots. This
happens in Spanish for example where the English 'ID' is rendered as 'Id.'
When using mapstr.Put, this dot is interpreted as a path separator,
breaking the structure of the document and ultimately leading to an
ingest failure. So use opaque key map insertion.

(cherry picked from commit ab589ce)

# Conflicts:
#	winlogbeat/sys/winevent/maputil.go
@mergify mergify bot requested a review from a team as a code owner February 15, 2023 21:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 15, 2023
@mergify mergify bot assigned efd6 Feb 15, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 15, 2023
@botelastic
Copy link

botelastic bot commented Feb 15, 2023

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 15, 2023

💚 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: 2023-02-27T22:48:31.839+0000

  • Duration: 89 min 21 sec

Test stats 🧪

Test Results
Failed 0
Passed 20455
Skipped 1558
Total 22013

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

@efd6 efd6 force-pushed the mergify/bp/7.17/pr-34549 branch from 96a4b26 to 44cebd8 Compare February 15, 2023 23:53
Requires backport of testing infrastructure.
@efd6 efd6 force-pushed the mergify/bp/7.17/pr-34549 branch from 44cebd8 to ff8305a Compare February 16, 2023 00:54
@mergify
Copy link
Contributor Author

mergify bot commented Feb 20, 2023

This pull request has not been merged yet. Could you please review and merge it @efd6? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented Feb 27, 2023

This pull request has not been merged yet. Could you please review and merge it @efd6? 🙏

@efd6 efd6 merged commit 0569e97 into 7.17 Feb 28, 2023
@efd6 efd6 deleted the mergify/bp/7.17/pr-34549 branch February 28, 2023 01:51
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