nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

logstash: 1.5.3 -> 2.3.4

Browse Source 
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.
This commit is contained in:
Christian Lask 2016-07-27 17:45:38 +02:00
parent 381967327f
commit 6d68a1fbf3
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,12 +51,6 @@ in
description = "Logging verbosity level."; description = "Logging verbosity level.";
}; };
watchdogTimeout = mkOption {
type = types.int;
default = 10;
description = "Set watchdog timeout value in seconds.";
};
filterWorkers = mkOption { filterWorkers = mkOption {
type = types.int; type = types.int;
default = 1; default = 1;
@ -140,7 +134,6 @@ in
"-w ${toString cfg.filterWorkers} " + "-w ${toString cfg.filterWorkers} " +
ops havePluginPath "--pluginpath ${pluginPath} " + ops havePluginPath "--pluginpath ${pluginPath} " +
"${verbosityFlag} " + "${verbosityFlag} " +
"--watchdog-timeout ${toString cfg.watchdogTimeout} " +
"-f ${writeText "logstash.conf" '' "-f ${writeText "logstash.conf" ''
input { input {
${cfg.inputConfig} ${cfg.inputConfig}

4
pkgs/tools/misc/logstash/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.5.3"; version = "2.3.4";
name = "logstash-${version}"; name = "logstash-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b"; sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz";
}; };
dontBuild = true; dontBuild = true;