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

ELK 5.6.9 & 6.2.4 & fixes for elasticsearch6 and logstash6 not starting up #36456

Merged
merged 7 commits into from
Apr 18, 2018
Merged

ELK 5.6.9 & 6.2.4 & fixes for elasticsearch6 and logstash6 not starting up #36456

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

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Mar 7, 2018 •
edited
Loading

Motivation for this change

https://www.elastic.co/guide/en/elasticsearch/reference/6.2/release-notes-6.2.2.html

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 basvandijk force-pushed the elk-5.6.8_and_6.2.2 branch from f5ef3d7 to d873b0d Compare March 26, 2018 09:41
@basvandijk basvandijk changed the title ELK 5.6.8 & 6.2.2 ELK 5.6.8 & 6.2.3 Mar 26, 2018
@basvandijk basvandijk force-pushed the elk-5.6.8_and_6.2.2 branch from d873b0d to 8dfd3d4 Compare April 7, 2018 23:45
@basvandijk
Copy link
Member Author

@nh2 I pushed a fix for #37102 and also a fix for logstash6 not starting up due to unpatched shebangs. The nixos/tests/elk.nix now succeeds.

@globin care to review?

@basvandijk basvandijk changed the title ELK 5.6.8 & 6.2.3 ELK 5.6.8 & 6.2.3 & fixes for elasticsearch6 and logstash6 not starting up Apr 7, 2018
@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/` labels Apr 8, 2018
@basvandijk basvandijk changed the title ELK 5.6.8 & 6.2.3 & fixes for elasticsearch6 and logstash6 not starting up ELK 5.6.9 & 6.2.4 & fixes for elasticsearch6 and logstash6 not starting up Apr 17, 2018
@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 17, 2018
@basvandijk basvandijk force-pushed the elk-5.6.8_and_6.2.2 branch from 2f2e616 to 9c8fa97 Compare April 17, 2018 22:39
@GrahamcOfBorg GrahamcOfBorg removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 17, 2018
@spinus
Copy link
Member

spinus commented Apr 17, 2018

If only package version bump, looks pretty ok, right?
Would be nice to have tests to make sure both es5 and es6 setups are working. Also, would be great to hardcode user (like in all other nix services).

@adisbladis
Copy link
Member

@spinus There are already tests for elk: https://github.com/NixOS/nixpkgs/blob/f8bf6a9c3fcbff4988635287f0be760906995a65/nixos/tests/elk.nix#L96#106.
I'm running them now and will merge if successful.

@adisbladis adisbladis merged commit a5ae3b5 into NixOS:master Apr 18, 2018
@adisbladis
Copy link
Member

Works great! Thanks 👍

@basvandijk basvandijk mentioned this pull request Apr 18, 2018
Merged
8 tasks
@basvandijk
Copy link
Member Author

@adisbladis thanks for the merge. It would be great if this can be cherry-picked on 18.03 as well: #39104

@nh2 nh2 mentioned this pull request Jun 6, 2020
Closed
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
4 participants
@basvandijk @spinus @adisbladis @GrahamcOfBorg