mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-28 06:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'log-forward'

Browse source
This commit is contained in:
Christian Hesse 2020-11-13 22:49:50 +01:00
commit 021463c76b
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
check-certificates
View file

@ -33,7 +33,7 @@ $WaitFullyConnected;
:do {
:if ([ :len $CertRenewUrl ] = 0) do={
$LogPrintExit warning ("No CertRenewUrl given.") true;
$LogPrintExit info ("No CertRenewUrl given.") true;
}
:foreach Type in={ ".pem"; ".p12" } do={
@ -114,7 +114,7 @@ $WaitFullyConnected;
"Issuer: " . ($CertVal->"ca") . ([ $ParseKeyValueStore ($CertVal->"issuer") ]->"CN") . "\n" . \
"Validity: " . ($CertVal->"invalid-before") . " to " . ($CertVal->"invalid-after") . "\n" . \
"Expires in: " . [ $IfThenElse (($CertVal->"expired") = true) "expired" [ $FormatExpire ($CertVal->"expires-after") ] ]);
$LogPrintExit warning ("The certificate " . ($CertVal->"name") . " " . $State . \
$LogPrintExit info ("The certificate " . ($CertVal->"name") . " " . $State . \
", it is invalid after " . ($CertVal->"invalid-after") . ".") false;
}
}

2
check-health
View file

@ -67,7 +67,7 @@
:if ($Name ~ "temperature" && \
[ :typeof $Temperature ] = "num") do={
:if ([ :typeof ($CheckHealthTemperature->$Name) ] != "num" ) do={
$LogPrintExit warning ("No threshold given for " . $Name . ", assuming 50C.") false;
$LogPrintExit info ("No threshold given for " . $Name . ", assuming 50C.") false;
:set ($CheckHealthTemperature->$Name) 50;
}
:if ($Temperature > $CheckHealthTemperature->$Name && \

2
check-routeros-update
View file

@ -43,7 +43,7 @@
:local Update [ / system package update get ];
:if ([ :len ($Update->"latest-version") ] = 0) do={
$LogPrintExit warning "An empty string is not a valid version." true;
$LogPrintExit info "An empty string is not a valid version." true;
}
:local NumInstalled [ $VersionToNum ($Update->"installed-version") ];

2
global-config
View file

@ -51,7 +51,7 @@
:global BackupUploadPass "v3ry-s3cr3t";
# This defines a filter on log topics not to be forwarded.
:global LogForwardFilter "(debug|info|script)";
:global LogForwardFilter "(debug|info)";
# ... and the same for log message text.
:global LogForwardFilterMessage "^\$|^Error sending e-mail <.* Log Forwarding>:";
#:global LogForwardFilterMessage "(^\$|message text|...)";

8
global-functions
View file

@ -436,13 +436,13 @@
:return true;
} else={
:if ($MailServer = "0.0.0.0") do={
$LogPrintExit warning ("No mail server is configured! Returning gracefully...") false;
$LogPrintExit info ("No mail server is configured! Returning gracefully...") false;
:return true;
}
}
:if ([ :len [ / tool netwatch find where comment=$MailServer ] ] = 0) do={
$LogPrintExit warning ("Adding netwatch entry for mail server.") false;
$LogPrintExit info ("Adding netwatch entry for mail server.") false;
:local MailHost $MailServer;
:if ([ :typeof [ :toip $MailHost ] ] != "ip" ) do={
:do {
@ -827,7 +827,7 @@
http-data=("chat_id=" . $ChatId . "&disable_notification=" . $Silent . \
"&parse_mode=" . $ParseMode . "&text=" . $Text);
} on-error={
$LogPrintExit warning ("Failed sending telegram notification! Queuing...") false;
$LogPrintExit info ("Failed sending telegram notification! Queuing...") false;
:if ([ :typeof $TelegramQueue ] = "nothing") do={
:set TelegramQueue [ :toarray "" ];
@ -906,7 +906,7 @@
:return false;
}
$LogPrintExit warning ("No time source configured! Returning gracefully...") false;
$LogPrintExit info ("No time source configured! Returning gracefully...") false;
:return true;
}