Merge branch 'netwatch' into next

1 files changed, 50 insertions, 31 deletions

diff --git a/netwatch-notify b/netwatch-notify
index 45b0c76..a725fc3 100644
--- a/netwatch-notify
+++ b/netwatch-notify
@@ -12,6 +12,7 @@
 
 :global NetwatchNotify;
 
+:global EitherOr;
 :global IfThenElse;
 :global IsDNSResolving;
 :global LogPrintExit2;
@@ -21,9 +22,10 @@
 :global SymbolForNotification;
 
 :local NetwatchNotifyHook do={
-  :local Name [ :tostr $1 ];
-  :local Type [ :tostr $2 ];
-  :local Hook [ :tostr $3 ];
+  :local Name  [ :tostr $1 ];
+  :local Type  [ :tostr $2 ];
+  :local State [ :tostr $3 ];
+  :local Hook  [ :tostr $4 ];
 
   :global LogPrintExit2;
   :global ValidateSyntax;
@@ -32,15 +34,18 @@
     :do {
       [ :parse $Hook ];
     } on-error={
-      $LogPrintExit2 warning $0 ("The " . $Type . "-hook for host " . $Name . " failed to run.") false;
+      $LogPrintExit2 warning $0 ("The " . $State . "-hook for " . $Type . " '" . $Name . \
+          "' failed to run.") false;
       :return ("The hook failed to run.");
     }
   } else={
-    $LogPrintExit2 warning $0 ("The " . $Type . "-hook for host " . $Name . " failed syntax validation.") false;
+    $LogPrintExit2 warning $0 ("The " . $State . "-hook for " . $Type . " '" . $Name . \
+        "' failed syntax validation.") false;
     :return ("The hook failed syntax validation.");
   }
 
-  $LogPrintExit2 info $0 ("Ran hook on host " . $Name . " " . $Type . ": " . $Hook) false;
+  $LogPrintExit2 info $0 ("Ran hook on " . $Type . " '" . $Name . "' " . $State . ": " . \
+      $Hook) false;
   :return ("Ran hook:\n" . $Hook);
 }
 
@@ -54,16 +59,17 @@ $ScriptLock $0;
   :set NetwatchNotify [ :toarray "" ];
 }
 
-:foreach Host in=[ /tool/netwatch/find where comment~"notify" disabled=no ] do={
+:foreach Host in=[ /tool/netwatch/find where comment~"notify" !disabled ] do={
   :local HostVal [ /tool/netwatch/get $Host ];
+  :local Type [ $IfThenElse ($HostVal->"type" ~ "^(http-get|tcp-conn)\$") "service" "host" ];
   :local HostInfo [ $ParseKeyValueStore ($HostVal->"comment") ];
 
   :if ($HostInfo->"notify" = true && $HostInfo->"disabled" != true) do={
-    :local HostName ($HostInfo->"hostname");
+    :local Name [ $EitherOr ($HostInfo->"name") ($HostVal->"name") ];
 
     :local Metric { "count"=0; "notified"=false };
-    :if ([ :typeof ($NetwatchNotify->$HostName) ] = "array") do={
-      :set $Metric ($NetwatchNotify->$HostName);
+    :if ([ :typeof ($NetwatchNotify->$Name) ] = "array") do={
+      :set $Metric ($NetwatchNotify->$Name);
     }
 
     :if ([ :typeof ($HostInfo->"resolve") ] = "str") do={
@@ -71,16 +77,18 @@ $ScriptLock $0;
         :do {
           :local Resolve [ :resolve ($HostInfo->"resolve") ];
           :if ($Resolve != $HostVal->"host") do={
-             $LogPrintExit2 info $0 ("Name '" . $HostInfo->"resolve" . [ $IfThenElse ($HostInfo->"resolve" != \
-               $HostInfo->"hostname") ("' for host '" . $HostInfo->"hostname") "" ] . \
-               "' resolves to different address " . $Resolve . ", updating.") false;
+             $LogPrintExit2 info $0 ("Name '" . $HostInfo->"resolve" . [ $IfThenElse \
+                 ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
+                 $HostInfo->"name") "" ] . "' resolves to different address " . $Resolve . \
+                 ", updating.") false;
             /tool/netwatch/set host=$Resolve $Host;
             :set ($Metric->"resolve-failed") false;
           }
         } on-error={
           :if ($Metric->"resolve-failed" != true) do={
-            $LogPrintExit2 warning $0 ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse ($HostInfo->"resolve" != \
-              $HostInfo->"hostname") ("' for host '" . $HostInfo->"hostname") "" ] . "' failed.") false;
+            $LogPrintExit2 warning $0 ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse \
+                ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
+                $HostInfo->"name") "" ] . "' failed.") false;
             :set ($Metric->"resolve-failed") true;
           }
         }
