Commit graph

462 commits

Author SHA1 Message Date
Christian Hesse
e927c6b08b global-functions: $GetMacVendor: switched to Let's Encrypt (R3)
So let's check for the correct one, and drop the other.
2022-09-13 15:18:28 +02:00
Christian Hesse
a1af9577ca global-functions: $ScriptInstallUpdate: prepare for future certificate chain 2022-09-09 14:02:02 +02:00
Christian Hesse
8f32887a1a global-functions: introduce $GetRandom20CharAlNum 2022-09-07 12:28:45 +02:00
Christian Hesse
ff0b05ea20 global-functions: $GetRandom20CharHex: add optional parameter for length 2022-09-07 12:22:45 +02:00
Christian Hesse
8f7a0c2a06 global-functions: $SymbolByUnicodeName: add 'earth' 2022-08-25 12:51:07 +02:00
Michael Gisbers
28be6d097d global-functions: $GetRandomNumber: use :rndnum
This is available in RouterOS 7.x...

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-08-05 22:58:55 +02:00
Michael Gisbers
0562198c55 global-functions: $GetRandom20CharHex: use :rndstr
This is available in RouterOS 7.x...

Signed-off-by: Christian Hesse <mail@eworm.de>
2022-08-05 22:58:55 +02:00
Christian Hesse
82f27268b3 global-functions: $IsTimeSync: cache a positive result
The functions do not rely on perfectly synced time. About the right time
is fine, that should make sure certificates are valid and mails are sent
with reasonable headers. So cache the result if system is fine for later
use.
2022-07-21 14:04:44 +02:00
Christian Hesse
329e606b93 global-functions: $IsTimeSync: drop the extra condition...
... as ddns is not required to be enabled. The public address is
available anyway, but not set in DNS.
2022-07-21 14:04:44 +02:00
Christian Hesse
ed7b48061a global-functions: $IsTimeSync: drop old code
In RouterOS 7.x the ntp client and server are bundled and unique and
can not be unavailable.
Also it does no longer have a 'last-adjustment' property...
2022-07-21 14:03:11 +02:00
Christian Hesse
518cc24108 global-functions: $IsFullyConnected: remove trailing space 2022-07-21 13:21:51 +02:00
Christian Hesse
9a89cd5407 global-functions: update initialization of empty array
Having the parenthesis here is important for valid syntax!
2022-07-13 11:32:44 +02:00
Christian Hesse
a1606402d1 global-config: new setting to disable news and change notifications...
... and also drop the version from global-config and
global-config-overlay.
2022-07-06 21:46:52 +02:00
Christian Hesse
19103cd345 netwatch-notify: rename parameter: hostname -> name
Starting with RouterOS 7.4 the netwatch tool has been extended, it can
now do tcp and http probes. Rename the parameter for reasonable naming
with services.
2022-07-06 11:37:02 +02:00
Christian Hesse
eda75f0bbc global-functions: introduce function $PrettyPrint
... to add trailing carriage return when printing to terminal:

[admin@MikroTik] > $PrettyPrint [ $DeviceInfo ]
Hostname:       MikroTik
Board name:     hAP ac^2
Architecture:   arm
Model:          RouterBOARD D52G-5HacD2HnD-TC
Serial number:  8A2A09A221A1
RouterOS:
    Channel:    testing
    Installed:  7.4rc1
RouterOS-Scripts:
    Current:    81
2022-07-05 12:43:57 +02:00
Christian Hesse
fcd6e61849 global-functions: $ScriptInstallUpdate: remove script on failure when installing 2022-06-28 21:40:00 +02:00
Christian Hesse
d8d7ace5e5 global-functions: introduce function $IsFullyConnected 2022-06-20 11:29:49 +02:00
Christian Hesse
b1ad89b1b5 global-functions: rename internal function: $TimeIsSync -> $IsTimeSync 2022-06-20 11:29:49 +02:00
Christian Hesse
9aa82316c8 global-functions: rename internal function: $DNSIsResolving -> $IsDNSResolving 2022-06-20 11:29:49 +02:00
Christian Hesse
0ee38a4303 global-functions: rename internal function: $DefaultRouteIsReachable -> $IsDefaultRouteReachable 2022-06-20 11:29:49 +02:00
Christian Hesse
f628ef73fd global-functions: $WaitTimeSync: drop declaration of unused function 2022-06-17 00:04:24 +02:00
Christian Hesse
3002990319 fix typos: 'at lease' -> 'at least' 2022-06-16 23:56:36 +02:00
Christian Hesse
b3de1fad34 drop script 'rotate-ntp'
For RouterOS 6.x a separate package 'ntp' exists. This adds server
functionality, but allows ip addresses for the client only. I added the
script 'rotate-ntp' to update addresses from names...

