logstash: 1.5.3 -> 2.3.4

Note: the option to configure the watchdog timeout seems to be gone
in the 2.3 series of Logstash. It complains about an unknown option
and it is not in the source anymore. I am thus removing this
configuration option to adjust the service to these changes, too.

Changed files
+2 -9
nixos
modules
services
logging
pkgs
tools
misc
logstash
-7
nixos/modules/services/logging/logstash.nix
···
description = "Logging verbosity level.";
};
-
watchdogTimeout = mkOption {
-
type = types.int;
-
default = 10;
-
description = "Set watchdog timeout value in seconds.";
-
};
-
filterWorkers = mkOption {
type = types.int;
default = 1;
···
"-w ${toString cfg.filterWorkers} " +
ops havePluginPath "--pluginpath ${pluginPath} " +
"${verbosityFlag} " +
-
"--watchdog-timeout ${toString cfg.watchdogTimeout} " +
"-f ${writeText "logstash.conf" ''
input {
${cfg.inputConfig}
+2 -2
pkgs/tools/misc/logstash/default.nix
···
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
-
version = "1.5.3";
+
version = "2.3.4";
name = "logstash-${version}";
src = fetchurl {
url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
-
sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b";
+
sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz";
};
dontBuild = true;