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.

Sign up for GitHub

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

Jump to bottom

pkg/promtail: remove journal target forced path #1298

Merged
merged 2 commits into from
Nov 25, 2019
Merged

pkg/promtail: remove journal target forced path #1298

merged 2 commits into from
Nov 25, 2019

Commits on Nov 25, 2019

  1. pkg/promtail: remove journal target forced path 

    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
    rfratto committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    6473ac7 View commit details
    Browse the repository at this point in the history

  2. docs: document required bind mounts for reading from systemd journal

    @rfratto
    rfratto committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    46e5305 View commit details
    Browse the repository at this point in the history