pkg/promtail: remove journal target forced path #1298
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
The forced default path for the journal target (/var/log/journal) did not apply to all Linux systems: systemd actually defaults to reading from _two_ default paths: /var/log/journal and /run/log/journal. Not setting an explicit default will enable both of those paths to be searched for journal logs. The comment mentioning the local machine ID was technically accurate, but is normally dealt with by bind mounting /etc/machine-id. That's the standard approach for running fluent-bit in a container, and should be the standard approach for Promtail as well. Fixes grafana#1286.
rfratto
force-pushed
the
remove-explicit-default-journal-path-promtail
branch
from
956fba2
to
46e5305
Compare
sh0rez
reviewed
Nov 25, 2019
sh0rez
approved these changes
Nov 25, 2019
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.
The forced default path for the journal target (
/var/log/journal) did not apply to all Linux systems: systemd actually defaults to reading from two default paths:/var/log/journaland/run/log/journal. Not setting an explicit default will enable both of those paths to be searched for journal logs.The comment mentioning the local machine ID was technically accurate, but is normally dealt with by bind mounting
/etc/machine-id. That's the standard approach for running fluent-bit in a container, and should be the standard approach for Promtail as well.Fixes #1286.