diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-12-18 20:53:54 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-01-02 01:15:29 +0100 |
| commit | 803077ef1cdac1dc7f0bc9224adbb0de45f6bffc (patch) | |
| tree | 014a53c7cb1b8c9367af266ab9212ee2074892f6 /pkgs/top-level | |
| parent | 95913d27689c506da5f3716394f1814ba66e9f50 (diff) | |
| download | nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.tar nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.tar.gz nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.tar.bz2 nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.tar.lz nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.tar.xz nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.tar.zst nixpkgs-803077ef1cdac1dc7f0bc9224adbb0de45f6bffc.zip | |
elk: add elasticsearch6, logstash6, kibana6 and the beats at v6.1.0
This change is backwards compatible since the ELK tools at version 5.x remain unchanged. The test suite now both tests ELK-5 and ELK-6.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4735f583b01..ac7a2fc397c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -741,12 +741,23 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats { }) + inherit (callPackages ../misc/logging/beats/5.x.nix { }) filebeat heartbeat metricbeat packetbeat; + inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in { + filebeat6 = beats6.filebeat; + heartbeat6 = beats6.heartbeat; + metricbeat6 = beats6.metricbeat; + packetbeat6 = beats6.packetbeat; + }) + filebeat6 + heartbeat6 + metricbeat6 + packetbeat6; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -1949,10 +1960,12 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.5"; + elk6Version = "6.1.0"; 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 { }; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } @@ -2956,6 +2969,7 @@ with pkgs; kibana = callPackage ../development/tools/misc/kibana { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -3022,6 +3036,7 @@ with pkgs; logstash = callPackage ../tools/misc/logstash { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; |