diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-04-14 21:39:46 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-04-14 21:39:46 +0200 |
commit | 13352f28d2b587a01c262cbee29678209c919e95 (patch) | |
tree | c0209fbd17a8e9da439dd55b592c1ce11ee78f1e /nixos/tests/elk.nix | |
parent | 917a7fa1cb2b5fdd028cc4b2955e7bb0eec5075a (diff) | |
download | nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.tar nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.tar.gz nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.tar.bz2 nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.tar.lz nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.tar.xz nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.tar.zst nixpkgs-13352f28d2b587a01c262cbee29678209c919e95.zip |
elk7: init at 7.0.0
This adds the following new packages: + elasticsearch7 + elasticsearch7-oss + logstash7 + logstash7-oss + kibana7 + kibana7-oss + filebeat7 + heartbeat7 + metricbeat7 + packetbeat7 + journalbeat7 The default major version of the ELK stack stays at 6. We should probably set it to 7 in a next commit.
Diffstat (limited to 'nixos/tests/elk.nix')
-rw-r--r-- | nixos/tests/elk.nix | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index a82e75799ae..3b3fbd73dd5 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -12,7 +12,9 @@ with pkgs.lib; let esUrl = "http://localhost:9200"; - mkElkTest = name : elk : makeTest { + mkElkTest = name : elk : + let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0; + in makeTest { inherit name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco offline basvandijk ]; @@ -69,11 +71,11 @@ let kibana = { enable = true; package = elk.kibana; - elasticsearch.url = esUrl; }; elasticsearch-curator = { - enable = true; + # The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0. + enable = !elasticsearchGe7; actionYAML = '' --- actions: @@ -126,7 +128,7 @@ let # See if logstash messages arive in elasticsearch. $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); - + '' + optionalString (!elasticsearchGe7) '' # Test elasticsearch-curator. $one->systemctl("stop logstash"); $one->systemctl("start elasticsearch-curator"); @@ -151,4 +153,16 @@ in mapAttrs mkElkTest { logstash = pkgs.logstash6-oss; kibana = pkgs.kibana6-oss; }; + "ELK-7" = + if enableUnfree + then { + elasticsearch = pkgs.elasticsearch7; + logstash = pkgs.logstash7; + kibana = pkgs.kibana7; + } + else { + elasticsearch = pkgs.elasticsearch7-oss; + logstash = pkgs.logstash7-oss; + kibana = pkgs.kibana7-oss; + }; } |