From 19ca17190d6b8b9eaa979e5547e58ef661f7dbb9 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 27 Apr 2021 20:51:04 +0200 Subject: check-routeros-update: use $SendNotification2 --- check-routeros-update | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'check-routeros-update') diff --git a/check-routeros-update b/check-routeros-update index 5109e30..683f9be 100644 --- a/check-routeros-update +++ b/check-routeros-update @@ -19,7 +19,7 @@ :global DeviceInfo; :global LogPrintExit2; :global ScriptFromTerminal; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :global VersionToNum; :global WaitFullyConnected; @@ -65,18 +65,18 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; :if ($NumInstalled < $NumLatest) do={ :if ($SafeUpdatePatch = true && ($NumInstalled & 0xffff0000) = ($NumLatest & 0xffff0000)) do={ $LogPrintExit2 info $0 ("Version " . $Update->"latest-version" . " is a patch release, updating...") false; - $SendNotification ([ $SymbolForNotification "sparkles" ] . "RouterOS update") \ - ("Version " . $Update->"latest-version" . " is a patch update for " . $Update->"channel" . \ - ", updating on " . $Identity . "...") $Link "true"; + $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + message=("Version " . $Update->"latest-version" . " is a patch update for " . $Update->"channel" . \ + ", updating on " . $Identity . "..."); link=$Link; silent=true }); $DoUpdate; } :if ($SafeUpdateNeighbor = true && [ :len [ / ip neighbor find where \ version=($Update->"latest-version" . " (" . $Update->"channel" . ")") ] ] > 0) do={ $LogPrintExit2 info $0 ("Seen a neighbor running version " . $Update->"latest-version" . ", updating...") false; - $SendNotification ([ $SymbolForNotification "sparkles" ] . "RouterOS update") \ - ("Seen a neighbor running version " . $Update->"latest-version" . " from " . $Update->"channel" . \ - ", updating on " . $Identity . "...") $Link "true"; + $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + message=("Seen a neighbor running version " . $Update->"latest-version" . " from " . $Update->"channel" . \ + ", updating on " . $Identity . "..."); link=$Link; silent=true }); $DoUpdate; } @@ -91,9 +91,9 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; } :if ($Result->"status" = "finished" && $Result->"data" = $Update->"latest-version") do={ $LogPrintExit2 info $0 ("Version " . $Update->"latest-version" . " is considered safe, updating...") false; - $SendNotification ([ $SymbolForNotification "sparkles" ] . "RouterOS update") \ - ("Version " . $Update->"latest-version" . " is considered safe for " . $Update->"channel" . \ - ", updating on " . $Identity . "...") $Link "true"; + $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + message=("Version " . $Update->"latest-version" . " is considered safe for " . $Update->"channel" . \ + ", updating on " . $Identity . "..."); link=$Link; silent=true }); $DoUpdate; } } @@ -112,10 +112,10 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; $Update->"latest-version" . ".") true; } - $SendNotification ([ $SymbolForNotification "sparkles" ] . "RouterOS update") \ - ("A new RouterOS version " . ($Update->"latest-version") . \ + $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + message=("A new RouterOS version " . ($Update->"latest-version") . \ " is available for " . $Identity . ".\n\n" . \ - [ $DeviceInfo ]) $Link "true"; + [ $DeviceInfo ]); link=$Link; silent=true }); :set SentRouterosUpdateNotification ($Update->"latest-version"); } @@ -125,10 +125,10 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; $Update->"latest-version" . ".") true; } - $SendNotification ([ $SymbolForNotification "warning-sign" ] . "RouterOS version") \ - ("A different RouterOS version " . ($Update->"latest-version") . \ + $SendNotification2 ({ subject=([ $SymbolForNotification "warning-sign" ] . "RouterOS version"); \ + message=("A different RouterOS version " . ($Update->"latest-version") . \ " is available for " . $Identity . ", but it is a downgrade.\n\n" . \ - [ $DeviceInfo ]) $Link "true"; + [ $DeviceInfo ]); link=$Link; silent=true }); $LogPrintExit2 info $0 ("A different RouterOS version " . ($Update->"latest-version") . \ " is available for downgrade.") false; :set SentRouterosUpdateNotification ($Update->"latest-version"); -- cgit v1.2.3-70-g09d2 From 8e1c524b8583aa476af232d2e2e2a19f5f34540c Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 27 Apr 2021 21:53:28 +0200 Subject: check-routeros-update: pass origin to $SendNotification2 --- check-routeros-update | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'check-routeros-update') diff --git a/check-routeros-update b/check-routeros-update index 683f9be..0309730 100644 --- a/check-routeros-update +++ b/check-routeros-update @@ -65,7 +65,8 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; :if ($NumInstalled < $NumLatest) do={ :if ($SafeUpdatePatch = true && ($NumInstalled & 0xffff0000) = ($NumLatest & 0xffff0000)) do={ $LogPrintExit2 info $0 ("Version " . $Update->"latest-version" . " is a patch release, updating...") false; - $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ message=("Version " . $Update->"latest-version" . " is a patch update for " . $Update->"channel" . \ ", updating on " . $Identity . "..."); link=$Link; silent=true }); $DoUpdate; @@ -74,7 +75,8 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; :if ($SafeUpdateNeighbor = true && [ :len [ / ip neighbor find where \ version=($Update->"latest-version" . " (" . $Update->"channel" . ")") ] ] > 0) do={ $LogPrintExit2 info $0 ("Seen a neighbor running version " . $Update->"latest-version" . ", updating...") false; - $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ message=("Seen a neighbor running version " . $Update->"latest-version" . " from " . $Update->"channel" . \ ", updating on " . $Identity . "..."); link=$Link; silent=true }); $DoUpdate; @@ -91,7 +93,8 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; } :if ($Result->"status" = "finished" && $Result->"data" = $Update->"latest-version") do={ $LogPrintExit2 info $0 ("Version " . $Update->"latest-version" . " is considered safe, updating...") false; - $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ message=("Version " . $Update->"latest-version" . " is considered safe for " . $Update->"channel" . \ ", updating on " . $Identity . "..."); link=$Link; silent=true }); $DoUpdate; @@ -112,7 +115,8 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; $Update->"latest-version" . ".") true; } - $SendNotification2 ({ subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update"); \ message=("A new RouterOS version " . ($Update->"latest-version") . \ " is available for " . $Identity . ".\n\n" . \ [ $DeviceInfo ]); link=$Link; silent=true }); @@ -125,7 +129,8 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false; $Update->"latest-version" . ".") true; } - $SendNotification2 ({ subject=([ $SymbolForNotification "warning-sign" ] . "RouterOS version"); \ + $SendNotification2 ({ origin=$0; \ + subject=([ $SymbolForNotification "warning-sign" ] . "RouterOS version"); \ message=("A different RouterOS version " . ($Update->"latest-version") . \ " is available for " . $Identity . ", but it is a downgrade.\n\n" . \ [ $DeviceInfo ]); link=$Link; silent=true }); -- cgit v1.2.3-70-g09d2