From 0633fb23c8863b4757f30a49853dc50493687118 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 9 Jul 2019 12:47:37 +0200 Subject: 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 --- .../luci-app-statistics/root/usr/bin/stat-genconfig | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index df36da419..0c49b1f95 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -276,15 +276,11 @@ plugins = { { }, { } }, - curl = config_curl, - exec = config_exec, - iptables = config_iptables, logfile = { { "LogLevel", "File" }, { "Timestamp" }, { } }, - network = config_network, } 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 }) local plugin = plugin_fun() 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 -- cgit v1.2.3