0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

statsd: restore support for {influx,librato,stackdriver} backends

These packages will be placed into an environment using
`backendsToPackages`. This function explicitly maps backends to
`pkgs.nodePackages.${type}` unless it's a builtin. This ensures that only
valid backends that work on NixOS are used (if not, the build already
breaks at evaluation time).

The log will be redirected to `stdout` to be able to watch the entire
output using `journalctl`.

Configuration parameters for the backends need to be set using
`services.statsd.extraConfig` as each backend has its own options and
all of them shouldn't be validated and checked explicitly and manually.
This commit is contained in:
Maximilian Bosch 2017-11-25 23:54:37 +01:00 committed by Rok Garbas
parent 67a86f7813
commit aaf1e1c4fb
5 changed files with 406 additions and 279 deletions

View file

@ -9,6 +9,12 @@ let
isBuiltinBackend = name: isBuiltinBackend = name:
builtins.elem name [ "graphite" "console" "repeater" ]; builtins.elem name [ "graphite" "console" "repeater" ];
backendsToPackages = let
mkMap = list: name:
if isBuiltinBackend name then list
else list ++ [ pkgs.nodePackages.${name} ];
in foldl mkMap [];
configFile = pkgs.writeText "statsd.conf" '' configFile = pkgs.writeText "statsd.conf" ''
{ {
address: "${cfg.listenAddress}", address: "${cfg.listenAddress}",
@ -27,13 +33,21 @@ let
prettyprint: false prettyprint: false
}, },
log: { log: {
backend: "syslog" backend: "stdout"
}, },
automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","} automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","}
${cfg.extraConfig} ${cfg.extraConfig}
} }
''; '';
deps = pkgs.buildEnv {
name = "statsd-runtime-deps";
pathsToLink = [ "/lib" ];
ignoreCollisions = true;
paths = backendsToPackages cfg.backends;
};
in in
{ {
@ -42,11 +56,7 @@ in
options.services.statsd = { options.services.statsd = {
enable = mkOption { enable = mkEnableOption "statsd";
description = "Whether to enable statsd stats aggregation service";
default = false;
type = types.bool;
};
listenAddress = mkOption { listenAddress = mkOption {
description = "Address that statsd listens on over UDP"; description = "Address that statsd listens on over UDP";
@ -110,6 +120,11 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = map (backend: {
assertion = !isBuiltinBackend backend -> hasAttrByPath [ backend ] pkgs.nodePackages;
message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!";
}) cfg.backends;
users.extraUsers = singleton { users.extraUsers = singleton {
name = "statsd"; name = "statsd";
uid = config.ids.uids.statsd; uid = config.ids.uids.statsd;
@ -120,9 +135,7 @@ in
description = "Statsd Server"; description = "Statsd Server";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = { environment = {
NODE_PATH=concatMapStringsSep ":" NODE_PATH = "${deps}/lib/node_modules";
(pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules")
(filter (name: !isBuiltinBackend name) cfg.backends);
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}"; ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}";

View file

@ -68,4 +68,8 @@ nodePackages // {
''; '';
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
}); });
# create an alias to ensure that Nix finds the appropriate package
# by adopting the naming convention (statsd-`type`-backend) for statsd plugins.
statsd-stackdriver-backend = nodePackages.stackdriver-statsd-backend;
} }

View file

@ -175,13 +175,13 @@ let
sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
}; };
}; };
"interpret-1.0.4" = { "interpret-1.1.0" = {
name = "interpret"; name = "interpret";
packageName = "interpret"; packageName = "interpret";
version = "1.0.4"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz";
sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614";
}; };
}; };
"liftoff-2.3.0" = { "liftoff-2.3.0" = {
@ -1300,13 +1300,13 @@ let
sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f";
}; };
}; };
"array-slice-1.0.0" = { "array-slice-1.1.0" = {
name = "array-slice"; name = "array-slice";
packageName = "array-slice"; packageName = "array-slice";
version = "1.0.0"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz";
sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7";
}; };
}; };
"for-own-1.0.0" = { "for-own-1.0.0" = {
@ -2119,13 +2119,13 @@ let
sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
}; };
}; };
"ajv-5.5.0" = { "ajv-5.5.1" = {
name = "ajv"; name = "ajv";
packageName = "ajv"; packageName = "ajv";
version = "5.5.0"; version = "5.5.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz"; url = "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz";
sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"; sha1 = "b38bb8876d9e86bee994956a04e721e88b248eb2";
}; };
}; };
"har-schema-2.0.0" = { "har-schema-2.0.0" = {
@ -4045,13 +4045,13 @@ let
sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
}; };
}; };
"commander-2.12.1" = { "commander-2.12.2" = {
name = "commander"; name = "commander";
packageName = "commander"; packageName = "commander";
version = "2.12.1"; version = "2.12.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz"; url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";
sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw"; sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84";
}; };
}; };
"is-my-json-valid-2.16.1" = { "is-my-json-valid-2.16.1" = {
@ -4356,7 +4356,7 @@ in
}) })
]; ];
}) })
sources."interpret-1.0.4" sources."interpret-1.1.0"
(sources."liftoff-2.3.0" // { (sources."liftoff-2.3.0" // {
dependencies = [ dependencies = [
sources."extend-3.0.1" sources."extend-3.0.1"
@ -4518,7 +4518,7 @@ in
(sources."object.defaults-1.1.0" // { (sources."object.defaults-1.1.0" // {
dependencies = [ dependencies = [
sources."array-each-1.0.1" sources."array-each-1.0.1"
sources."array-slice-1.0.0" sources."array-slice-1.1.0"
(sources."for-own-1.0.0" // { (sources."for-own-1.0.0" // {
dependencies = [ dependencies = [
sources."for-in-1.0.2" sources."for-in-1.0.2"
@ -4835,7 +4835,7 @@ in
}) })
(sources."har-validator-5.0.3" // { (sources."har-validator-5.0.3" // {
dependencies = [ dependencies = [
(sources."ajv-5.5.0" // { (sources."ajv-5.5.1" // {
dependencies = [ dependencies = [
sources."co-4.6.0" sources."co-4.6.0"
sources."fast-deep-equal-1.0.0" sources."fast-deep-equal-1.0.0"
@ -6248,7 +6248,7 @@ in
sources."supports-color-2.0.0" sources."supports-color-2.0.0"
]; ];
}) })
sources."commander-2.12.1" sources."commander-2.12.2"
(sources."is-my-json-valid-2.16.1" // { (sources."is-my-json-valid-2.16.1" // {
dependencies = [ dependencies = [
sources."generate-function-2.0.0" sources."generate-function-2.0.0"

View file

@ -80,7 +80,10 @@
, "sloc" , "sloc"
, "smartdc" , "smartdc"
, "socket.io" , "socket.io"
, "stackdriver-statsd-backend"
, "statsd" , "statsd"
, "statsd-influxdb-backend"
, "statsd-librato-backend"
, "stylus" , "stylus"
, "svgo" , "svgo"
, "tern" , "tern"

File diff suppressed because it is too large Load diff