Skip to content

[8.0](backport #30167) filebeat/input/journald: fix field name translation#30287

Merged
belimawr merged 3 commits into8.0from
mergify/bp/8.0/pr-30167
Feb 10, 2022
Merged

[8.0](backport #30167) filebeat/input/journald: fix field name translation#30287
belimawr merged 3 commits into8.0from
mergify/bp/8.0/pr-30167

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 8, 2022 •
edited by zube bot
Loading

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

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

You are currently cherry-picking commit cc634f1ecb.
  (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:
	deleted:    filebeat/input/journald/conv.go
	modified:   filebeat/input/journald/input.go
	new file:   filebeat/input/journald/input_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   filebeat/input/journald/input_filtering_test.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

@belimawr
filebeat/input/journald: fix field name translation (#30167)
333022f 
The field names from journald were not being translated to our format
when sending the event to the output. This commit fixes it.

Fixes 30031

(cherry picked from commit cc634f1)

# Conflicts:
#	filebeat/input/journald/input_filtering_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 8, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 8, 2022
@botelastic
Copy link
Copy Markdown

botelastic bot commented Feb 8, 2022

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 8, 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

  • Start Time: 2022-02-09T19:25:53.135+0000

  • Duration: 119 min 23 sec

Test stats 🧪

Test Results
Failed 0
Passed 9591
Skipped 1289
Total 10880

💚 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 belimawr merged commit a13c934 into 8.0 Feb 10, 2022
@belimawr belimawr deleted the mergify/bp/8.0/pr-30167 branch February 10, 2022 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@belimawr belimawr

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @belimawr