diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-11-03 11:41:53 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-11-03 11:41:53 +0100 |
| commit | a9952f0093b6316c87eb64083c09363ca95dba43 (patch) | |
| tree | a2e3b24879ef708f2f20a12306705014c050cca8 /nixos/tests/elk.nix | |
| parent | 1faa5d5915d877d966e5b54a5a228694037122cf (diff) | |
| download | nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.tar nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.tar.gz nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.tar.bz2 nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.tar.lz nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.tar.xz nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.tar.zst nixpkgs-a9952f0093b6316c87eb64083c09363ca95dba43.zip | |
Revert "nixos/tests/elk: remove OSS ELK-7 test"
This reverts commit 35db6bc5543d352ea7e54375ba12acd70033a7f9.
Diffstat (limited to 'nixos/tests/elk.nix')
| -rw-r--r-- | nixos/tests/elk.nix | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index f0ec06195a7..7225ae1f823 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -216,7 +216,7 @@ let ) ''; }) { inherit pkgs system; }; -in pkgs.lib.mapAttrs mkElkTest ({ +in pkgs.lib.mapAttrs mkElkTest { ELK-6 = if enableUnfree then { @@ -233,13 +233,20 @@ in pkgs.lib.mapAttrs mkElkTest ({ journalbeat = pkgs.journalbeat6; metricbeat = pkgs.metricbeat6; }; -} // pkgs.lib.optionalAttrs enableUnfree { - ELK-7 = - { - elasticsearch = pkgs.elasticsearch7; - logstash = pkgs.logstash7; - kibana = pkgs.kibana7; - journalbeat = pkgs.journalbeat7; - metricbeat = pkgs.metricbeat7; - }; -}) + 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; + }; +} |