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

release-18.03: ELK 5.6.9 & 6.2.4 & fixes for elasticsearch6 and logstash6 not starting up #39104

Merged
merged 7 commits into from
Apr 19, 2018
Merged

release-18.03: ELK 5.6.9 & 6.2.4 & fixes for elasticsearch6 and logstash6 not starting up #39104

merged 7 commits into from
Apr 19, 2018
+22 −17

Conversation

basvandijk
Copy link
Member

Motivation for this change

Cherry-pick of #36456 on release-18.03.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@basvandijk
elk5: 5.6.6 -> 5.6.8
428c055 
(cherry picked from commit 390abce)
@basvandijk
elk6: 6.1.2 -> 6.2.2

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
37bd229 
(cherry picked from commit b3e94a2)
@basvandijk
elk6: 6.2.2 -> 6.2.3
bcafb72 
(cherry picked from commit 54e6c0e)
@basvandijk
elasticsearch6: fix startup due to missing jvm.options
2fb4bf7 
(cherry picked from commit ae94825)
@basvandijk
logstash6: fix startup due to unpatched shebangs
9af68dc 
(cherry picked from commit baf5d4d)
@basvandijk
elk5: 5.6.8 -> 5.6.9
5f82c83 
(cherry picked from commit 1593ff3)
@basvandijk
elk6: 6.2.3 -> 6.2.4
ffb31e8 
(cherry picked from commit 9c8fa97)
@basvandijk basvandijk mentioned this pull request Apr 18, 2018
Merged
8 tasks
@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Apr 18, 2018
@adisbladis adisbladis merged commit f045ed1 into NixOS:release-18.03 Apr 19, 2018
@adisbladis
Copy link
Member

I was just about to backport these :) Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@basvandijk @adisbladis @GrahamcOfBorg