-- our collectd menu
local collectd_menu = {
output = { "rrdtool", "network", "unixsock", "csv" },
- system = { "exec", "email", "cpu", "df", "disk", "irq", "processes" },
+ system = { "exec", "email", "cpu", "df", "disk", "irq", "processes", "load" },
network = { "interface", "netlink", "iptables", "tcpconns", "ping", "dns", "wireless" }
}
page.setuser = "nobody"
page.setgroup = "nogroup"
- local vars = luci.http.formvalues()
+ local vars = luci.http.formvalue(nil, true)
local span = vars.timespan or nil
for i, plugin in luci.util.vspairs( tree:plugins() ) do
require("luci.template")
require("luci.model.uci")
- local vars = luci.http.formvalues()
- local req = luci.dispatcher.request
- local path = luci.dispatcher.dispatched.path
- local uci = luci.model.uci
- local spans = luci.util.split( uci.get( "luci_statistics", "collectd_rrdtool", "RRATimespans" ), "%s+", nil, true )
- local span = vars.timespan or uci.get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1]
+ local vars = luci.http.formvalue()
+ local req = luci.dispatcher.context.request
+ local path = luci.dispatcher.context.dispatched.path
+ local uci = luci.model.uci.cursor()
+ local spans = luci.util.split( uci:get( "luci_statistics", "collectd_rrdtool", "RRATimespans" ), "%s+", nil, true )
+ local span = vars.timespan or uci:get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1]
local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ) )
local plugin, instances
local images = { }
-- find requested plugin and instance
- for i, p in ipairs( luci.dispatcher.dispatched.path ) do
- if luci.dispatcher.dispatched.path[i] == "graph" then
- plugin = luci.dispatcher.dispatched.path[i+1]
- instances = { luci.dispatcher.dispatched.path[i+2] }
+ for i, p in ipairs( luci.dispatcher.context.dispatched.path ) do
+ if luci.dispatcher.context.dispatched.path[i] == "graph" then
+ plugin = luci.dispatcher.context.dispatched.path[i+1]
+ instances = { luci.dispatcher.context.dispatched.path[i+2] }
end
end