Now with RouterOS 7.x there's no extra package and the limitation does
no longer exist. So let's just drop the script.

This adds migration code, that...
 * removes the script from configuration
 * removes a scheduler from configuration
 * sets the configured ntp pool name for ntp client
2022-06-15 16:39:49 +02:00
Christian Hesse
89f4c91ccf log-forward: change symbol for notification 2022-05-20 08:33:22 +02:00
Christian Hesse
3139b14c67 global-functions: $FlushEmailQueue: return if time is not synced
The local system time is used in the mail header. We do not want the
mails to be sent in the past, so return early (and thus wait for time
being synced).
2022-05-17 21:11:03 +02:00
Christian Hesse
5e481a768b notify about freeze of routeros-v7 branch 2022-05-12 11:05:10 +02:00
Christian Hesse
0ccebc39c7 global-functions: RouterOS v7 path syntax 2022-05-11 13:48:27 +02:00
Christian Hesse
f417bcbcd4 global-functions: $LogPrintExit2: handle empty name 2022-04-28 11:04:34 +02:00
Christian Hesse
e74bec7e5b global-functions: catch runtime error when loading modules 2022-04-28 10:19:07 +02:00
Christian Hesse
7c8e230521 global-functions: validate syntax of modules 2022-04-28 10:19:07 +02:00
Christian Hesse
9bc2123ee5 global-functions: set $0 with script name
Now that we have some active code at the bottom...
2022-04-28 10:18:51 +02:00
Christian Hesse
a36aa441ed global-functions: $DefaultRouteIsReachable: update properties for ROS 7.x 2022-04-26 16:41:15 +02:00
Christian Hesse
a058c9e1ed global-functions: $ScriptInstallUpdate: support giving comment...
... for new scripts. This allows to have extra settings from the
beginning, for example:

$ScriptInstallUpdate script1,script2 "base-url=https://example.com/your/custom/repository/"
2022-04-26 16:41:15 +02:00
Christian Hesse
71b69fc189 introduce backup-partition 2022-03-30 18:24:14 +02:00
Christian Hesse
07cc38e973 global-functions: (re-)introduce global $Read
... to interactively read input from user on terminal.
2022-03-08 22:28:48 +01:00
Christian Hesse
c9b6cee83f global-functions: $FlushEmailQueue: delay if "in-progress"...
Something else is sending a mail... Let's wait and hope the status is
not confused.
2022-03-01 12:47:23 +01:00
Christian Hesse
a00e912bb5 global-functions: $DeviceInfo: firmware only if upgrade pending 2022-02-24 12:04:19 +01:00
Christian Hesse
d74aac8f6a doc/mod: notify about new documentation 2022-02-21 12:53:26 +01:00
Christian Hesse
674398b342 global-functions: $DownloadPackage: handle special cases
This is a RouterOS v7 only change!

* Revert commit 1e6931c8e3 (but keep the
  cherry-picked one in branch routeros-v6).

* Drop special case 'routeros-$arch', which no longer exists.

* Update package name 'system' to 'routeros'. This should be the correct
  name, and is expected by CAPsMAN. No idea why package-name property
  for the file is different...
2022-02-10 12:30:06 +01:00
Christian Hesse
7b48b25c27 global-functions: $MkDir: do not act without directory 2022-02-10 11:05:21 +01:00
Christian Hesse
3c358980cb introduce firmware-upgrade-reboot 2022-02-10 09:07:32 +01:00
Christian Hesse
c6e581d4f9 netwatch-notify: allow to suppress notification on host down 2022-02-10 08:41:12 +01:00
Christian Hesse
5e32105e7e global-functions: $ScriptInstallUpdate: quote names in log output 2022-01-20 22:13:56 +01:00
Christian Hesse
b4a5d824a2 global-functions: $ScriptInstallUpdate: give final url in debug output 2022-01-20 22:13:56 +01:00
Christian Hesse
1e6931c8e3 global-functions: $DownloadPackage: handle special case with name
For RouterOS 6.x bundled package version and architecture are swapped.

Closes: #21
2022-01-17 20:50:52 +01:00
Christian Hesse
51cd11c803 global-functions: $DownloadPackage: give url in debug output 2022-01-17 20:15:24 +01:00
Christian Hesse
5135a41332 global: notify about merging 'routeros-v7' into 'main' 2022-01-14 09:31:07 +01:00
Christian Hesse
d03b6d9374 global-functions: bump the required version for RouterOS 7.x
... but keep a warning when running RouterOS v6.
2022-01-14 09:20:09 +01:00
Christian Hesse
491f53a8ce hotspot-to-wpa: support settings from template 2022-01-07 15:28:08 +01:00
Christian Hesse
ed0135c613 Migrate configuration and send notification on renames 2022-01-06 08:19:58 +01:00
Christian Hesse
57c80dc2a4 introduce netwatch-dns 2022-01-03 10:00:16 +01:00
Christian Hesse
95e9820718 update copyright for 2022 2022-01-01 21:38:15 +01:00
Christian Hesse
500d0679ed global-functions: $RequiredRouterOS: fix warning
Passing a boolean does not work... Handle as string.
2021-12-20 15:31:34 +01:00
Christian Hesse
229a7d18c9 global-functions: $DownloadPackage: make directory first
The fetch command creates the directory itself, however using $MkDir
gives better error message when creating directory fails.
2021-12-14 00:10:30 +01:00
Christian Hesse
5846b85e28 global-functions: $MkDir: log error 2021-12-14 00:07:22 +01:00
Christian Hesse
e111832462 global-functions: $NotificationFunctions->"email": do not declare unused function 2021-12-14 00:06:10 +01:00
Christian Hesse
0fab371d1a global-functions: $DeviceInfo: show license level if available
This now shows license level for CHR.

The property is named different for Routerboards. As these have the
license bundled to hardware anyway we do not show it there.
2021-12-13 22:25:55 +01:00
Christian Hesse
40dea01670 README: changes for RouterOS v6 2021-12-13 11:36:03 +01:00
Christian Hesse
6dede0c49b global-functions: $ScriptLock: simplify cleanup code 2021-12-10 07:34:09 +01:00
Christian Hesse
a46fd48187 global-functions: $ScriptLock: remove ticket in a loop
This was not required with RouterOS v6, but for any reason removing a
ticket may fail with RouterOS v7 in very rare cases. So remove in a
loop...
2021-12-09 22:48:30 +01:00
Christian Hesse
b423e6ed0f global-functions: $ScriptLock: cleanup in dedicated function 2021-12-09 22:48:30 +01:00
Christian Hesse
cdcab4599a global-functions: $ScriptLock: initialize earlier 2021-12-09 12:52:03 +01:00
Christian Hesse
9c87b5a222 global-functions: $ScriptLock: initialize empty array on cleanup 2021-12-09 12:52:03 +01:00
Christian Hesse
a98965d727 global-functions: give a hint on RouterOS v7 2021-12-07 23:01:01 +01:00
Christian Hesse
1f5cc39b3c global-config: load overlay automatically 2021-12-07 21:58:03 +01:00
Christian Hesse
dab04fd63e README: changes for RouterOS v7 2021-12-07 11:11:19 +01:00
Christian Hesse
5b786e10c8 global-functions: $DeviceInfo: add current firmware
(I would like to show a note if the upgrade is pending... But did not
find a way to get that information. Is there?)
2021-11-22 09:57:57 +01:00
Christian Hesse
2625cc09a5 check-health: support hard lower limit for voltage
... to detect slow decrease of voltage, for example with UPS.
2021-11-16 22:21:37 +01:00
Christian Hesse
d87c50cf68 check-health: indicate voltage increase or decrease 2021-11-16 22:21:37 +01:00
Christian Hesse
185fe2c730 reintroduce global-wait 2021-11-16 22:21:37 +01:00
Christian Hesse
3b997d3087 global-functions: drop deprecated function $LogPrintExit
... which has been replaced by $LogPrintExit2 some time ago.
2021-11-16 22:21:22 +01:00
Christian Hesse
8fc88c73f8 shorten modules directory name (global-functions.d -> mod) 2021-11-15 22:18:10 +01:00
Christian Hesse
f484e45b6a bridge-port-to-default -> global-functions.d/bridge-port-to 2021-11-15 22:18:10 +01:00
Christian Hesse
b6215ba958 add global-functions.d/bridge-port-vlan 2021-11-12 16:09:35 +01:00
Christian Hesse
99a95d310e global-functions: $NotificationFunctions->"email": check for valid settings
No need to queue mails if 'address' and 'from' are not specified...
2021-10-01 20:39:59 +02:00
Christian Hesse
f780b205a9 global-functions: $DeviceInfo: do not fail on non-RouterBoard with ROS 7.x 2021-10-01 09:00:36 +02:00
Christian Hesse
9295d06fe2 global-functions.d/inspectvar: add $InspectVar...
to inspect variables. This is useful for variables with (nested) arrays,
for example inspecting $NetwatchNotify (from netwatch-notify):

