Navigation Menu

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

Jump to bottom

NixOS: support journalbeat >= 6 #61237

Merged
merged 5 commits into from May 10, 2019
Merged

NixOS: support journalbeat >= 6 #61237

merged 5 commits into from May 10, 2019

Conversation

basvandijk
Copy link
Member

Motivation for this change

The services.journalbeat NixOS module only supported the old and deprecated version 5 of journalbeat. This PR minimally modifies that module to also support journalbeat >= 6.

It also extends the ELK testsuite with tests for journalbeat. In that process a few bugs where discovered in the journalbeat packages which have subsequently been fixed.

The intention is also to backport this to 19.03 since that release already has the journalbeat >= 6 packages but not the fixed module.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@basvandijk
Copy link
Member Author

@GrahamcOfBorg test elk

@basvandijk basvandijk self-assigned this May 10, 2019
@basvandijk
Copy link
Member Author

@GrahamcOfBorg test elk.ELK-5 elk.ELK-6 elk.ELK-7

@basvandijk
Copy link
Member Author

The test timed-out. This could be because it requires quite a bit of resources of both memory and time. It works on my machine but let's try testing again.

@GrahamcOfBorg test elk.ELK-7

@basvandijk basvandijk merged commit 4b7aea9 into NixOS:master May 10, 2019
@basvandijk basvandijk mentioned this pull request May 10, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@basvandijk basvandijk

Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@basvandijk