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.x](backport #41381) Fix system module with both filesets enabled #41488

Merged
merged 4 commits into from
Nov 1, 2024

Commits on Oct 30, 2024

  1. Fix system module with both filesets enabled (#41381)

    The system module did not define an ID at the root of the config, that made the V2 input loader only start the first journald input it saw because they both ended up with the same identifier (type, ID and path). This is fixed by defining an ID at the root of the configuration templates.
    
    The journald input now also adds the input_id key to its loggers and a non-fatal error is now logged at debug level.
    
    The system-logs input is now marked as experimental instead of stable.
    
    Fix lint warnings by moving toJournalConfig to input_linux.go
    
    Move TestSystemLogsCanUseLogInput to a file without the
    linux build constraint so it can run on all OSes supported by the
    system integration.
    
    (cherry picked from commit b1c7478)
    
    # Conflicts:
    #	.buildkite/filebeat/filebeat-pipeline.yml
    belimawr authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a786d36 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6502929 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Configuration menu
    Copy the full SHA
    4bf1d75 View commit details
    Browse the repository at this point in the history
  2. skip system-logs test

    belimawr committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    94ed51d View commit details
    Browse the repository at this point in the history