colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

statsd: updated package and nixos service

Browse Source 
* package statsd node packages separatly since they actually require
  nodejs-0.10 or nodejs-0.12 to work (which is ... well old)

* remove statsd packages and its backends from "global" node-packages.json.
  i did not rebuild it since for some reason npm2nix command fails. next time
  somebody will rerun npm2nix statsd packages are going to be removed.

* statsd service: backends are now provided as strings and not anymore as
  packages.
This commit is contained in:
Rok Garbas 2015-11-27 21:36:47 +01:00
parent c6932509b8
commit 2de0dc1a18
6 changed files with 291 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/modules/services/monitoring/statsd.nix
View File

@ -6,13 +6,21 @@ let
cfg = config.services.statsd;
isBuiltinBackend = name:
builtins.elem name [ "graphite" "console" "repeater" ];
configFile = pkgs.writeText "statsd.conf" ''
{
address: "${cfg.host}",
port: "${toString cfg.port}",
mgmt_address: "${cfg.mgmt_address}",
mgmt_port: "${toString cfg.mgmt_port}",
backends: [${concatMapStringsSep "," (el: if (nixType el) == "string" then ''"./backends/${el}"'' else ''"${head el.names}"'') cfg.backends}],
backends: [${
concatMapStringsSep "," (name:
if (isBuiltinBackend name)
then ''"./backends/${name}"''
else ''"${name}"''
) cfg.backends}],
${optionalString (cfg.graphiteHost!=null) ''graphiteHost: "${cfg.graphiteHost}",''}
${optionalString (cfg.graphitePort!=null) ''graphitePort: "${toString cfg.graphitePort}",''}
console: {
@ -66,9 +74,16 @@ in
backends = mkOption {
description = "List of backends statsd will use for data persistence";
default = ["graphite"];
example = ["graphite" pkgs.nodePackages."statsd-influxdb-backend"];
type = types.listOf (types.either types.str types.package);
default = [];
example = [
"graphite"
"console"
"repeater"
"statsd-librato-backend"
"stackdriver-statsd-backend"
"statsd-influxdb-backend"
];
type = types.listOf types.str;
};
graphiteHost = mkOption {
@ -105,15 +120,17 @@ in
description = "Statsd Server";
wantedBy = [ "multi-user.target" ];
environment = {
NODE_PATH=concatMapStringsSep ":" (el: "${el}/lib/node_modules") (filter (el: (nixType el) != "string") cfg.backends);
NODE_PATH=concatMapStringsSep ":"
(pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules")
(filter (name: !isBuiltinBackend name) cfg.backends);
};
serviceConfig = {
ExecStart = "${pkgs.nodePackages.statsd}/bin/statsd ${configFile}";
ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}";
User = "statsd";
};
};
environment.systemPackages = [pkgs.nodePackages.statsd];
environment.systemPackages = [ pkgs.statsd ];
};

13
pkgs/tools/networking/statsd/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ recurseIntoAttrs, callPackage, nodejs
}:
let
self = recurseIntoAttrs (
callPackage <nixpkgs/pkgs/top-level/node-packages.nix> {
inherit nodejs self;
generated = callPackage ./node-packages.nix { inherit self; };
overrides = {
"statsd" = { passthru.nodePackages = self; };
};
});
in self.statsd

6
pkgs/tools/networking/statsd/node-packages.json Normal file
View File

@ -0,0 +1,6 @@
[
"statsd"
, "statsd-librato-backend"
, "stackdriver-statsd-backend"
, "statsd-influxdb-backend"
]

244
pkgs/tools/networking/statsd/node-packages.nix Normal file
View File

