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

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

Browse Source 
This reverts commit 35db6bc554.
This commit is contained in:
Robert Hensing 2021-11-03 11:41:53 +01:00
parent 1faa5d5915
commit a9952f0093
1 changed files with 18 additions and 11 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; }; }) { inherit pkgs system; };
in pkgs.lib.mapAttrs mkElkTest ({ in pkgs.lib.mapAttrs mkElkTest {
ELK-6 = ELK-6 =
if enableUnfree if enableUnfree
then { then {
@ -233,13 +233,20 @@ in pkgs.lib.mapAttrs mkElkTest ({
journalbeat = pkgs.journalbeat6; journalbeat = pkgs.journalbeat6;
metricbeat = pkgs.metricbeat6; metricbeat = pkgs.metricbeat6;
}; };
} // pkgs.lib.optionalAttrs enableUnfree { ELK-7 =
ELK-7 = if enableUnfree
{ then {
elasticsearch = pkgs.elasticsearch7; elasticsearch = pkgs.elasticsearch7;
logstash = pkgs.logstash7; logstash = pkgs.logstash7;
kibana = pkgs.kibana7; kibana = pkgs.kibana7;
journalbeat = pkgs.journalbeat7; journalbeat = pkgs.journalbeat7;
metricbeat = pkgs.metricbeat7; metricbeat = pkgs.metricbeat7;
}; }
}) else {
elasticsearch = pkgs.elasticsearch7-oss;
logstash = pkgs.logstash7-oss;
kibana = pkgs.kibana7-oss;
journalbeat = pkgs.journalbeat7;
metricbeat = pkgs.metricbeat7;
};
}