[admin@Mikrotik] > $InspectVar $NetwatchNotify
-type-> array
  -key-> quad-one
    -type-> array
      -key-> count
        -type-> num
        -value-> 0
      -key-> notified
        -type-> bool
        -value-> false
      -key-> parent
        -type-> nothing
      -key-> resolve-failed
        -type-> nothing
      -key-> since
        -type-> nothing
  -key-> example.com
    -type-> array
      -key-> count
        -type-> num
        -value-> 0
      -key-> notified
        -type-> bool
        -value-> false
      -key-> parent
        -type-> str
        -value-> quad-one
      -key-> resolve-failed
        -type-> nothing
      -key-> since
        -type-> nothing
2021-09-21 21:26:13 +02:00
Christian Hesse
ce78d7d9e9 global-functions: notify about move of $IPCalc and $ScriptRunOnce to modules
Just install with...

$ScriptInstallUpdate global-functions.d/ipcalc

... and/or...

$ScriptInstallUpdate global-functions.d/scriptrunonce

... and use the functions as before.
2021-09-21 21:26:13 +02:00
Christian Hesse
012db05a93 global-functions: move $ScriptRunOnce to optional module 2021-09-21 21:26:13 +02:00
Christian Hesse
8b05d25487 global-functions: move $IPCalc to optional module 2021-09-21 21:26:13 +02:00
Christian Hesse
70f9c7926b global-functions*: syntax for ROS 7.x
Strings with escape sequence have to be enclosed in parentheses. Looks
like RouterOS 7.x is stricter here...
2021-09-08 14:33:02 +02:00
Christian Hesse
150c228197 global-functions: $CertificateAvailable: drop version check 2021-09-02 08:55:34 +02:00
Christian Hesse
832e899cda global-functions: $RequiredRouterOS: allow to use without warning 2021-09-01 14:05:55 +02:00
Christian Hesse
ae8e22941e global-functions: $ScriptLock: handle array by index
This should mitigate race conditions while rewriting the array.
2021-08-31 21:40:42 +02:00
Christian Hesse
d356d6f57c global-functions: $ScriptLock: do not store but calculate job count
This should mitigate some more race conditions.
2021-08-31 21:40:42 +02:00
Christian Hesse
4269bc9548 global-functions: $ScriptLock: check for successful removal of ticket
The script is already locked, so there is no second script to remove a
ticket at the same time. However a new script can add a new ticket and
overwrite the removal... Thus check for successful removal anyway.
2021-07-25 23:19:54 +02:00
Ben Harris
9fba3dd8df global-functions: $ScriptLock: fix off-by-one check...
... for stale job tickets

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-07-15 10:17:25 +02:00
Christian Hesse
483506b189 global-functions: introduce $ScriptRunOnce 2021-07-10 23:18:04 +02:00
Christian Hesse
d1ef710093 global-functions: $ScriptInstallUpdate: add error handling for changelog 2021-07-09 22:04:15 +02:00
Christian Hesse
dc7fc0d385 finally remove old scripts 2021-07-09 12:46:03 +02:00
Christian Hesse
b864db1e38 global-functions: $ScriptInstallUpdate: add error handling for migration 2021-07-09 12:46:03 +02:00
Christian Hesse
f694e1e54d global-functions: $ScriptInstallUpdate: drop unused variable
This was a left-over from re-run message.
2021-07-09 12:46:03 +02:00
Christian Hesse
81cba72bec global-functions: $ScriptInstallUpdate: drop the migration pattern 2021-07-09 12:46:03 +02:00
Christian Hesse
bccb7c3452 netwatch-notify: implement pre-down hook 2021-07-09 12:46:03 +02:00
Christian Hesse
4192d30d7e global-functions: $ScriptLock: drop variable, just return 2021-07-09 10:40:13 +02:00
Christian Hesse
a4e548eb80 global-functions: $ScriptLock: make ticket management more reliable 2021-07-08 21:03:31 +02:00
Michael Gisbers
d5edcbd3b6 check-routeros-update: allow update for cap
If CAPsMAN is running on a device with just 16MB flash downloading the
packages is not possible (or at least lost at reboot). So allow a CAP to
update with opt-in.
2021-07-01 22:56:18 +02:00
Christian Hesse
aad91d90ea global-functions: $ScriptLock: use hex string for ticket
Does not matter what the ticket looks like, but using hex string it is
not converted to number.
2021-07-01 22:37:03 +02:00
Christian Hesse
0b4c1861cf global-functions: $ScriptLock: use a limit on lock...
... to make sure it does not lock forever.
2021-07-01 22:37:03 +02:00
Christian Hesse
7de3457f44 global-functions: $ScriptLock: allow to wait for lock 2021-06-30 21:28:27 +02:00