Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

log-forward: generate filter in mod/notification-email

Browse source
This commit is contained in:
Christian Hesse 2023-01-11 09:21:13 +01:00
parent 34ed387343
commit 868557a24a
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
log-forward
View file

@ -19,11 +19,11 @@
:global LogForwardRateLimit;
:global NotificationsWithSymbols;
:global EscapeForRegEx;
:global EitherOr;
:global HexToNum;
:global IfThenElse;
:global LogForwardFilterLogForwarding;
:global LogPrintExit2;
:global QuotedPrintable;
:global ScriptLock;
:global SendNotification2;
:global SymbolByUnicodeName;
@ -48,12 +48,8 @@ $ScriptLock $0;
:local MessageVal;
:local MessageDups ({});
:local LogForwardFilterLogForwarding ("^Error sending e-mail <(" . \
[ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
[ $SymbolForNotification "memo" ] . "Log Forwarding") ] ] . "|" . \
[ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
[ $SymbolForNotification "warning-sign" ] . "Log Forwarding") ] ] . ")>:");
:foreach Message in=[ /log/find where (!(message="") and !(message~$LogForwardFilterLogForwarding) and \
:foreach Message in=[ /log/find where (!(message="") and \
!(message~[ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ]) and \
!(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
topics~$LogForwardInclude or message~$LogForwardIncludeMessage ] do={
:set MessageVal [ /log/get $Message ];

16
mod/notification-email
View file

@ -4,6 +4,7 @@
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
:global FlushEmailQueue;
:global LogForwardFilterLogForwarding;
:global NotificationFunctions;
:global SendEMail;
:global SendEMail2;
@ -88,6 +89,21 @@
}
}
# generate filter for log-forward
:set LogForwardFilterLogForwarding do={
:global Identity;
:global EscapeForRegEx;
:global QuotedPrintable;
:global SymbolForNotification;
:return ("^Error sending e-mail <(" . \
[ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
[ $SymbolForNotification "memo" ] . "Log Forwarding") ] ] . "|" . \
[ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
[ $SymbolForNotification "warning-sign" ] . "Log Forwarding") ] ] . ")>:");
}
# send notification via e-mail - expects one array argument
:set ($NotificationFunctions->"email") do={
:local Notification $1;