X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fmonitoring%2Fobjects_common.nix;h=10cc1495e0c5703c9471c65fbe025fca958b76c6;hp=ee158dcca0ebf17448a44c73c1a86320fb811963;hb=c41d0de83b1841097c6be8d8baeed557b065657b;hpb=ef909e2435194af725f4338a13e4732328ef7361

diff --git a/modules/private/monitoring/objects_common.nix b/modules/private/monitoring/objects_common.nix
index ee158dc..10cc149 100644
--- a/modules/private/monitoring/objects_common.nix
+++ b/modules/private/monitoring/objects_common.nix
@@ -3,10 +3,10 @@
 , interface ? "eth0"
 , processWarn ? "250"
 , processAlert ? "400"
-, loadWarn ? "8.0"
+, loadWarn ? "0.9"
 , load5Warn ? loadWarn
 , load15Warn ? load5Warn
-, loadAlert ? "10.0"
+, loadAlert ? "1.0"
 , load5Alert ? loadAlert
 , load15Alert ? load5Alert
 , mdadm
@@ -127,7 +127,7 @@ in
     check_imap_connection = "$USER2$/check_imap_connection -u \"$USER204$\" -p \"$USER205$\" -H \"imap.immae.eu:143\"";
     check_local_disk = "$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$";
     check_local_procs = "$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$";
-    check_local_load = "$USER1$/check_load -w $ARG1$ -c $ARG2$";
+    check_local_load = "$USER1$/check_load -r -w $ARG1$ -c $ARG2$";
     check_local_swap = "$USER1$/check_swap -n ok -w $ARG1$ -c $ARG2$";
     check_local_bandwidth = "$USER2$/check_bandwidth -i=$ARG1$ -w $ARG2$ -c $ARG3$";
     check_memory = "$USER2$/check_mem.sh -w $ARG1$ -c $ARG2$";
@@ -157,8 +157,8 @@ in
     # $OVE is to force naemon to run via shell instead of execve which fails here
     notify-service-by-email = "ADMINEMAIL=\"$ADMINEMAIL$\" SERVICENOTIFICATIONID=\"$SERVICENOTIFICATIONID$\" SERVICEDESC=\"$SERVICEDESC$\" SERVICESTATE=\"$SERVICESTATE$\" SERVICEOUTPUT=\"$SERVICEOUTPUT$\" $USER2$/notify_by_email service \"$NOTIFICATIONTYPE$\" \"$HOSTALIAS$\" \"$LONGDATETIME$\" \"$CONTACTEMAIL$\" $OVE";
     notify-by-slack = "HOST=\"$HOSTALIAS$\" SERVICESTATE=\"$SERVICESTATE$\" SERVICEDESC=\"$SERVICEDESC$\" SERVICEOUTPUT=\"$SERVICEOUTPUT$\" $USER2$/notify_by_slack \"$ARG1$\" \"$ARG2$\"";
-    notify-host-eban-url = "STATUS_NAME=\"Server\" PASSWORD=\"$USER210$\" HOSTSTATE=\"$HOSTSTATE$\" $USER2$/notify_eban_url";
-    notify-service-eban-url = "STATUS_NAME=\"$_SERVICEWEBSTATUS_NAME$\" PASSWORD=\"$USER210$\" SERVICESTATE=\"$SERVICESTATE$\" $USER2$/notify_eban_url";
+    notify-host-eban-url = "STATUS_NAME=\"Server\" USER=\"$USER210$\" PASSWORD=\"$USER211$\" HOSTSTATE=\"$HOSTSTATE$\" $USER2$/notify_eban_url";
+    notify-service-eban-url = "STATUS_NAME=\"$_SERVICEWEBSTATUS_NAME$\" USER=\"$USER210$\" PASSWORD=\"$USER211$\" SERVICESTATE=\"$SERVICESTATE$\" $USER2$/notify_eban_url";
 
     notify-master = "$USER2$/send_nrdp.sh -u \"$USER200$\" -t \"$USER201$\" -H \"$HOSTADDRESS$\" -s \"$SERVICEDESC$\" -S \"$SERVICESTATEID$\" -o \"$SERVICEOUTPUT$ | $SERVICEPERFDATA$\"";
   };
@@ -187,7 +187,7 @@ in
     webstatus-backup = { alias = "Backup resources"; };
   };
   hostgroup = {
-    webstatus-hosts = { alias = "Hosts"; };
+    webstatus-hosts   = { alias = "Hosts"; };
   };
   contactgroup = {
     admins = { alias = "Naemon Administrators"; };
@@ -214,6 +214,7 @@ in
         retain_nonstatus_information = "1";
         retain_status_information = "1";
         retry_interval = "2";
+        _webstatus_namespace = "immae";
       };
       local-service = {
         use = "generic-service";
@@ -285,6 +286,7 @@ in
         notification_interval = "120";
         notification_options = "d,u,r,f";
         retry_interval = "1";
+        _webstatus_namespace = "immae";
       };
     };
   };