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

Merge pull request #116936 from hercules-ci/logstash-jdk

Browse Source
This commit is contained in:
Sandro 2021-03-30 17:22:21 +02:00 committed by GitHub
commit 7d0dad76ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/logging/logstash.nix
View File

@ -159,10 +159,9 @@ in
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.logstash = with pkgs; { systemd.services.logstash = {
description = "Logstash Daemon"; description = "Logstash Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = { JAVA_HOME = jre; };
path = [ pkgs.bash ]; path = [ pkgs.bash ];
serviceConfig = { serviceConfig = {
ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''; ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'';

1
nixos/tests/elk.nix
View File

@ -120,6 +120,7 @@ let
}; };
}; };
passthru.elkPackages = elk;
testScript = '' testScript = ''
import json import json

11
pkgs/tools/misc/logstash/6.x.nix
View File

@ -3,12 +3,13 @@
, lib, stdenv , lib, stdenv
, fetchurl , fetchurl
, makeWrapper , makeWrapper
, nixosTests
, jre , jre
}: }:
with lib; with lib;
stdenv.mkDerivation rec { let this = stdenv.mkDerivation rec {
version = elk6Version; version = elk6Version;
name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
@ -52,4 +53,12 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wjlroe offline basvandijk ]; maintainers = with maintainers; [ wjlroe offline basvandijk ];
}; };
passthru.tests =
optionalAttrs (!enableUnfree) (
assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath;
{
elk = nixosTests.elk.ELK-6;
} }
);
};
in this

11
pkgs/tools/misc/logstash/7.x.nix
View File

@ -3,12 +3,13 @@
, lib, stdenv , lib, stdenv
, fetchurl , fetchurl
, makeWrapper , makeWrapper
, nixosTests
, jre , jre
}: }:
with lib; with lib;
stdenv.mkDerivation rec { let this = stdenv.mkDerivation rec {
version = elk7Version; version = elk7Version;
name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
@ -52,4 +53,12 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wjlroe offline basvandijk ]; maintainers = with maintainers; [ wjlroe offline basvandijk ];
}; };
passthru.tests =
optionalAttrs (!enableUnfree) (
assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath;
{
elk = nixosTests.elk.ELK-7;
} }
);
};
in this

14
pkgs/top-level/all-packages.nix
View File

@ -5849,13 +5849,23 @@ in
lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash6 = callPackage ../tools/misc/logstash/6.x.nix {
# https://www.elastic.co/support/matrix#logstash-and-jvm
jre = jdk11_headless;
};
logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix {
enableUnfree = false; enableUnfree = false;
# https://www.elastic.co/support/matrix#logstash-and-jvm
jre = jdk11_headless;
};
logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
# https://www.elastic.co/support/matrix#logstash-and-jvm
jre = jdk11_headless;
}; };
logstash7 = callPackage ../tools/misc/logstash/7.x.nix { };
logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix {
enableUnfree = false; enableUnfree = false;
# https://www.elastic.co/support/matrix#logstash-and-jvm
jre = jdk11_headless;
}; };
logstash = logstash6; logstash = logstash6;