@ -0,0 +1,244 @@
{ self, fetchurl, fetchgit ? null, lib }:
{
by-spec."commander"."1.3.1" =
self.by-version."commander"."1.3.1";
by-version."commander"."1.3.1" = self.buildNodePackage {
name = "commander-1.3.1";
version = "1.3.1";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
name = "commander-1.3.1.tgz";
sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
};
deps = {
"keypress-0.1.0" = self.by-version."keypress"."0.1.0";
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."connection-parse"."0.0.x" =
self.by-version."connection-parse"."0.0.7";
by-version."connection-parse"."0.0.7" = self.buildNodePackage {
name = "connection-parse-0.0.7";
version = "0.0.7";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
name = "connection-parse-0.0.7.tgz";
sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."hashring"."1.0.1" =
self.by-version."hashring"."1.0.1";
by-version."hashring"."1.0.1" = self.buildNodePackage {
name = "hashring-1.0.1";
version = "1.0.1";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
name = "hashring-1.0.1.tgz";
sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
};
deps = {
"connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
"simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2";
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."keypress"."0.1.x" =
self.by-version."keypress"."0.1.0";
by-version."keypress"."0.1.0" = self.buildNodePackage {
name = "keypress-0.1.0";
version = "0.1.0";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
name = "keypress-0.1.0.tgz";
sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."node-syslog"."1.1.7" =
self.by-version."node-syslog"."1.1.7";
by-version."node-syslog"."1.1.7" = self.buildNodePackage {
name = "node-syslog-1.1.7";
version = "1.1.7";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
name = "node-syslog-1.1.7.tgz";
sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."sequence"."2.2.1" =
self.by-version."sequence"."2.2.1";
by-version."sequence"."2.2.1" = self.buildNodePackage {
name = "sequence-2.2.1";
version = "2.2.1";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
name = "sequence-2.2.1.tgz";
sha1 = "7f5617895d44351c0a047e764467690490a16b03";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."simple-lru-cache"."0.0.x" =
self.by-version."simple-lru-cache"."0.0.2";
by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage {
name = "simple-lru-cache-0.0.2";
version = "0.0.2";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
name = "simple-lru-cache-0.0.2.tgz";
sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."stackdriver-statsd-backend"."*" =
self.by-version."stackdriver-statsd-backend"."0.2.3";
by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage {
name = "stackdriver-statsd-backend-0.2.3";
version = "0.2.3";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
name = "stackdriver-statsd-backend-0.2.3.tgz";
sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
"stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
by-spec."statsd"."*" =
self.by-version."statsd"."0.7.2";
by-version."statsd"."0.7.2" = self.buildNodePackage {
name = "statsd-0.7.2";
version = "0.7.2";
bin = true;
src = fetchurl {
url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
name = "statsd-0.7.2.tgz";
sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
};
deps = {
};
optionalDependencies = {
"node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
"hashring-1.0.1" = self.by-version."hashring"."1.0.1";
"winser-0.1.6" = self.by-version."winser"."0.1.6";
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
"statsd" = self.by-version."statsd"."0.7.2";
by-spec."statsd-influxdb-backend"."*" =
self.by-version."statsd-influxdb-backend"."0.6.0";
by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage {
name = "statsd-influxdb-backend-0.6.0";
version = "0.6.0";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
name = "statsd-influxdb-backend-0.6.0.tgz";
sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
"statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0";
by-spec."statsd-librato-backend"."*" =
self.by-version."statsd-librato-backend"."0.1.7";
by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage {
name = "statsd-librato-backend-0.1.7";
version = "0.1.7";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
name = "statsd-librato-backend-0.1.7.tgz";
sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
"statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7";
by-spec."winser"."=0.1.6" =
self.by-version."winser"."0.1.6";
by-version."winser"."0.1.6" = self.buildNodePackage {
name = "winser-0.1.6";
version = "0.1.6";
bin = true;
src = fetchurl {
url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
name = "winser-0.1.6.tgz";
sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
};
deps = {
"sequence-2.2.1" = self.by-version."sequence"."2.2.1";
"commander-1.3.1" = self.by-version."commander"."1.3.1";
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -12983,6 +12983,10 @@ let
stella = callPackage ../misc/emulators/stella { };
statsd = callPackage ../tools/networking/statsd {
nodejs = nodejs-0_10;
};
linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { })

4
pkgs/top-level/node-packages.json
View File

@ -66,10 +66,6 @@
, "flatiron"
, "ironhorse"
, "fs-walk"
, { "statsd": "https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e"}
, "statsd-librato-backend"
, "stackdriver-statsd-backend"
, "statsd-influxdb-backend"
, "ungit"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }