luci-app-statistics: fix collectd config generation
Fix config generation for the following sections:
* curl
* exec
* network
* iptables
Ref: https://github.com/openwrt/packages/issues/9427
Fixes: c1380ab
("make luci-app-statistics more extensible")
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
parent
8055ed4c46
commit
0633fb23c8
1 changed files with 11 additions and 5 deletions
|
@ -276,15 +276,11 @@ plugins = {
|
||||||
{ },
|
{ },
|
||||||
{ }
|
{ }
|
||||||
},
|
},
|
||||||
curl = config_curl,
|
|
||||||
exec = config_exec,
|
|
||||||
iptables = config_iptables,
|
|
||||||
logfile = {
|
logfile = {
|
||||||
{ "LogLevel", "File" },
|
{ "LogLevel", "File" },
|
||||||
{ "Timestamp" },
|
{ "Timestamp" },
|
||||||
{ }
|
{ }
|
||||||
},
|
},
|
||||||
network = config_network,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local plugin_dir = "/usr/lib/lua/luci/statistics/plugins/"
|
local plugin_dir = "/usr/lib/lua/luci/statistics/plugins/"
|
||||||
|
@ -293,7 +289,17 @@ for filename in nixio.fs.dir(plugin_dir) do
|
||||||
setfenv(plugin_fun, { _ = luci.i18n.translate })
|
setfenv(plugin_fun, { _ = luci.i18n.translate })
|
||||||
local plugin = plugin_fun()
|
local plugin = plugin_fun()
|
||||||
local name = filename:gsub("%.lua", "")
|
local name = filename:gsub("%.lua", "")
|
||||||
plugins[name] = plugin.legend
|
if (name == "exec") then
|
||||||
|
plugins[name] = config_exec
|
||||||
|
elseif (name == "iptables") then
|
||||||
|
plugins[name] = config_iptables
|
||||||
|
elseif (name == "curl") then
|
||||||
|
plugins[name] = config_curl
|
||||||
|
elseif (name == "network") then
|
||||||
|
plugins[name] = config_network
|
||||||
|
else
|
||||||
|
plugins[name] = plugin.legend
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue