about summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2018-08-02 16:39:57 +0200
committerRobert Schütz <rschuetz17@gmail.com>2018-08-02 16:39:57 +0200
commit0aae3fda066752a84762ccc5438cae1b22f07b5e (patch)
tree883be1af541724b0c9641c8e174a11cfbe1600c3 /nixos/tests
parent86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac (diff)
downloadnixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar
nixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.gz
nixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.bz2
nixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.lz
nixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.xz
nixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.zst
nixlib-0aae3fda066752a84762ccc5438cae1b22f07b5e.zip
graphite: 1.0.2 -> 1.1.3 & moved dependencies to python-modules (#44276)
Fixes #30891

* Upgrade `graphite-web`, `carbon` and `whisper` from 1.0.2 -> 1.1.3.

* Replaced the deprecated `pythonPackages.graphite_influxdb` with
  `pythonPackages.influxgraph.`

* Renamed `pythonPackages.graphite_web` to `pythonPackages.graphite-web`
  to be consistent with the Python package name.

* Replaced the unmaintained `pythonPackages.graphite_pager` with
  `pythonPackages.graphitepager`

* Moved all new packages from `python-packages.nix` to
  `pkgs/development/python-modules`
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/graphite.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index 1fe4357191e3..27a87bdbb9f2 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... } :
+import ./make-test.nix ({ pkgs, ... } :
 {
   name = "graphite";
   nodes = {
@@ -11,10 +11,12 @@ import ./make-test.nix ({ ... } :
           api = {
             enable = true;
             port = 8082;
+            finders = [ pkgs.python27Packages.influxgraph ];
           };
           carbon.enableCache = true;
           seyren.enable = true;
           pager.enable = true;
+          beacon.enable = true;
         };
       };
   };
@@ -25,6 +27,7 @@ import ./make-test.nix ({ ... } :
     $one->waitForUnit("graphiteWeb.service");
     $one->waitForUnit("graphiteApi.service");
     $one->waitForUnit("graphitePager.service");
+    $one->waitForUnit("graphite-beacon.service");
     $one->waitForUnit("carbonCache.service");
     $one->waitForUnit("seyren.service");
     # The services above are of type "simple". systemd considers them active immediately