From 57027ceb26427ff34f4d022734f5196d4d3f0a04 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 24 Aug 2023 11:16:23 +0200
Subject: check-routeros-update: show neighbor's identity in message and
 notification

---
 check-routeros-update.rsc | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'check-routeros-update.rsc')

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 0625ebd..73ce7d8 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -81,15 +81,19 @@ $LogPrintExit2 debug $0 ("Checking for updates...") false;
     $DoUpdate;
   }
 
-  :if ($SafeUpdateNeighbor = true && [ :len [ /ip/neighbor/find where platform="MikroTik" \
-       version~("^" . [ $EscapeForRegEx ($Update->"latest-version" . " (" . $Update->"channel" . ")") ]) \
-       identity~$SafeUpdateNeighborIdentity ] ] > 0) do={
-    $LogPrintExit2 info $0 ("Seen a neighbor running version " . $Update->"latest-version" . ", updating...") false;
-    $SendNotification2 ({ origin=$0; \
-      subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update: " . $Update->"latest-version"); \
-      message=("Seen a neighbor running version " . $Update->"latest-version" . " from " . $Update->"channel" . \
-        ", updating on " . $Identity . "..."); link=$Link; silent=true });
-    $DoUpdate;
+  :if ($SafeUpdateNeighbor = true) do={
+    :local Neighbors [ /ip/neighbor/find where platform="MikroTik" identity~$SafeUpdateNeighborIdentity \
+       version~("^" . [ $EscapeForRegEx ($Update->"latest-version" . " (" . $Update->"channel" . ")") ]) ];
+    :if ([ :len $Neighbors ] > 0) do={
+      :local Neighbor [ /ip/neighbor/get ($Neighbors->0) identity ];
+      $LogPrintExit2 info $0 ("Seen a neighbor (" . $Neighbor . ") running version " . \
+        $Update->"latest-version" . " from " . $Update->"channel" . ", updating...") false;
+      $SendNotification2 ({ origin=$0; \
+        subject=([ $SymbolForNotification "sparkles" ] . "RouterOS update: " . $Update->"latest-version"); \
+        message=("Seen a neighbor (" . $Neighbor . ") running version " . $Update->"latest-version" . \
+          " from " . $Update->"channel" . ", updating on " . $Identity . "..."); link=$Link; silent=true });
+      $DoUpdate;
+    }
   }
 
   :if ([ :len $SafeUpdateUrl ] > 0) do={
-- 
cgit v1.2.3-54-g00ecf