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

[8.0](backport #28638) Filebeat sophos/utm: Support logs containing hostname in syslog header #28930

Merged
merged 1 commit into from
Nov 11, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2021

This is an automatic backport of pull request #28638 done by Mergify.
Cherry-pick of 71204c2 has failed:

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

You are currently cherry-picking commit 71204c267.
  (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:   x-pack/filebeat/module/sophos/utm/config/pipeline.js
	modified:   x-pack/filebeat/module/sophos/utm/test/generated.log

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/sophos/utm/test/generated.log-expected.json

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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 11, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 11, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 11, 2021
)

Updates the sophos/utm datastream to support logs that include a
hostname in their syslog header.

(cherry picked from commit 71204c2)
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 11, 2021

💚 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: 2021-11-11T22:41:52.610+0000

  • Duration: 55 min 56 sec

  • Commit: 8017b41

Test stats 🧪

Test Results
Failed 0
Passed 791
Skipped 150
Total 941

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

@adriansr
Copy link
Contributor

/test

@adriansr adriansr merged commit bb9ab3e into 8.0 Nov 11, 2021
@mergify mergify bot deleted the mergify/bp/8.0/pr-28638 branch November 11, 2021 23: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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants