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.

Sign up for GitHub

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

Jump to bottom

libbeat/reader: Fix messge conversion to beat.Event #30057

Merged
merged 1 commit into from
Jan 28, 2022
Merged

libbeat/reader: Fix messge conversion to beat.Event #30057

merged 1 commit into from
Jan 28, 2022

Conversation

belimawr
Copy link
Contributor

@belimawr belimawr commented Jan 27, 2022 •
edited
Loading

What does this PR do?

Message.ToEvent was not copying the Message.Privage field when
converting a Message to beat.Event. This commit fixes it.

Fixes: #30031

Why is it important?

It fixes the journald input

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

Use journald input and console output, the events outputted should look like the one described on #30031

Related issues

## Use cases

## Screenshots

## Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 27, 2022
@mergify
Copy link
Contributor

mergify bot commented Jan 27, 2022

This pull request does not have a backport label. Could you fix it @belimawr? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Jan 27, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 27, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 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

  • Reason: null

  • Start Time: 2022-01-28T07:42:39.981+0000

  • Duration: 93 min 57 sec

  • Commit: b0e0d51

Test stats 🧪

Test Results
Failed 0
Passed 47978
Skipped 4285
Total 52263

💚 Flaky test report

Tests succeeded.

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

@belimawr
libbeat/reader: Fix messge conversion to beat.Event
b0e0d51 
`Message.ToEvent` was not copying the `Message.Privage` field when
converting a Message to `beat.Event`. This commit fixes it.

Fixes: elastic#30031
@belimawr belimawr added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jan 27, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 27, 2022
@belimawr belimawr marked this pull request as ready for review January 27, 2022 14:21
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@belimawr belimawr added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify labels Jan 27, 2022
@belimawr belimawr requested a review from kvch January 27, 2022 14:24
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Jan 27, 2022
@belimawr
Copy link
Contributor Author

@kvch @mtojek could you double check my backport labels, please?

@kvch kvch removed the backport-7.17 Automated backport to the 7.17 branch with mergify label Jan 27, 2022
@kvch
Copy link
Contributor

kvch commented Jan 27, 2022

Removed backporting to 7.17, as the code that broke journald input was released in 7.x.

@kvch
Copy link
Contributor

kvch commented Jan 28, 2022

jenkins run tests

@belimawr
Copy link
Contributor Author

Removed backporting to 7.17, as the code that broke journald input was released in 7.x.

Was it released in 7.x or was it not released on 7.x?

Anyway, I trust you more than myself on this one ;)

@belimawr belimawr merged commit 8cc07dd into elastic:master Jan 28, 2022
@belimawr belimawr deleted the fix-journald branch January 28, 2022 09:51
mergify bot pushed a commit that referenced this pull request Jan 28, 2022
@belimawr
libbeat/reader: Fix messge conversion to beat.Event (#30057)
587bc85 
`Message.ToEvent` was not copying the `Message.Privage` field when
converting a Message to `beat.Event`. This commit fixes it.

Fixes: #30031
(cherry picked from commit 8cc07dd)
@mergify mergify bot mentioned this pull request Jan 28, 2022
Merged
belimawr added a commit that referenced this pull request Jan 28, 2022
@mergify @belimawr
libbeat/reader: Fix messge conversion to beat.Event (#30057) (#30084)
5eb2a73 
`Message.ToEvent` was not copying the `Message.Privage` field when
converting a Message to `beat.Event`. This commit fixes it.

Fixes: #30031
(cherry picked from commit 8cc07dd)

Co-authored-by: Tiago Queiroz <[email protected]>
v1v added a commit to v1v/beats that referenced this pull request Jan 31, 2022
@v1v
Merge remote-tracking branch 'upstream/master' into feature/bump-stac…
0ca8d43 
…k-version-after-8-0-creation

* upstream/master: (69 commits)
  Update stale config following (elastic#30082)
  Make include_matches backwards compatible with 7.x config (elastic#30032)
  [Filebeat] Update handling of elasticsearch server logs (elastic#30018)
  Remove SSL3 support from libbeat and its documentation. (elastic#30071)
  Revert "Packaging: rename arm64 suffix to aarch64 in the tar.gz artifacts ONLY (elastic#28813)" (elastic#30083)
  [libbeat] Add script processor to all beats (elastic#29752)
  Add fonts to support more different types of characters for multiple languages (elastic#29861)
  libbeat/reader: Fix messge conversion to beat.Event (elastic#30057)
  probot[stale]: ignore issues with the tag flaky-test (elastic#30065)
  [DOCS] Add redirect for GSuite module (elastic#30034)
  [Automation] Update elastic stack version to 8.1.0-aa69d697 for testing (elastic#30012)
  Remove msitools install for windows build, using the latest docker image with msitools preinstalled (elastic#30040)
  filebeat/generator/fields: fix dropped error (elastic#29943)
  Include the error message with auditd module events (elastic#30009)
  [Metricbeat] gcp: add firestore metricset (elastic#29918)
  probot: update stale dates (elastic#29997)
  Metricbeat enterprise search module: add xpack.enabled support (elastic#29871)
  x-pack/packetbeat: install Npcap at start-up when required (elastic#29112)
  [Filebeat] Fix panic in decode_cef when recovering from invalid data (elastic#30038)
  Correctly fixe how selected packages are defined (elastic#30039)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvch kvch kvch approved these changes

Assignees

@belimawr belimawr

Labels
backport-v8.0.0 Automated backport with mergify review Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Filebeat] Journald event format changed
3 participants
@belimawr @elasticmachine @kvch