public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77741 from knl/elasticsearch-curator-now-supports-el7

Browse Source 
Enable elasticsearch-curator on elasticsearch 7
This commit is contained in:
Bas van Dijk 2020-01-15 10:47:15 +01:00 committed by GitHub
commit 5afe978e00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/tests/elk.nix
View File

@ -10,8 +10,7 @@ let
esUrl = "http://localhost:9200"; esUrl = "http://localhost:9200";
mkElkTest = name : elk : mkElkTest = name : elk :
let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0; import ./make-test-python.nix ({
in import ./make-test-python.nix ({
inherit name; inherit name;
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco offline basvandijk ]; maintainers = [ eelco offline basvandijk ];
@ -91,8 +90,7 @@ let
}; };
elasticsearch-curator = { elasticsearch-curator = {
# The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0. enable = true;
enable = !elasticsearchGe7;
actionYAML = '' actionYAML = ''
--- ---
actions: actions:
@ -173,7 +171,7 @@ let
one.wait_until_succeeds( one.wait_until_succeeds(
total_hits("Supercalifragilisticexpialidocious") + " | grep -v 0" total_hits("Supercalifragilisticexpialidocious") + " | grep -v 0"
) )
'' + pkgs.lib.optionalString (!elasticsearchGe7) ''
with subtest("Elasticsearch-curator works"): with subtest("Elasticsearch-curator works"):
one.systemctl("stop logstash") one.systemctl("stop logstash")
one.systemctl("start elasticsearch-curator") one.systemctl("start elasticsearch-curator")