elk: 6.2.4 -> 6.3.2 #44038
Merged
elk: 6.2.4 -> 6.3.2 #44038
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* The ELK stack is upgraded to 6.3.2. * `elasticsearch6`, `logstash6` and `kibana6` now come with X-Pack which is a suite of additional features. These are however licensed under the unfree "Elastic License". * Fortunately they also provide OSS versions which are now packaged under: `elasticsearch6-oss`, `logstash6-oss` and `kibana6-oss`. Note that the naming of the attributes is consistent with upstream. * The test `nix-build nixos/tests/elk.nix -A ELK-6` will test the OSS version by default. You can also run the test on the unfree ELK using: `NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true`
|
@GrahamcOfBorg test elk.ELK-6 |
LnL7
reviewed
Sep 5, 2018
| @@ -1,17 +1,45 @@ | |||
| { stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }: | |||
| { elk6Version | |||
| , enableUnfree ? true | |||
There was a problem hiding this comment.
Why would we want pkgs.kibana to be unfree by default? We don't enable allowUnfree by default so this package wouldn't be available.
There was a problem hiding this comment.
I chose to follow the upstream naming convention. The default ELK packages have become unfree. OSS versions are now packaged
under: elasticsearch6-oss, logstash6-oss and kibana6-oss.
There was a problem hiding this comment.
Ah I missed that part, and the changelog entry explains what's going on. I was only lookig at hydra jobs.
| @@ -1,14 +1,26 @@ | |||
| { stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }: | |||
| { elk6Version | |||
| , enableUnfree ? true | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is WIP. Please don't merge yet!Motivation for this change
https://www.elastic.co/guide/en/elasticsearch/reference/6.3/release-notes-6.3.0.html
Also the private X-Pack is now opened up and moved into the ELK repositories. See: https://www.elastic.co/products/x-pack/open
Things done
The ELK stack is upgraded to 6.3.0.
elasticsearch6,logstash6andkibana6now come with X-Pack which isa suite of additional features. These are however licensed under the unfree
"Elastic License".
Fortunately they also provide OSS versions which are now packaged
under:
elasticsearch6-oss,logstash6-ossandkibana6-oss.Note that the naming of the attributes is consistent with upstream.
The test
nix-build nixos/tests/elk.nix -A ELK-6will test the OSSversion by default. You can also run the test on the unfree ELK using:
NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree trueThat still fails however. Working on it...sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)