diff options
| author |  Christian Hesse <mail@eworm.de> | 2021-04-28 20:16:08 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2021-04-28 20:16:08 +0200 |
| commit | da877612209b217fdfd5429889b6d7284bfd10a5 (patch) | |
| tree | 17fae6776664e6c550c3ba3b2ea7025779b9c35e /netwatch-notify | |
| parent | d4c9d1c577d14991a63f285e57fcf2cfaa2d5cd4 (diff) | |
| parent | 56b75237754eb065aecb932b3082ba0ca29c3f7c (diff) | |
Merge branch 'notifications' into next
Diffstat (limited to 'netwatch-notify')
| -rw-r--r-- | netwatch-notify | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/netwatch-notify b/netwatch-notify index ef67804..5600857 100644 --- a/netwatch-notify +++ b/netwatch-notify @@ -15,7 +15,7 @@ :global IfThenElse; :global LogPrintExit2; :global ParseKeyValueStore; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :global ValidateSyntax; @@ -38,9 +38,10 @@ :local Count ($Metric->"count"); :set ($Metric->"count") 0; :if ($Metric->"notified" = true) do={ - $SendNotification ([ $SymbolForNotification "white-heavy-check-mark" ] . "Netwatch Notify: " . $HostName . " up") \ - ("Host " . $HostName . " (" . $HostVal->"host" . ") is up since " . $HostVal->"since" . ".\n" . \ - "It was down for " . $Count . " checks since " . ($Metric->"since") . "."); + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Netwatch Notify: " . $HostName . " up"); \ + message=("Host " . $HostName . " (" . $HostVal->"host" . ") is up since " . $HostVal->"since" . ".\n" . \ + "It was down for " . $Count . " checks since " . ($Metric->"since") . ".") }); :if ([ :typeof ($HostInfo->"up-hook") ] = "str") do={ :if ([ $ValidateSyntax ($HostInfo->"up-hook") ] = true) do={ $LogPrintExit2 info $0 ("Running hook on host " . $HostName . " up: " . ($HostInfo->"up-hook")) false; @@ -76,8 +77,9 @@ ($Metric->"notified" = true) ("already notified.") ($Count - $Metric->"count" . " to go.") ] \ ("parent host " . $Parent . " is down.") ]) false; :if ($ParentNotified = false && $Metric->"count" >= $Count && $Metric->"notified" != true) do={ - $SendNotification ([ $SymbolForNotification "cross-mark" ] . "Netwatch Notify: " . $HostName . " down") \ - ("Host " . $HostName . " (" . $HostVal->"host" . ") is down since " . $HostVal->"since" . "."); + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "cross-mark" ] . "Netwatch Notify: " . $HostName . " down"); \ + message=("Host " . $HostName . " (" . $HostVal->"host" . ") is down since " . $HostVal->"since" . ".") }); :set ($Metric->"notified") true; :if ([ :typeof ($HostInfo->"down-hook") ] = "str") do={ :if ([ $ValidateSyntax ($HostInfo->"down-hook") ] = true) do={ |