[8.x](backport #41244) Read journal entries from all boots #41403
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Some versions of journalctl will only return messages from the current boot when --follow is passed, it will even ignore the cursor or date arguments. This commit reads messages from all boots by first calling journalctl without the --follow flag, reading all entries and once it successfully exits, then we restart journalctl with the cursor and the --follow flag. The parser test is upsted to use ndjson parser instead of multiline because the multiline parser can have issues when journald input is reading from files. There is a corner case where the journalctl exits successfully and the reader goroutine gets an error, this makes Next to return early, making the multiline to also return early. TestJournaldInput assumed journalctl was run only once, however that has changed recently. The test is updated to accommodate for that and rename to TestJournaldInputRunsAndRecoversFromJournalctlFailures, which better reflects what it is actually testing. --------- Co-authored-by: Pierre HILBERT <[email protected]> (cherry picked from commit d21ed32)
mergify
bot
requested review from
AndersonQ and
khushijain21
and removed request for
a team
botelastic
bot
added
the
needs_team
|
This pull request doesn't have a |
|
The failures seem unrelated, I'll re-run the tests. |
pierrehilbert
approved these changes
Oct 24, 2024
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.
Proposed commit message
Some versions of journalctl will only return messages from the current boot when --follow is passed, it will even ignore the cursor or date arguments.
This commit reads messages from all boots by first calling journalctl without the --follow flag, reading all entries and once it successfully exits, then we restart journalctl with the cursor and the --follow flag.
Checklist
I have made corresponding changes to the documentationI have made corresponding change to the default configuration filesCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.## Disruptive User ImpactAuthor's Checklist
TestInputParsersfromfilebeat/input/journald/input_parsers_test.gois not flakyHow to test this PR locally
1. Run the tests
2. Run Filebeat reading
filebeat/input/journald/testdata/multiple-boots.journalThere must be 6 entries, you can see the plaintext entries by looking at
filebeat/input/journald/testdata/multiple-boots.exportor by running:3. Fully manual test
Related issues
## Use cases## Screenshots## LogsThis is an automatic backport of pull request #41244 done by Mergify.