diff --git a/README.d/notification-news-and-changes.avif b/README.d/notification-news-and-changes.avif index d2e8aa7f..d91b8a08 100644 Binary files a/README.d/notification-news-and-changes.avif and b/README.d/notification-news-and-changes.avif differ diff --git a/check-certificates.rsc b/check-certificates.rsc index 93641eec..3300bee8 100644 --- a/check-certificates.rsc +++ b/check-certificates.rsc @@ -231,7 +231,7 @@ :local State [ $IfThenElse (($CertVal->"expired") = true) "expired" "is about to expire" ]; $SendNotification2 ({ origin=$ScriptName; \ - subject=([ $SymbolForNotification "lock-with-ink-pen,warning-sign" ] . "Certificate warning: " . ($CertVal->"name")); \ + subject=([ $SymbolForNotification "warning-sign" ] . "Certificate warning: " . ($CertVal->"name")); \ message=("A certificate on " . $Identity . " " . $State . ".\n\n" . [ $FormatInfo $Cert ]) }); $LogPrint info $ScriptName ("The certificate '" . ($CertVal->"name") . "' " . $State . \ ", it is invalid after " . ($CertVal->"invalid-after") . "."); diff --git a/contrib/html.sh b/contrib/html.sh index 03eba23d..098ba467 100755 --- a/contrib/html.sh +++ b/contrib/html.sh @@ -14,7 +14,7 @@ markdown -f toc,idanchor "${1}" | sed \ -e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \ -e '/| id="\L\1">|' \ -e '//s|pre|pre class="code" onclick="CopyToClipboard(this)"|g' \ + -e '/^
/s|pre|pre onclick="CopyToClipboard(this)"|g' \
 	-e '/The above link may be broken on code hosting sites/s|blockquote|blockquote style="display: none;"|'
 
 sed \
diff --git a/contrib/notification.html b/contrib/notification.html
index baa659c3..7a6ada74 100644
--- a/contrib/notification.html
+++ b/contrib/notification.html
@@ -31,7 +31,7 @@ instead.

[MikroTik] â„šī¸ Subject

Message
- +

⏰ This message was queued since 2025-10-29 16:06:18 and may be obsolete.

âœ‚ī¸ The message was too long and has been truncated, cut off 13%!

@@ -40,7 +40,7 @@ instead.

Hostname:

Subject:

Message:

-

Show link:

+

Show link:

Queued since

Cut-off with percent

