diff options
| author | Jacek Konieczny <jajcus@jajcus.net> | 2021-11-19 17:55:19 +0100 |
|---|---|---|
| committer | Etienne Champetier <champetier.etienne@gmail.com> | 2021-11-21 11:00:53 -0500 |
| commit | 30007d380466b76a6f8ea3dbbdc1fa2c9d1704a6 (patch) | |
| tree | 8fdfdee2926a1cf901ea5ba39328a9e96b582ba4 /admin | |
| parent | 546973f711f322f2d74ed9627c8a3cb81794a341 (diff) | |
zabbix: fix 6in4 network interface discovery
Those devices don't have 'device' propery, only 'l3_device', which
causes 'attempt to concatenate field 'device' (a nil value)' lua error.
Use 'l3_device' as a fallback in this case.
Signed-off-by: Jacek Konieczny <jajcus@jajcus.net>
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/zabbix/Makefile | 2 | ||||
| -rw-r--r-- | admin/zabbix/files/network | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 333a60977..0eeab81f3 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix PKG_VERSION:=5.0.7 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/5.0/ diff --git a/admin/zabbix/files/network b/admin/zabbix/files/network index 43a0d3943..96bf194fa 100644 --- a/admin/zabbix/files/network +++ b/admin/zabbix/files/network @@ -3,4 +3,4 @@ # network interface discovery # example: {"data":[{"{#IF}":"lo", "{#NET}":"loopback"},{"{#IF}":"br-lan", "{#NET}":"lan"},{"{#IF}":"eth0.1", "{#NET}":"wan"}]} # -UserParameter=netowrt.discovery,lua -l ubus -e 'u=ubus.connect();list="{\"data\":[";dump=u:call("network.interface", "dump", {});for _, intf in ipairs(dump.interface) do list=list.."{\"{#IF}\":\""..intf.device.."\", \"{#NET}\":\""..intf.interface.."\"},";end;list=string.gsub(list,",$","");print(list.."]}")' +UserParameter=netowrt.discovery,lua -l ubus -e 'u=ubus.connect();list="{\"data\":[";dump=u:call("network.interface", "dump", {});for _, intf in ipairs(dump.interface) do list=list.."{\"{#IF}\":\""..(intf.device or intf.l3_device).."\", \"{#NET}\":\""..intf.interface.."\"},";end;list=string.gsub(list,",$","");print(list.."]}")' |