diff options
| author | Nikola Knezevic <nikola@knezevic.ch> | 2020-01-15 10:09:44 +0100 |
|---|---|---|
| committer | Nikola Knezevic <nikola@knezevic.ch> | 2020-01-15 10:12:19 +0100 |
| commit | 900e288d2235a651befcd72afed5b266fc0a7f36 (patch) | |
| tree | 190eef1e6166657520d930a2c143f85e733b2b8e /nixos/tests/elk.nix | |
| parent | b0b37569a74112cb7d3cadc3705819e65f2f298c (diff) | |
Enable elasticsearch-curator on elasticsearch 7
The current nixpkgs use elasticsearch-curator 5.8.1. As of version 5.7.0,
elasticsearch-curator supports elasticsearch 7, thus this change enables tests
with ES 7.
Diffstat (limited to 'nixos/tests/elk.nix')
| -rw-r--r-- | nixos/tests/elk.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 80db0967d400..d3dc6dde1359 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -10,8 +10,7 @@ let esUrl = "http://localhost:9200"; mkElkTest = name : elk : - let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0; - in import ./make-test-python.nix ({ + import ./make-test-python.nix ({ inherit name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco offline basvandijk ]; @@ -91,8 +90,7 @@ let }; elasticsearch-curator = { - # The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0. - enable = !elasticsearchGe7; + enable = true; actionYAML = '' --- actions: @@ -173,7 +171,7 @@ let one.wait_until_succeeds( total_hits("Supercalifragilisticexpialidocious") + " | grep -v 0" ) - '' + pkgs.lib.optionalString (!elasticsearchGe7) '' + with subtest("Elasticsearch-curator works"): one.systemctl("stop logstash") one.systemctl("start elasticsearch-curator") |