diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-02 16:39:57 +0200 |
---|---|---|
committer | Robert Schütz <rschuetz17@gmail.com> | 2018-08-02 16:39:57 +0200 |
commit | 0aae3fda066752a84762ccc5438cae1b22f07b5e (patch) | |
tree | 883be1af541724b0c9641c8e174a11cfbe1600c3 /nixos | |
parent | 86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac (diff) | |
download | nixpkgs-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar nixpkgs-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.gz nixpkgs-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.bz2 nixpkgs-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.lz nixpkgs-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.xz nixpkgs-0aae3fda066752a84762ccc5438cae1b22f07b5e.tar.zst nixpkgs-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')
-rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 14 | ||||
-rw-r--r-- | nixos/tests/graphite.nix | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 7ad26c137e5..cdfd746bc5a 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -136,7 +136,7 @@ in { finders = mkOption { description = "List of finder plugins to load."; default = []; - example = literalExample "[ pkgs.python27Packages.graphite_influxdb ]"; + example = literalExample "[ pkgs.python27Packages.influxgraph ]"; type = types.listOf types.package; }; @@ -485,7 +485,7 @@ in { PYTHONPATH = let penv = pkgs.python.buildEnv.override { extraLibs = [ - pythonPackages.graphite_web + pythonPackages.graphite-web pythonPackages.pysqlite ]; }; @@ -524,16 +524,16 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite-web}" ]; then mkdir -p ${staticDir} ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web" + ln -sfT "${pythonPackages.graphite-web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pythonPackages.graphite_web ]; + environment.systemPackages = [ pythonPackages.graphite-web ]; })) (mkIf cfg.api.enable { @@ -607,7 +607,7 @@ in { GRAPHITE_URL = cfg.pager.graphiteUrl; }; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.graphite_pager}/bin/graphite-pager --config ${pagerConfig}"; + ExecStart = "${pkgs.pythonPackages.graphitepager}/bin/graphite-pager --config ${pagerConfig}"; User = "graphite"; Group = "graphite"; }; @@ -615,7 +615,7 @@ in { services.redis.enable = mkDefault true; - environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ]; + environment.systemPackages = [ pkgs.pythonPackages.graphitepager ]; }) (mkIf cfg.beacon.enable { diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 1fe4357191e..27a87bdbb9f 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 |