Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* ffluci/statistics: fixes for interface, netlink, dns and email plugin cbi models

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-05-22 13:17:33 +00:00
parent 41f224a2fa
commit f738eb786e
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-statistics/src/model/cbi/admin_statistics/dns.lua
View file

@ -13,7 +13,7 @@ $Id$
]]-- ]]--
require("ffluci.model.uci") require("ffluci.sys")
m = Map("luci_statistics", "DNS Plugin", m = Map("luci_statistics", "DNS Plugin",
@ -30,10 +30,8 @@ enable.default = 0
interfaces = s:option( ListValue, "Interface", "Folgende Schnittstelle überwachen:" ) interfaces = s:option( ListValue, "Interface", "Folgende Schnittstelle überwachen:" )
interfaces:depends( "enable", 1 ) interfaces:depends( "enable", 1 )
interfaces:value("any") interfaces:value("any")
for k, v in pairs(ffluci.model.uci.sections("network")) do for k, v in pairs(ffluci.sys.net.devices()) do
if v[".type"] == "interface" and k ~= "loopback" then interfaces:value(v)
interfaces:value(k)
end
end end
-- collectd_dns.ignoresources (IgnoreSource) -- collectd_dns.ignoresources (IgnoreSource)

2
applications/luci-statistics/src/model/cbi/admin_statistics/email.lua
View file

@ -27,7 +27,7 @@ enable.default = 0
-- collectd_email.socketfile (SocketFile) -- collectd_email.socketfile (SocketFile)
socketfile = s:option( Value, "SocketFile", "Pfad für den Unix-Socket" ) socketfile = s:option( Value, "SocketFile", "Pfad für den Unix-Socket" )
socketfile.default = "/var/run/collect-email.socket" socketfile.default = "/var/run/collect-email.sock"
socketfile:depends( "enable", 1 ) socketfile:depends( "enable", 1 )
-- collectd_email.socketgroup (SocketGroup) -- collectd_email.socketgroup (SocketGroup)

9
applications/luci-statistics/src/model/cbi/admin_statistics/interface.lua
View file

@ -13,6 +13,9 @@ $Id$
]]-- ]]--
require("ffluci.sys")
m = Map("luci_statistics", "Interface Plugin", m = Map("luci_statistics", "Interface Plugin",
[[Das Interface-Plugin sammelt Informationen zum Netzwerkverkehr auf den einzelnen Schnittstellen.]]) [[Das Interface-Plugin sammelt Informationen zum Netzwerkverkehr auf den einzelnen Schnittstellen.]])
@ -27,10 +30,8 @@ enable.default = 0
interfaces = s:option( MultiValue, "Interfaces", "Überwachte Schnittstellen", "mehrere Einträge mit Strg selektieren" ) interfaces = s:option( MultiValue, "Interfaces", "Überwachte Schnittstellen", "mehrere Einträge mit Strg selektieren" )
interfaces.widget = "select" interfaces.widget = "select"
interfaces:depends( "enable", 1 ) interfaces:depends( "enable", 1 )
for k, v in pairs(ffluci.model.uci.sections("network")) do for k, v in pairs(ffluci.sys.net.devices()) do
if v[".type"] == "interface" and k ~= "loopback" then interfaces:value(v)
interfaces:value(k)
end
end end
-- collectd_interface.ignoreselected (IgnoreSelected) -- collectd_interface.ignoreselected (IgnoreSelected)

4
applications/luci-statistics/src/model/cbi/admin_statistics/netlink.lua
View file

@ -33,7 +33,7 @@ interfaces.optional = true
interfaces:depends( "enable", 1 ) interfaces:depends( "enable", 1 )
interfaces:value("") interfaces:value("")
for i, v in ipairs(ffluci.sys.net.devices()) do for i, v in ipairs(ffluci.sys.net.devices()) do
interfaces:value(v) interfaces:value(v)
end end
-- collectd_netlink.verboseinterfaces (VerboseInterface) -- collectd_netlink.verboseinterfaces (VerboseInterface)
@ -43,7 +43,7 @@ verboseinterfaces.optional = true
verboseinterfaces:depends( "enable", 1 ) verboseinterfaces:depends( "enable", 1 )
verboseinterfaces:value("") verboseinterfaces:value("")
for i, v in ipairs(ffluci.sys.net.devices()) do for i, v in ipairs(ffluci.sys.net.devices()) do
verboseinterfaces:value(v) verboseinterfaces:value(v)
end end
-- collectd_netlink.qdiscs (QDisc) -- collectd_netlink.qdiscs (QDisc)