@@ -90,17 +98,21 @@ $ScriptLock $0;
     :if ($HostVal->"status" = "up") do={
       :local Count ($Metric->"count");
       :if ($Count > 0) do={
-        $LogPrintExit2 info $0 ("Host " . $HostName . " (" . $HostVal->"host" . ") is up.") false;
+        $LogPrintExit2 info $0 ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . \
+            ") is up.") false;
         :set ($Metric->"count") 0;
       }
       :if ($Metric->"notified" = true) do={
-        :local Message ("Host " . $HostName . " (" . $HostVal->"host" . ") is up since " . $HostVal->"since" . ".\n" . \
-          "It was down for " . $Count . " checks since " . ($Metric->"since") . ".");
+        :local Message ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . \
+            ") is up since " . $HostVal->"since" . ".\n" . \
+            "It was down for " . $Count . " checks since " . ($Metric->"since") . ".");
         :if ([ :typeof ($HostInfo->"up-hook") ] = "str") do={
-          :set Message ($Message . "\n\n" . [ $NetwatchNotifyHook $HostName "up" ($HostInfo->"up-hook") ]);
+          :set Message ($Message . "\n\n" . [ $NetwatchNotifyHook $Name $Type "up" \
+              ($HostInfo->"up-hook") ]);
         }
         $SendNotification2 ({ origin=$0; \
-          subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Netwatch Notify: " . $HostName . " up"); \
+          subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Netwatch Notify: " . \
+              $Name . " up"); \
           message=$Message });
       }
       :set ($Metric->"notified") false;
@@ -119,32 +131,39 @@ $ScriptLock $0;
       :set Parent ($HostInfo->"parent");
       :local ParentNotified false;
       :while ($ParentNotified = false && [ :len $Parent ] > 0) do={
-        :set ParentNotified [ $IfThenElse (($NetwatchNotify->$Parent->"notified") = true) true false ];
+        :set ParentNotified [ $IfThenElse (($NetwatchNotify->$Parent->"notified") = true) \
+            true false ];
         :if ($ParentNotified = false) do={
           :set Parent ($NetwatchNotify->$Parent->"parent");
         }
       }
       $LogPrintExit2 [ $IfThenElse ($HostInfo->"no-down-notification" != true) info debug ] $0 \
-        ("Host " . $HostName . " (" . $HostVal->"host" . ") is down for " . $Metric->"count" . " checks, " . \
-        [ $IfThenElse ($ParentNotified = false) [ $IfThenElse ($Metric->"notified" = true) ("already notified.") \
-        ($Count - $Metric->"count" . " to go.") ] ("parent host " . $Parent . " is down.") ]) false;
-      :if ((($Count * 2) - ($Metric->"count" * 3)) / 2 = 0 && [ :typeof ($HostInfo->"pre-down-hook") ] = "str") do={
-        $NetwatchNotifyHook $HostName "pre-down" ($HostInfo->"pre-down-hook");
+          ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . ") is down for " . \
+          $Metric->"count" . " checks, " . [ $IfThenElse ($ParentNotified = false) [ $IfThenElse \
+          ($Metric->"notified" = true) ("already notified.") ($Count - $Metric->"count" . \
+          " to go.") ] ("parent " . $Type . " " . $Parent . " is down.") ]) false;
+      :if ((($Count * 2) - ($Metric->"count" * 3)) / 2 = 0 && \
+           [ :typeof ($HostInfo->"pre-down-hook") ] = "str") do={
+        $NetwatchNotifyHook $Name $Type "pre-down" ($HostInfo->"pre-down-hook");
       }
-      :if ($ParentNotified = false && $Metric->"count" >= $Count && $Metric->"notified" != true) do={
-        :local Message ("Host " . $HostName . " (" . $HostVal->"host" . ") is down since " . $HostVal->"since" . ".");
+      :if ($ParentNotified = false && $Metric->"count" >= $Count && \
+           $Metric->"notified" != true) do={
+        :local Message ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . \
+            ") is down since " . $HostVal->"since" . ".");
         :if ([ :typeof ($HostInfo->"down-hook") ] = "str") do={
-          :set Message ($Message . "\n\n" . [ $NetwatchNotifyHook $HostName "down" ($HostInfo->"down-hook") ]);
+          :set Message ($Message . "\n\n" . [ $NetwatchNotifyHook $Name $Type "down" \
+              ($HostInfo->"down-hook") ]);
         }
         :if ($HostInfo->"no-down-notification" != true) do={
           $SendNotification2 ({ origin=$0; \
-            subject=([ $SymbolForNotification "cross-mark" ] . "Netwatch Notify: " . $HostName . " down"); \
+            subject=([ $SymbolForNotification "cross-mark" ] . "Netwatch Notify: " . \
+                $Name . " down"); \
             message=$Message });
         }
         :set ($Metric->"notified") true;
       }
     }
-    :set ($NetwatchNotify->$HostName) {
+    :set ($NetwatchNotify->$Name) {
       "count"=($Metric->"count");
       "notified"=($Metric->"notified");
       "parent"=($Metric->"parent");