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

nixos/tests/elk: remove OSS ELK-7 test

Browse Source
This commit is contained in:
Andrew Childs 2021-02-26 20:03:50 +09:00 committed by Robert Hensing
parent b7f4556002
commit 35db6bc554
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/tests/elk.nix
View File

@ -216,7 +216,7 @@ let
)
'';
}) { inherit pkgs system; };
in pkgs.lib.mapAttrs mkElkTest {
in pkgs.lib.mapAttrs mkElkTest ({
ELK-6 =
if enableUnfree
then {
@ -233,20 +233,13 @@ in pkgs.lib.mapAttrs mkElkTest {
journalbeat = pkgs.journalbeat6;
metricbeat = pkgs.metricbeat6;
};
ELK-7 =
if enableUnfree
then {
elasticsearch = pkgs.elasticsearch7;
logstash = pkgs.logstash7;
kibana = pkgs.kibana7;
journalbeat = pkgs.journalbeat7;
metricbeat = pkgs.metricbeat7;
}
else {
elasticsearch = pkgs.elasticsearch7-oss;
logstash = pkgs.logstash7-oss;
kibana = pkgs.kibana7-oss;
journalbeat = pkgs.journalbeat7;
metricbeat = pkgs.metricbeat7;
};
}
} // pkgs.lib.optionalAttrs enableUnfree {
ELK-7 =
{
elasticsearch = pkgs.elasticsearch7;
logstash = pkgs.logstash7;
kibana = pkgs.kibana7;
journalbeat = pkgs.journalbeat7;
metricbeat = pkgs.metricbeat7;
};
})