diff --git a/doc/backup-cloud.d/notification.avif b/doc/backup-cloud.d/notification.avif index 5918a623..e533908f 100644 Binary files a/doc/backup-cloud.d/notification.avif and b/doc/backup-cloud.d/notification.avif differ diff --git a/doc/backup-upload.d/notification.avif b/doc/backup-upload.d/notification.avif index 3bcc1f4d..83cfb18a 100644 Binary files a/doc/backup-upload.d/notification.avif and b/doc/backup-upload.d/notification.avif differ diff --git a/doc/check-certificates.d/notification-01-warn.avif b/doc/check-certificates.d/notification-01-warn.avif deleted file mode 100644 index e32e54b3..00000000 Binary files a/doc/check-certificates.d/notification-01-warn.avif and /dev/null differ diff --git a/doc/check-certificates.d/notification-02-renew.avif b/doc/check-certificates.d/notification-02-renew.avif deleted file mode 100644 index 9ff1400a..00000000 Binary files a/doc/check-certificates.d/notification-02-renew.avif and /dev/null differ diff --git a/doc/check-certificates.d/notification.avif b/doc/check-certificates.d/notification.avif new file mode 100644 index 00000000..7c250da1 Binary files /dev/null and b/doc/check-certificates.d/notification.avif differ diff --git a/doc/check-certificates.md b/doc/check-certificates.md index b8fece01..a9426dba 100644 --- a/doc/check-certificates.md +++ b/doc/check-certificates.md @@ -19,10 +19,9 @@ Description This script tries to download and renew certificates, then notifies about certificates that are still about to expire. -### Sample notifications +### Sample notification -![check-certificates notification warning](check-certificates.d/notification-01-warn.avif) -![check-certificates notification renew](check-certificates.d/notification-02-renew.avif) +![check-certificates notification](check-certificates.d/notification.avif) Requirements and installation ----------------------------- diff --git a/doc/check-health.d/notification-01-cpu-utilization-high.avif b/doc/check-health.d/notification-01-cpu-utilization-high.avif index 7fbce3ce..326e7fed 100644 Binary files a/doc/check-health.d/notification-01-cpu-utilization-high.avif and b/doc/check-health.d/notification-01-cpu-utilization-high.avif differ diff --git a/doc/check-health.d/notification-02-cpu-utilization-ok.avif b/doc/check-health.d/notification-02-cpu-utilization-ok.avif index f8e91a3a..811ccd70 100644 Binary files a/doc/check-health.d/notification-02-cpu-utilization-ok.avif and b/doc/check-health.d/notification-02-cpu-utilization-ok.avif differ diff --git a/doc/check-health.d/notification-03-ram-utilization-high.avif b/doc/check-health.d/notification-03-ram-utilization-high.avif index 9015b4a3..59155c56 100644 Binary files a/doc/check-health.d/notification-03-ram-utilization-high.avif and b/doc/check-health.d/notification-03-ram-utilization-high.avif differ diff --git a/doc/check-health.d/notification-04-ram-utilization-ok.avif b/doc/check-health.d/notification-04-ram-utilization-ok.avif index 8f949ecf..d995b9a1 100644 Binary files a/doc/check-health.d/notification-04-ram-utilization-ok.avif and b/doc/check-health.d/notification-04-ram-utilization-ok.avif differ diff --git a/doc/check-health.d/notification-05-voltage.avif b/doc/check-health.d/notification-05-voltage.avif index 9ef2d943..17a385ba 100644 Binary files a/doc/check-health.d/notification-05-voltage.avif and b/doc/check-health.d/notification-05-voltage.avif differ diff --git a/doc/check-health.d/notification-06-temperature-high.avif b/doc/check-health.d/notification-06-temperature-high.avif index 908e8f2e..60d38027 100644 Binary files a/doc/check-health.d/notification-06-temperature-high.avif and b/doc/check-health.d/notification-06-temperature-high.avif differ diff --git a/doc/check-health.d/notification-07-temperature-ok.avif b/doc/check-health.d/notification-07-temperature-ok.avif index 8f509e8d..4afed02d 100644 Binary files a/doc/check-health.d/notification-07-temperature-ok.avif and b/doc/check-health.d/notification-07-temperature-ok.avif differ diff --git a/doc/check-health.d/notification-08-state-fail.avif b/doc/check-health.d/notification-08-state-fail.avif index 8ba7bb97..ad049ac8 100644 Binary files a/doc/check-health.d/notification-08-state-fail.avif and b/doc/check-health.d/notification-08-state-fail.avif differ diff --git a/doc/check-health.d/notification-09-state-ok.avif b/doc/check-health.d/notification-09-state-ok.avif index 91977416..26f5a745 100644 Binary files a/doc/check-health.d/notification-09-state-ok.avif and b/doc/check-health.d/notification-09-state-ok.avif differ diff --git a/doc/check-lte-firmware-upgrade.d/notification.avif b/doc/check-lte-firmware-upgrade.d/notification.avif index 2c2f692d..c440da59 100644 Binary files a/doc/check-lte-firmware-upgrade.d/notification.avif and b/doc/check-lte-firmware-upgrade.d/notification.avif differ diff --git a/doc/check-perpetual-license.d/notification-01-warn.avif b/doc/check-perpetual-license.d/notification-01-warn.avif deleted file mode 100644 index fb6b56ab..00000000 Binary files a/doc/check-perpetual-license.d/notification-01-warn.avif and /dev/null differ diff --git a/doc/check-perpetual-license.d/notification-02-renew.avif b/doc/check-perpetual-license.d/notification-02-renew.avif deleted file mode 100644 index 21dfde01..00000000 Binary files a/doc/check-perpetual-license.d/notification-02-renew.avif and /dev/null differ diff --git a/doc/check-perpetual-license.d/notification.avif b/doc/check-perpetual-license.d/notification.avif new file mode 100644 index 00000000..70ca603d Binary files /dev/null and b/doc/check-perpetual-license.d/notification.avif differ diff --git a/doc/check-perpetual-license.md b/doc/check-perpetual-license.md index a32c4c3f..0335fb54 100644 --- a/doc/check-perpetual-license.md +++ b/doc/check-perpetual-license.md @@ -20,10 +20,9 @@ On *Cloud Hosted Router* (*CHR*) the licensing is perpetual: Buy once, use forever - but it needs regular renewal. This script checks licensing state and sends a notification to warn before expiration. -### Sample notifications +### Sample notification -![check-perpetual-license notification warn](check-perpetual-license.d/notification-01-warn.avif) -![check-perpetual-license notification renew](check-perpetual-license.d/notification-02-renew.avif) +![check-perpetual-license notification](check-perpetual-license.d/notification.avif) Requirements and installation ----------------------------- diff --git a/doc/check-routeros-update.d/notification-01-found.avif b/doc/check-routeros-update.d/notification-01-found.avif deleted file mode 100644 index 54dd2df6..00000000 Binary files a/doc/check-routeros-update.d/notification-01-found.avif and /dev/null differ diff --git a/doc/check-routeros-update.d/notification-02-neighbor.avif b/doc/check-routeros-update.d/notification-02-neighbor.avif deleted file mode 100644 index db4e9807..00000000 Binary files a/doc/check-routeros-update.d/notification-02-neighbor.avif and /dev/null differ diff --git a/doc/check-routeros-update.d/notification.avif b/doc/check-routeros-update.d/notification.avif new file mode 100644 index 00000000..50317cf7 Binary files /dev/null and b/doc/check-routeros-update.d/notification.avif differ diff --git a/doc/check-routeros-update.d/terminal.avif b/doc/check-routeros-update.d/terminal.avif deleted file mode 100644 index af950593..00000000 Binary files a/doc/check-routeros-update.d/terminal.avif and /dev/null differ diff --git a/doc/check-routeros-update.md b/doc/check-routeros-update.md index 029182d3..a45e0751 100644 --- a/doc/check-routeros-update.md +++ b/doc/check-routeros-update.md @@ -31,14 +31,13 @@ automatically is supported. > of view. At the same time it can be source of serve breakage. So test > versions in lab and read > [changelog â†—ī¸](https://mikrotik.com/download/changelogs/) and -> [forum â†—ī¸](https://forum.mikrotik.com/c/announcements/5) before deploying +> [forum â†—ī¸](https://forum.mikrotik.com/viewforum.php?f=21) before deploying > to your production environment! Automatic updates should be handled > with care! -### Sample notifications +### Sample notification -![check-routeros-update notification found](check-routeros-update.d/notification-01-found.avif) -![check-routeros-update notification neighbor](check-routeros-update.d/notification-02-neighbor.avif) +![check-routeros-update notification](check-routeros-update.d/notification.avif) Requirements and installation ----------------------------- @@ -88,8 +87,6 @@ Be notified when run from scheduler or run it manually: If an update is found you can install it right away. -![Terminal](check-routeros-update.d/terminal.avif) - Installing script [packages-update](packages-update.md) gives extra options. Tips & Tricks diff --git a/doc/collect-wireless-mac.d/notification.avif b/doc/collect-wireless-mac.d/notification.avif index 4b21b2f5..a2833f09 100644 Binary files a/doc/collect-wireless-mac.d/notification.avif and b/doc/collect-wireless-mac.d/notification.avif differ diff --git a/doc/daily-psk.d/notification.avif b/doc/daily-psk.d/notification.avif index 79cfc3e2..dd0b1b62 100644 Binary files a/doc/daily-psk.d/notification.avif and b/doc/daily-psk.d/notification.avif differ diff --git a/doc/log-forward.d/notification-01-info.avif b/doc/log-forward.d/notification-01-info.avif deleted file mode 100644 index 6d25467b..00000000 Binary files a/doc/log-forward.d/notification-01-info.avif and /dev/null differ diff --git a/doc/log-forward.d/notification-02-warn.avif b/doc/log-forward.d/notification-02-warn.avif deleted file mode 100644 index ff61c0c0..00000000 Binary files a/doc/log-forward.d/notification-02-warn.avif and /dev/null differ diff --git a/doc/log-forward.d/notification.avif b/doc/log-forward.d/notification.avif new file mode 100644 index 00000000..a0f9ab33 Binary files /dev/null and b/doc/log-forward.d/notification.avif differ diff --git a/doc/log-forward.md b/doc/log-forward.md index d5a2f137..f6086c85 100644 --- a/doc/log-forward.md +++ b/doc/log-forward.md @@ -35,10 +35,9 @@ The script works around the limitations, for example it does: It is intended to be run periodically from scheduler, then collects new log messages and forwards them via notification. -### Sample notifications +### Sample notification -![log-forward notification info](log-forward.d/notification-01-info.avif) -![log-forward notification warn](log-forward.d/notification-02-warn.avif) +![log-forward notification](log-forward.d/notification.avif) Requirements and installation ----------------------------- diff --git a/doc/netwatch-notify.d/notification-01-down.avif b/doc/netwatch-notify.d/notification-01-down.avif index 2257a0d3..894fb23f 100644 Binary files a/doc/netwatch-notify.d/notification-01-down.avif and b/doc/netwatch-notify.d/notification-01-down.avif differ diff --git a/doc/netwatch-notify.d/notification-02-up.avif b/doc/netwatch-notify.d/notification-02-up.avif index 4147cb77..9021a93b 100644 Binary files a/doc/netwatch-notify.d/notification-02-up.avif and b/doc/netwatch-notify.d/notification-02-up.avif differ diff --git a/doc/sms-forward.d/notification.avif b/doc/sms-forward.d/notification.avif index 14764a3c..01eb7ba6 100644 Binary files a/doc/sms-forward.d/notification.avif and b/doc/sms-forward.d/notification.avif differ diff --git a/general/style.css b/general/style.css index c3e86901..191c0f65 100644 --- a/general/style.css +++ b/general/style.css @@ -39,19 +39,15 @@ div.notification { div.content { padding-left: 60px; } -hr { - clear: both; -} img.logo { float: left; - /* border-radius: 50%; */ + border-radius: 50%; } p.foot { color: #777; text-align: center; } p.heading { - font-size: 120%; margin: 0px; font-weight: bold; text-decoration: underline; @@ -62,8 +58,6 @@ p.hint { pre { font-family: fira-mono, monospace; white-space: pre-wrap; -} -pre.code { background-color: #f8f8f8; border: 1px solid #ccc; overflow: auto; @@ -75,7 +69,7 @@ pre code { padding: 0; border: 0; } -pre.code::before { +pre::before { content: "📋 Copy!"; float: right; border: 1px solid #ccc; @@ -103,6 +97,5 @@ td.head .bottom { } div.notification { float: right; - margin: 10px; } } diff --git a/sms-forward.rsc b/sms-forward.rsc index 161ae6be..feb640e5 100644 --- a/sms-forward.rsc +++ b/sms-forward.rsc @@ -68,8 +68,8 @@ $LogPrint warning $ScriptName ("Failed to remove message: " . $Err); } } else={ - :set Messages ($Messages . "\n\n" . [ $SymbolForNotification "incoming-envelope" ] . \ - "On " . $SmsVal->"timestamp" . " type " . $SmsVal->"type" . ":\n" . $SmsVal->"message"); + :set Messages ($Messages . "\n\nOn " . $SmsVal->"timestamp" . \ + " type " . $SmsVal->"type" . ":\n" . $SmsVal->"message"); :foreach Hook in=$SmsForwardHooks do={ :if ($Phone~($Hook->"allowed-number") && ($SmsVal->"message")~($Hook->"match")) do={ :if ([ $ValidateSyntax ($Hook->"command") ] = true) do={