-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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
elasticsearch: use 6.x as default version, remove unsupported releases #44389
Conversation
pkgs/top-level/all-packages.nix
Outdated
@@ -2273,12 +2273,10 @@ with pkgs; | |||
elk6Version = "6.3.2"; | |||
|
|||
elasticsearch = callPackage ../servers/search/elasticsearch { }; | |||
elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; | |||
elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; | |||
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about keeping the elasticsearch6
and elasticsearch6-oss
attributes and setting the aliases elasticsearch = elasticsearch6
and elasticsearch-oss = elasticsearch6-oss
. That causes less breakage. Note that we do the same for postgresql
, linuxPackages
, etc..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should also add an entry to the release notes warning that elasticsearch
has been upgraded to version 6.
We should probably also mention that (EDIT: the ELK stack) now has an unfree license because it contains X-pack but that you can use the free elasticsearch
elasticsearch-oss
, kibana-oss
and logstash-oss
instead.
@@ -58,8 +58,8 @@ in { | |||
|
|||
package = mkOption { | |||
description = "Elasticsearch package to use."; | |||
default = pkgs.elasticsearch2; | |||
defaultText = "pkgs.elasticsearch2"; | |||
default = pkgs.elasticsearch; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that we can now simplify the module by replacing all if es5 then ... else ...
expressions with their then
branches. (Note that es5
means: version 5 or higher.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
This is a good change! However, we should handle the other components in the ELK stack as well:
|
River plugins are no longer supported in elasticsearch.
Deprecated by upstream, search_guard was recommended instead.
deprecated by upstream, https://github.com/lmenezes/cerebro is recommend instead (but not packaged in nixpkgs)
@GrahamcOfBorg test nixos.tests.elk.ELK-6 |
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: tests.nixos.tests.elk.ELK-6 Partial log (click to expand)
|
No attempt on x86_64-linux (full log) The following builds were skipped because they don't evaluate on x86_64-linux: tests.nixos.tests.elk.ELK-6 Partial log (click to expand)
|
@GrahamcOfBorg test elk.ELK-6 |
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: tests.elk.ELK-6 Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: tests.elk.ELK-5 Partial log (click to expand)
|
@Mic92 In master...LumiGuide:es6 I've added a commit that updates the 18.09 release notes. You may want to pull that into your PR. |
@basvandijk you can also push it by using: |
pushed the changelog as well |
Since X-Pack is licensed under the | ||
<link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic License</link> | ||
the ELK packages now have an unfree license. To use them you need to specify | ||
<literal>allowUnfree = true;</literal> in your nixpkgs configuration. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean?
nixpkgs.config.allowUnfree = true;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes but I didn't want to assume NixOS. Although people are probably not using the ELK stack outside of NixOS...
@Mic92 I fixed some conflicts with |
@GrahamcOfBorg test elk.ELK-5 elk.ELK-6 |
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: tests.elk.ELK-5, tests.elk.ELK-6 Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: tests.elk.ELK-5, tests.elk.ELK-6 Partial log (click to expand)
|
Success on x86_64-darwin (full log) Attempted: elasticsearchPlugins.discovery-ec2, elasticsearchPlugins.elasticsearch_analysis_lemmagen The following builds were skipped because they don't evaluate on x86_64-darwin: elasticsearch, elasticsearch6, kibana, logstash Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: elasticsearchPlugins.discovery-ec2, elasticsearchPlugins.elasticsearch_analysis_lemmagen The following builds were skipped because they don't evaluate on x86_64-linux: elasticsearch, elasticsearch6, kibana, logstash Partial log (click to expand)
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: elasticsearch, elasticsearch6, elasticsearchPlugins.discovery-ec2, elasticsearchPlugins.elasticsearch_analysis_lemmagen, kibana, logstash Partial log (click to expand)
|
Note I'm also working on the ELK 6.3.2 -> 6.4.0 upgrade. The tests pass but the plugins: |
@basvandijk feel free to push on this branch, I am currently not working on this. |
@Mic92 I think I will just merge it this evening. |
Motivation for this change
I had to drop some unsupported plugins as well. Alternative to #44339 The new/updated plugins build, but I have not tested them yet.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)