From 7ad4966f41db0669a77c7a6ee7f87f0d4e586b0c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 3 Nov 2020 14:41:47 +0100
Subject: [PATCH] Adjust load warnings for monitoring

---
 modules/private/monitoring/default.nix        | 3 ++-
 modules/private/monitoring/objects_common.nix | 8 ++++++--
 nixops/secrets                                | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix
index 1590fd0..344e369 100644
--- 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 25f8124..82043eb 100644
--- 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 3475398..6a6ab79 160000
--- a/nixops/secrets
+++ b/nixops/secrets
@@ -1 +1 @@
-Subproject commit 3475398eed524be65d0516cf2a648b20a2418f3a
+Subproject commit 6a6ab7924a93cc36aab7ce3215263135620446a1
-- 
2.41.0