diff --git a/doc/netwatch-dns.md b/doc/netwatch-dns.md
index 6f30225..8e897d1 100644
--- a/doc/netwatch-dns.md
+++ b/doc/netwatch-dns.md
@@ -57,7 +57,7 @@ Tips & Tricks
Netwatch entries can be created to work with both - this script and
[netwatch-notify](netwatch-notify.md). Just give options for both:
- /tool/netwatch/add comment="doh, notify, hostname=cloudflare-dns" host=1.1.1.1;
+ /tool/netwatch/add comment="doh, notify, name=cloudflare-dns" host=1.1.1.1;
Also this allows to update host address, see option `resolve`.
diff --git a/doc/netwatch-notify.d/notification-01-down.svg b/doc/netwatch-notify.d/notification-01-down.svg
index 5cab5fe..3a9133e 100644
--- a/doc/netwatch-notify.d/notification-01-down.svg
+++ b/doc/netwatch-notify.d/notification-01-down.svg
@@ -159,10 +159,10 @@
Host example.com (93.184.216.34) is down since
+ id="tspan2281">The host 'example.com' (93.184.216.34) is down
jun/08/2021 06:55:03.
+ id="tspan2283">since jun/08/2021 06:55:03.
diff --git a/doc/netwatch-notify.d/notification-02-up.svg b/doc/netwatch-notify.d/notification-02-up.svg
index 8e03981..64e5e2d 100644
--- a/doc/netwatch-notify.d/notification-02-up.svg
+++ b/doc/netwatch-notify.d/notification-02-up.svg
@@ -159,11 +159,11 @@
Host example.com (93.184.216.34) is up since
+ id="tspan2246">The host 'example.com' (93.184.216.34) is up
jun/08/2021 07:01:00.
+ id="tspan2248">since jun/08/2021 07:01:00.
0) do={ /system/script/remove [ find where name=\"rotate-ntp\" ]; /system/scheduler/remove [ find where name=\"rotate-ntp\" ]; /system/ntp/client/set servers=\$NtpPool; };";
+ 82=":global CharacterReplace; :foreach Netwatch in=[ /tool/netwatch/find where comment~\"notify\" !disabled ] do={ /tool/netwatch/set \$Netwatch comment=[ \$CharacterReplace [ get \$Netwatch comment ] \"hostname=\" \"name=\" ]; };";
};
diff --git a/global-functions b/global-functions
index daa6526..bab2716 100644
--- a/global-functions
+++ b/global-functions
@@ -10,7 +10,7 @@
:local 0 "global-functions";
# expected configuration version
-:global ExpectedConfigVersion 81;
+:global ExpectedConfigVersion 82;
# global variables not to be changed by user
:global GlobalFunctionsReady false;
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");