diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-11-14 21:18:44 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-14 21:18:44 +0000 |
commit | 0a8063442cdb3ea6a6c6e7a8aa7795096effa34a (patch) | |
tree | b65f3bec5488b3d0fb16a66ff9ed9ef425945507 /nixos | |
parent | d70cb8894a6caa6414be2f0828eee9ba52ddd340 (diff) | |
parent | 96a899a16827bd48f373dd440f199f49f4445cab (diff) | |
download | nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.tar nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.tar.gz nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.tar.bz2 nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.tar.lz nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.tar.xz nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.tar.zst nixpkgs-0a8063442cdb3ea6a6c6e7a8aa7795096effa34a.zip |
Merge pull request #50361 from Mic92/node-packages-springclean
nodePackages: springclean
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/misc/ids.nix | 4 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
-rw-r--r-- | nixos/tests/statsd.nix | 51 |
4 files changed, 2 insertions, 55 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index aff562c00eb..082b2732cc5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -101,7 +101,7 @@ iodined = 66; #libvirtd = 67; # unused graphite = 68; - statsd = 69; + #statsd = 69; # removed 2018-11-14 transmission = 70; postgres = 71; #vboxusers = 72; # unused @@ -411,7 +411,7 @@ iodined = 66; libvirtd = 67; graphite = 68; - #statsd = 69; # unused + #statsd = 69; # removed 2018-11-14 transmission = 70; postgres = 71; vboxusers = 72; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e50a105e1b..0869125b712 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -452,7 +452,6 @@ ./services/monitoring/riemann-tools.nix ./services/monitoring/scollector.nix ./services/monitoring/smartd.nix - ./services/monitoring/statsd.nix ./services/monitoring/sysstat.nix ./services/monitoring/systemhealth.nix ./services/monitoring/teamviewer.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 754a8ff20b2..fb6b7c93888 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -190,7 +190,6 @@ in smokeping = handleTest ./smokeping.nix {}; snapper = handleTest ./snapper.nix {}; solr = handleTest ./solr.nix {}; - #statsd = handleTest ./statsd.nix {}; # statsd is broken: #45946 strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix deleted file mode 100644 index 666961249ce..00000000000 --- a/nixos/tests/statsd.nix +++ /dev/null @@ -1,51 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... }: - -with lib; - -{ - name = "statsd"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ma27 ]; - }; - - machine = { - services.statsd.enable = true; - services.statsd.backends = [ "statsd-influxdb-backend" "console" ]; - services.statsd.extraConfig = '' - influxdb: { - username: "root", - password: "root", - database: "statsd" - } - ''; - - services.influxdb.enable = true; - - systemd.services.influx-init = { - description = "Setup Influx Test Base"; - after = [ "influxdb.service" ]; - before = [ "statsd.service" ]; - - script = '' - echo "CREATE DATABASE statsd" | ${pkgs.influxdb}/bin/influx - ''; - }; - }; - - testScript = '' - $machine->start(); - $machine->waitForUnit("statsd.service"); - $machine->waitForOpenPort(8126); - - # check state of the `statsd` server - $machine->succeed('[ "health: up" = "$(echo health | nc 127.0.0.1 8126 -w 120 -N)" ];'); - - # confirm basic examples for metrics derived from docs: - # https://github.com/etsy/statsd/blob/v0.8.0/README.md#usage and - # https://github.com/etsy/statsd/blob/v0.8.0/docs/admin_interface.md - $machine->succeed("echo 'foo:1|c' | nc -u -w 0 127.0.0.1 8125"); - $machine->succeed("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo"); - $machine->succeed("echo 'delcounters foo' | nc -w 120 127.0.0.1 8126 -N"); - $machine->fail("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo"); - ''; -}) |