diff options
-rw-r--r-- | nixos/modules/services/monitoring/scollector.nix | 18 | ||||
-rw-r--r-- | pkgs/servers/monitoring/bosun/scollector.nix | 4 |
2 files changed, 16 insertions, 6 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}"; }; }; diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index bd4a5cb10478..d55a68ebdebe 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150506172827"; + rev = "0.3.0"; name = "scollector-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8"; + sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; }; subPackages = [ "cmd/scollector" ]; |