From cce7d582691dc735740c7d6ad9296652dcf79ca6 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 26 Mar 2016 11:46:17 +0100 Subject: [PATCH] admin/zabbix: Fix typos (found by codespell) Signed-off-by: Stefan Weil --- admin/zabbix/files/mac80211 | 4 ++-- admin/zabbix/files/network | 2 +- admin/zabbix/files/wifi | 2 +- admin/zabbix/patches/015-daemon-foreground.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/zabbix/files/mac80211 b/admin/zabbix/files/mac80211 index 93d835189..afa50aeba 100644 --- a/admin/zabbix/files/mac80211 +++ b/admin/zabbix/files/mac80211 @@ -2,10 +2,10 @@ # If you want to know the exact meaning of an UserParameter, you can search in the ieee80211 standard: # http://standards.ieee.org/getieee802/download/802.11-2012.pdf -# exemple: for mac80211.ACKFailureCount search for dot11ACKFailureCount (page 2145) +# example: for mac80211.ACKFailureCount search for dot11ACKFailureCount (page 2145) # mac80211 phy discovery (like 'phy0') -# exemple: {"data":[{"{#PHY}":"phy0"}]} +# example: {"data":[{"{#PHY}":"phy0"}]} # UserParameter=mac80211.phydiscovery,zabbix_helper_mac80211 discovery diff --git a/admin/zabbix/files/network b/admin/zabbix/files/network index 51cb1cbc2..b68e2a505 100644 --- a/admin/zabbix/files/network +++ b/admin/zabbix/files/network @@ -1,7 +1,7 @@ #see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates # network interface discovery -# exemple: {"data":[{"{#IF}":"lo", "{#NET}":"loopback"},{"{#IF}":"br-lan", "{#NET}":"lan"},{"{#IF}":"eth0.1", "{#NET}":"wan"}]} +# example: {"data":[{"{#IF}":"lo", "{#NET}":"loopback"},{"{#IF}":"br-lan", "{#NET}":"lan"},{"{#IF}":"eth0.1", "{#NET}":"wan"}]} # UserParameter=netowrt.discovery,lua -l uci -e 'x = uci.cursor(nil, "/var/state");list = "{\"data\":[";x:foreach("network", "interface", function(s) list=list.."{\"{#IF}\":\""..s.ifname.."\", \"{#NET}\":\""..s[".name"].."\"}," end); list=string.gsub(list,",$",""); print(list.."]}")' diff --git a/admin/zabbix/files/wifi b/admin/zabbix/files/wifi index 6315ea995..f03d9b41e 100644 --- a/admin/zabbix/files/wifi +++ b/admin/zabbix/files/wifi @@ -1,7 +1,7 @@ #see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates # wifi interface discovery -# exemple: {"data":[{"{#IF}":"wlan0", "{#MODE}":"ap", "{#SSID}":"Openwrt", "{#NET}":"lan", "{#DEV}":"radio0", "{#ENC}":"psk2+ccmp", "{#TYPE}":"mac80211", "{#HWMODE}":"11ng", "{#CHANNEL}":"11", "{#BSSID}":"xx:xx:xx:xx:xx:xx"}]} +# example: {"data":[{"{#IF}":"wlan0", "{#MODE}":"ap", "{#SSID}":"Openwrt", "{#NET}":"lan", "{#DEV}":"radio0", "{#ENC}":"psk2+ccmp", "{#TYPE}":"mac80211", "{#HWMODE}":"11ng", "{#CHANNEL}":"11", "{#BSSID}":"xx:xx:xx:xx:xx:xx"}]} # ubus call only work as root so you need to run zabbix as root to use wifi.ifdiscovery UserParameter=wifi.ifdiscovery, lua -l ubus -l iwinfo -e 'u=ubus.connect();list="{\"data\":[";stat=u:call("network.wireless", "status", {});for dev, dev_table in pairs(stat) do for i, iface in pairs(dev_table["interfaces"]) do c=iface["config"];i=iface["ifname"];t=iwinfo.type(i);iw=iwinfo[t];e = iw.encryption(i);e = e and e.description or "None";n = table.concat(c["network"]," ");list=list.."{\"{#IF}\":\""..i.."\", \"{#MODE}\":\""..iw.mode(i).."\", \"{#SSID}\":\""..c["ssid"].."\", \"{#NET}\":\""..n.."\", \"{#DEV}\":\""..dev.."\", \"{#ENC}\":\""..e.."\", \"{#TYPE}\":\""..t.."\", \"{#HWMODE}\":\"".."?".."\", \"{#CHANNEL}\":\""..iw.channel(i).."\", \"{#BSSID}\":\""..iw.bssid(i).."\"},";end;end;list=string.gsub(list,",$","");print(list.."]}")' diff --git a/admin/zabbix/patches/015-daemon-foreground.patch b/admin/zabbix/patches/015-daemon-foreground.patch index 364e70360..a0fd9b98b 100644 --- a/admin/zabbix/patches/015-daemon-foreground.patch +++ b/admin/zabbix/patches/015-daemon-foreground.patch @@ -39,7 +39,7 @@ + * Parameters: allow_root - allow root permission for application * + * user - user on the system to which to drop the * + * privileges * -+ * run_foreground - should it close its controling tty * ++ * run_foreground - should it close its controlling tty * * * * Author: Alexei Vladishev * * *