Merge pull request #4392 from cstrahan/logstash

logstash service improvements
This commit is contained in:
Jaka Hudoklin 2014-10-12 23:02:52 +02:00
commit dd0758ab6b
3 changed files with 91 additions and 11 deletions

View File

@ -4,6 +4,9 @@ with lib;
let
cfg = config.services.logstash;
pluginPath = lib.concatStringsSep ":" cfg.plugins;
havePluginPath = lib.length cfg.plugins > 0;
ops = lib.optionalString;
in
@ -20,12 +23,50 @@ in
description = "Enable logstash.";
};
package = mkOption {
type = types.package;
default = pkgs.logstash;
example = literalExample "pkgs.logstash";
description = "Logstash package to use.";
};
plugins = mkOption {
type = types.listOf types.path;
default = [ ];
example = literalExample "[ pkgs.logstash-contrib ]";
description = "The paths to find other logstash plugins in.";
};
watchdogTimeout = mkOption {
type = types.int;
default = 10;
description = "Set watchdog timeout value in seconds.";
};
filterWorkers = mkOption {
type = types.int;
default = 1;
description = "The quantity of filter workers to run.";
};
enableWeb = mkOption {
type = types.bool;
default = false;
description = "Enable the logstash web interface.";
};
address = mkOption {
type = types.str;
default = "0.0.0.0";
description = "Address on which to start webserver.";
};
port = mkOption {
type = types.str;
default = "9292";
description = "Port on which to start webserver.";
};
inputConfig = mkOption {
type = types.lines;
default = ''stdin { type => "example" }'';
@ -79,19 +120,25 @@ in
wantedBy = [ "multi-user.target" ];
environment = { JAVA_HOME = jre; };
serviceConfig = {
ExecStart = "${logstash}/bin/logstash agent -f ${writeText "logstash.conf" ''
input {
${cfg.inputConfig}
}
ExecStart =
"${cfg.package}/bin/logstash agent " +
"-w ${toString cfg.filterWorkers} " +
ops havePluginPath "--pluginpath ${pluginPath} " +
"--watchdog-timeout ${toString cfg.watchdogTimeout} " +
"-f ${writeText "logstash.conf" ''
input {
${cfg.inputConfig}
}
filter {
${cfg.filterConfig}
}
filter {
${cfg.filterConfig}
}
output {
${cfg.outputConfig}
}
''} ${optionalString cfg.enableWeb "-- web"}";
output {
${cfg.outputConfig}
}
''} " +
ops cfg.enableWeb "-- web -a ${cfg.address} -p ${cfg.port}";
};
};
};

View File

@ -0,0 +1,31 @@
{ stdenv, lib, fetchzip }:
# Note that plugins are supposed to be installed as:
# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
stdenv.mkDerivation rec {
version = "1.4.2";
name = "logstash-contrib-${version}";
src = fetchzip {
url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k";
};
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
dontPatchShebangs = true;
installPhase = ''
mkdir -p $out/logstash
cp -r lib/* $out
'';
meta = with lib; {
description = "Community-maintained logstash plugins";
homepage = https://github.com/elasticsearch/logstash-contrib;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}

View File

@ -1504,6 +1504,8 @@ let
logstash = callPackage ../tools/misc/logstash { };
logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { };
logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { };
kippo = callPackage ../servers/kippo { };