Adjust load warnings for monitoring

diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix
index 1590fd0201d2c817aa42114f8a8d10773e280184..344e3691ddd3a7344b9336315aac33bdcc991f68 100644 (file)
--- a/modules/private/monitoring/default.nix
+++ b/modules/private/monitoring/default.nix
@@ -91,7 +91,8 @@ let
     };
     monitoring-1 = {
       processWarn = "50"; processAlert = "60";
-      loadWarn = "1.0"; loadAlert = "2.0";
+      loadWarn = "4.0"; loadAlert = "6.0";
+      load15Warn = "1.0"; load15Alert = "2.0";
       interface = "ens3";
     };
   };

diff --git a/modules/private/monitoring/objects_common.nix b/modules/private/monitoring/objects_common.nix
index 25f812432a8756082e4e969db6cbf47ed4f25801..82043ebdd0b58d7944cb875f9616b3d5c4db6e64 100644 (file)
--- a/modules/private/monitoring/objects_common.nix
+++ b/modules/private/monitoring/objects_common.nix
@@ -4,7 +4,11 @@
 , processWarn ? "250"
 , processAlert ? "400"
 , loadWarn ? "8.0"
+, load5Warn ? loadWarn
+, load15Warn ? load5Warn
 , loadAlert ? "10.0"
+, load5Alert ? loadAlert
+, load15Alert ? load5Alert
 , mdadm
 , sudo
 , master
@@ -70,8 +74,8 @@ in
       use = "local-service";
       check_command = [
         "check_local_load"
-        "${loadWarn},${loadWarn},${loadWarn}"
-        "${loadAlert},${loadAlert},${loadAlert}"
+        "${loadWarn},${load5Warn},${load15Warn}"
+        "${loadAlert},${load5Alert},${load15Alert}"
       ];
     }
     {

diff --git a/nixops/secrets b/nixops/secrets
index 3475398eed524be65d0516cf2a648b20a2418f3a..6a6ab7924a93cc36aab7ce3215263135620446a1 160000 (submodule)
--- a/nixops/secrets
+++ b/nixops/secrets
@@ -1 +1 @@
-Subproject commit 3475398eed524be65d0516cf2a648b20a2418f3a
+Subproject commit 6a6ab7924a93cc36aab7ce3215263135620446a1