diff --git a/morph/grid/production/storage001-hardware.nix b/morph/grid/production/storage001-hardware.nix index 64f945ed0ea8f0220ce591d7d880189f9a18c59b..c6482f3e8e1c4ac6a006935fc6b8cee74ed80dfa 100644 --- a/morph/grid/production/storage001-hardware.nix +++ b/morph/grid/production/storage001-hardware.nix @@ -38,6 +38,6 @@ } ]; - nix.maxJobs = lib.mkDefault 24; + nix.settings.max-jobs = lib.mkDefault 24; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/morph/grid/production/storage002-hardware.nix b/morph/grid/production/storage002-hardware.nix index 69b6946098728f2f3e30d7b7570ae88167efbee4..009fb0d769603e50096adb7fdec81ff19dff80b0 100644 --- a/morph/grid/production/storage002-hardware.nix +++ b/morph/grid/production/storage002-hardware.nix @@ -37,6 +37,6 @@ randomEncryption = true; } ]; - nix.maxJobs = lib.mkDefault 24; + nix.settings.max-jobs = lib.mkDefault 24; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/morph/grid/production/storage003-hardware.nix b/morph/grid/production/storage003-hardware.nix index f4d68cac14e74d4d41c1af9c50d6e1df41b37aef..e70522d3b7c2934ca741325dd57c322d0af118e1 100644 --- a/morph/grid/production/storage003-hardware.nix +++ b/morph/grid/production/storage003-hardware.nix @@ -38,6 +38,6 @@ randomEncryption = true; } ]; - nix.maxJobs = lib.mkDefault 24; + nix.settings.max-jobs = lib.mkDefault 24; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/morph/grid/production/storage004-hardware.nix b/morph/grid/production/storage004-hardware.nix index 6cc5ddc34a470cadd7dd5ddf9cb511f7988428c7..582dd73762af5530bcf2f44b8ae06c797ee135e1 100644 --- a/morph/grid/production/storage004-hardware.nix +++ b/morph/grid/production/storage004-hardware.nix @@ -32,6 +32,6 @@ randomEncryption = true; } ]; - nix.maxJobs = lib.mkDefault 32; + nix.settings.max-jobs = lib.mkDefault 32; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/morph/grid/production/storage005-hardware.nix b/morph/grid/production/storage005-hardware.nix index 45f4da4bd0160feb3dd27100dfff9306c49edf05..0a9a8a2ada689fb79a680051abad6dedf54bdf09 100644 --- a/morph/grid/production/storage005-hardware.nix +++ b/morph/grid/production/storage005-hardware.nix @@ -37,6 +37,6 @@ randomEncryption = true; } ]; - nix.maxJobs = lib.mkDefault 32; + nix.settings.max-jobs = lib.mkDefault 32; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/nixos/modules/monitoring/server/grafana.nix b/nixos/modules/monitoring/server/grafana.nix index 4da836c10975d56438fee3961912da20b4788c7b..5299829ccc7fec081e9ccb4f0e41c66daa8a0251 100644 --- a/nixos/modules/monitoring/server/grafana.nix +++ b/nixos/modules/monitoring/server/grafana.nix @@ -167,8 +167,9 @@ in { name = "provisioned"; options.path = ./grafana-dashboards; }]; - # See https://grafana.com/docs/grafana/latest/administration/provisioning/#example-alert-notification-channels-config-file - notifiers = [ ] ++ (lib.optionals (cfg.enableSlackAlert) [{ + # See https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/file-provisioning/#provision-contact-points + alerting.contactPoints.settings.contactPoints = + [ ] ++ (lib.optionals (cfg.enableSlackAlert) [{ uid = "slack-notifier-1"; name = "Slack"; type = "slack";