diff options
| author | Domen Kožar <domen@dev.si> | 2013-10-03 16:20:48 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2013-10-03 16:20:48 +0200 |
| commit | fb34754933b6ae4501af119c4eb1f34c431b3e1b (patch) | |
| tree | 0ed55903f3cbbd2d02f91f209be3b0fa45fa17fe /modules | |
| parent | 81d28e744c5dd40cfaf933e9d8a32335f3d8ab16 (diff) | |
| download | nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.tar nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.tar.gz nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.tar.bz2 nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.tar.lz nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.tar.xz nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.tar.zst nixlib-fb34754933b6ae4501af119c4eb1f34c431b3e1b.zip | |
Prettify graphite service
cc @offlinehacker
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/services/monitoring/graphite.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/services/monitoring/graphite.nix b/modules/services/monitoring/graphite.nix index ae03f7f69aaa..ec36db7b21c3 100644 --- a/modules/services/monitoring/graphite.nix +++ b/modules/services/monitoring/graphite.nix @@ -5,9 +5,7 @@ with pkgs.lib; let cfg = config.services.graphite; writeTextOrNull = f: t: if t == null then null else pkgs.writeText f t; - dataDir = "/var/db/graphite"; - in { ###### interface @@ -160,13 +158,16 @@ in { GRAPHITE_STORAGE_DIR = "/var/db/graphite/"; }; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-cache.py --debug --pidfile /tmp/carbonCache.pid start"; + ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-cache.py --pidfile /tmp/carbonCache.pid start"; User = "graphite"; Group = "graphite"; }; restartTriggers = [ - pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.storageAggregation - cfg.carbon.storageSchemas cfg.carbon.rewriteRules + pkgs.pythonPackages.carbon + cfg.carbon.config + cfg.carbon.storageAggregation + cfg.carbon.storageSchemas + cfg.carbon.rewriteRules ]; preStart = '' mkdir -p ${dataDir}/whisper @@ -182,7 +183,7 @@ in { GRAPHITE_STORAGE_DIR = "${dataDir}"; }; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-aggregator.py --debug --pidfile /tmp/carbonAggregator.pid start"; + ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-aggregator.py --pidfile /tmp/carbonAggregator.pid start"; User = "graphite"; Group = "graphite"; }; @@ -200,7 +201,7 @@ in { GRAPHITE_STORAGE_DIR = "${dataDir}"; }; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-relay.py --debug --pidfile /tmp/carbonRelay.pid start"; + ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-relay.py --pidfile /tmp/carbonRelay.pid start"; User = "graphite"; Group = "graphite"; }; @@ -241,12 +242,14 @@ in { fi ''; restartTriggers = [ - pkgs.python27Packages.graphite_web pkgs.python27Packages.waitress + pkgs.python27Packages.graphite_web + pkgs.python27Packages.waitress ]; }; environment.systemPackages = [ - pkgs.pythonPackages.carbon pkgs.python27Packages.graphite_web + pkgs.pythonPackages.carbon + pkgs.python27Packages.graphite_web pkgs.python27Packages.waitress ]; |