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

Cherry-pick #11357 to 6.6: Fix Winlogbeat escaping CRLF sequences #11370

Merged
merged 3 commits into from
Mar 28, 2019

Conversation

adriansr
Copy link
Contributor

Cherry-pick of PR #11357 to 6.6 branch. Original message:

Previous fix (#11006) made Winlogbeat escape CRLF control characters, which are expected in Windows event logs.

Fixes #11328

Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters
which are expected in Windows event logs.

Fixes elastic#11328

(cherry picked from commit 6865403)
The new system test added in elastic#11357 checks for the wrong field
in 6.7 and 6.6.
evts = self.read_events()
self.assertTrue(len(evts), 1)
self.assertEqual(unicode(self.api), evts[0]["type"], evts[0])
self.assertNotIn("event.original", evts[0], msg=evts[0])
Copy link
Member

Choose a reason for hiding this comment

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

Do we use event.original in 6.6? I think the value goes to xml instead.

@adriansr adriansr merged commit cc64201 into elastic:6.6 Mar 28, 2019
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…ces (elastic#11370)

Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters
which are expected in Windows event logs.

Fixes elastic#11328

(cherry picked from commit 5db0f15)
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.

2 participants