diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2015-08-11 13:45:10 +0200 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2015-08-11 13:46:17 +0200 |
| commit | 3afc387b4ab84d48140461254015106bedad8599 (patch) | |
| tree | 9372bb8a34650a298a6e49c5b31e4dcf837de525 /nixos/modules | |
| parent | 9f7cfea070a79c9ef2a3c868443b9a938b071d56 (diff) | |
| download | nixlib-3afc387b4ab84d48140461254015106bedad8599.tar nixlib-3afc387b4ab84d48140461254015106bedad8599.tar.gz nixlib-3afc387b4ab84d48140461254015106bedad8599.tar.bz2 nixlib-3afc387b4ab84d48140461254015106bedad8599.tar.lz nixlib-3afc387b4ab84d48140461254015106bedad8599.tar.xz nixlib-3afc387b4ab84d48140461254015106bedad8599.tar.zst nixlib-3afc387b4ab84d48140461254015106bedad8599.zip | |
scollector: Update from 20150506172827 to 0.3.0
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/monitoring/scollector.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 179c587431ea..8b97daf8881a 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -20,9 +20,11 @@ let cfg.collectors)} ''; - cmdLineOpts = concatStringsSep " " ( - [ "-h=${cfg.bosunHost}" "-c=${collectors}" ] ++ cfg.extraOpts - ); + conf = pkgs.writeText "scollector.toml" '' + Host = "${cfg.bosunHost}" + ColDir = "${collectors}" + ${cfg.extraConfig} + ''; in { @@ -92,6 +94,14 @@ in { ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra scollector configuration added to the end of scollector.toml + ''; + }; + }; }; @@ -108,7 +118,7 @@ in { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/scollector ${cmdLineOpts}"; + ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; }; }; |