diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 50f621ef307e..7e8dea4ec024 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -30,8 +30,8 @@ in { package = mkOption { type = types.package; - default = pkgs.bosun.bin; - example = literalExample "pkgs.bosun.bin"; + default = pkgs.bosun; + example = literalExample "pkgs.bosun"; description = '' bosun binary to use. ''; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index cac0a809c963..8b97daf8881a 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -42,8 +42,8 @@ in { package = mkOption { type = types.package; - default = pkgs.scollector.bin; - example = literalExample "pkgs.scollector.bin"; + default = pkgs.scollector; + example = literalExample "pkgs.scollector"; description = '' scollector binary to use. ''; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix deleted file mode 100644 index 15cdc52fb863..000000000000 --- a/pkgs/servers/monitoring/bosun/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - rev = "0.3.0"; - name = "bosun-${rev}"; - goPackagePath = "bosun.org"; - src = fetchFromGitHub { - inherit rev; - owner = "bosun-monitor"; - repo = "bosun"; - sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; - }; - subPackages = [ "cmd/bosun" ]; - - meta = with lib; { - description = "Time series alerting framework"; - longDescription = '' - An advanced, open-source monitoring and alerting system by Stack Exchange. - ''; - homepage = http://bosun.org; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix deleted file mode 100644 index d55a68ebdebe..000000000000 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - rev = "0.3.0"; - name = "scollector-${rev}"; - goPackagePath = "bosun.org"; - src = fetchFromGitHub { - inherit rev; - owner = "bosun-monitor"; - repo = "bosun"; - sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; - }; - subPackages = [ "cmd/scollector" ]; - - meta = with lib; { - description = "Collect system information and store it in OpenTSDB or Bosun"; - homepage = http://bosun.org/scollector; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 318ce44564aa..2c6222996ad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8947,8 +8947,8 @@ let bird = callPackage ../servers/bird { }; - bosun = callPackage ../servers/monitoring/bosun { goPackages = go14Packages; }; - scollector = callPackage ../servers/monitoring/bosun/scollector.nix { goPackages = go14Packages; }; + bosun = go14Packages.bosun.bin // { outputs = [ "bin" ]; }; + scollector = bosun; charybdis = callPackage ../servers/irc/charybdis {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 68b7a661cf58..8ca1e2336a7a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -254,6 +254,17 @@ let sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; }; + bosun = buildFromGitHub { + rev = "0.3.0"; + owner = "bosun-monitor"; + repo = "bosun"; + sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; + goPackagePath = "bosun.org"; + # Todo: Split these derivations if worried about size on each machine + subPackages = [ "cmd/bosun" "cmd/scollector" ]; + disabled = !isGo14; + }; + bufio = buildFromGitHub { rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; owner = "vmihailenco";