diff options
author | Christian Hesse <mail@eworm.de> | 2020-11-13 22:49:50 +0100 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2020-11-13 22:49:50 +0100 |
commit | 021463c76b5ce1106687ab0a526276a38b776c77 (patch) | |
tree | a4c68d4e4530f9e57c24579efc337d5dcede4168 | |
parent | d519b70e650498669c569926b5b591dec7ab5944 (diff) | |
parent | 966e7b6fd3291c01eb9ab5639c92bc1ea95f8e5d (diff) |
Merge branch 'log-forward'
-rw-r--r-- | check-certificates | 4 | ||||
-rw-r--r-- | check-health | 2 | ||||
-rw-r--r-- | check-routeros-update | 2 | ||||
-rw-r--r-- | global-config | 2 | ||||
-rw-r--r-- | global-functions | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/check-certificates b/check-certificates index ced2a69..d5c08b9 100644 --- a/check-certificates +++ b/check-certificates @@ -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; } } diff --git a/check-health b/check-health index fc8f097..7d52204 100644 --- a/check-health +++ b/check-health @@ -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 && \ diff --git a/check-routeros-update b/check-routeros-update index e020153..b8e87d9 100644 --- a/check-routeros-update +++ b/check-routeros-update @@ -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") ]; diff --git a/global-config b/global-config index 09eda44..9bbbc29 100644 --- a/global-config +++ b/global-config @@ -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|...)"; diff --git a/global-functions b/global-functions index c6439b5..a4a3630 100644 --- a/global-functions +++ b/global-functions @@ -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; } |