Cherry-pick #10593 to 7.0: Fix waiting for new events #10753
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This will need a rebase, the failures doesn't seems related to this PR intend. I see a docker issues with metricbeat and also on windows. |
ph
approved these changes
Feb 14, 2019
|
One thing that I wonder here, right now we do define a set of seccomp permission that are valid for all the beats maybe we should leave it to the beats to define the list of syscall it should allow. On the other hand we want to merge Journalbeat into Filebeat so maybe it's not necessary. |
* Adding more syscalls to the whitelist in `libbeat` I have removed the seccomp policy of `journalbeat`. Four new syscalls has been added to the common policy instead: `fstatfs`, `getrlimit`, `ppoll` and `splice`. * Eliminate possible deadlock when closing the client * Previously, `journalbeat` was unable to read new entries from the journal after it has been started. Now it is fixed, and the reader code is much simpler now. * updated vendored `github.com/coreos/go-systemd/sdjournal` to latest release (no changes) (cherry picked from commit 1dc58e0)
kvch
force-pushed
the
backport_10593_7.0
branch
from
9c9f043
to
7b085ab
Compare
|
At first I added a custom seccomp policy to Journalbeat, but as Andrew Kroh pointed out, these syscalls do not do anything special. So it is simpler to add them to the common list. |
|
Failing tests are unrelated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #10593 to 7.0 branch. Original message:
libbeatI have removed the seccomp policy of
journalbeat. Four new syscalls has been added to the common policy instead:fstatfs,getrlimit,ppollandsplice.journalbeatwas unable to read new entries from the journal after it has been started. Now it is fixed, and the reader code is much simpler now.github.com/coreos/go-systemd/sdjournalto latest release (no changes)