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.

+2 -9
-7
nixos/modules/services/logging/logstash.nix
··· 51 description = "Logging verbosity level."; 52 }; 53 54 - watchdogTimeout = mkOption { 55 - type = types.int; 56 - default = 10; 57 - description = "Set watchdog timeout value in seconds."; 58 - }; 59 - 60 filterWorkers = mkOption { 61 type = types.int; 62 default = 1; ··· 140 "-w ${toString cfg.filterWorkers} " + 141 ops havePluginPath "--pluginpath ${pluginPath} " + 142 "${verbosityFlag} " + 143 - "--watchdog-timeout ${toString cfg.watchdogTimeout} " + 144 "-f ${writeText "logstash.conf" '' 145 input { 146 ${cfg.inputConfig}
··· 51 description = "Logging verbosity level."; 52 }; 53 54 filterWorkers = mkOption { 55 type = types.int; 56 default = 1; ··· 134 "-w ${toString cfg.filterWorkers} " + 135 ops havePluginPath "--pluginpath ${pluginPath} " + 136 "${verbosityFlag} " + 137 "-f ${writeText "logstash.conf" '' 138 input { 139 ${cfg.inputConfig}
+2 -2
pkgs/tools/misc/logstash/default.nix
··· 1 { stdenv, fetchurl }: 2 3 stdenv.mkDerivation rec { 4 - version = "1.5.3"; 5 name = "logstash-${version}"; 6 7 src = fetchurl { 8 url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; 9 - sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b"; 10 }; 11 12 dontBuild = true;
··· 1 { stdenv, fetchurl }: 2 3 stdenv.mkDerivation rec { 4 + version = "2.3.4"; 5 name = "logstash-${version}"; 6 7 src = fetchurl { 8 url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; 9 + sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz"; 10 }; 11 12 dontBuild = true;