X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-statistics%2Fluasrc%2Fcontroller%2Fluci_statistics%2Fluci_statistics.lua;h=ccea56e2b85a488e6795e1a49c219fc521c5c969;hp=ad3e05427d2673ae7fd397d423715900600560d7;hb=c833c967505440717343dc5bd580dbb286e54b3f;hpb=d30d590ae8d4125d67b0b9a0fc02d9e984304821 diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua index ad3e05427..ccea56e2b 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -17,68 +17,97 @@ module("luci.controller.luci_statistics.luci_statistics", package.seeall) function index() - require("luci.fs") - require("luci.i18n") + require("nixio.fs") + require("luci.util") require("luci.statistics.datatree") - -- load language file - luci.i18n.load("statistics.en") -- XXX: temporary / replace with loadc() - -- get rrd data tree local tree = luci.statistics.datatree.Instance() -- override entry(): check for existance .so where is derived from the called path function _entry( path, ... ) - local file = path[4] or path[3] - if luci.fs.isfile( "/usr/lib/collectd/" .. file .. ".so" ) then + local file = path[5] or path[4] + if nixio.fs.access( "/usr/lib/collectd/" .. file .. ".so" ) then entry( path, ... ) end end - -- override i18n(): try to translate stat_ or fall back to - function _i18n( str ) - return luci.i18n.translate( "stat_" .. str, str ) - end - - - entry({"admin", "statistics"}, call("statistics_index"), _i18n("statistics"), 80).i18n = "statistics" - entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _i18n("collectd"), 10) - - entry({"admin", "statistics", "output"}, call("statistics_outputplugins"), _i18n("outputplugins"), 20) - _entry({"admin", "statistics", "output", "rrdtool"}, cbi("luci_statistics/rrdtool"), _i18n("rrdtool"), 10) - _entry({"admin", "statistics", "output", "network"}, cbi("luci_statistics/network"), _i18n("network"), 20) - _entry({"admin", "statistics", "output", "unixsock"}, cbi("luci_statistics/unixsock"), _i18n("unixsock"), 30) - _entry({"admin", "statistics", "output", "csv"}, cbi("luci_statistics/csv"), _i18n("csv"), 40) - - entry({"admin", "statistics", "system"}, call("statistics_systemplugins"), _i18n("systemplugins"), 30) - _entry({"admin", "statistics", "system", "exec"}, cbi("luci_statistics/exec"), _i18n("exec"), 10) - _entry({"admin", "statistics", "system", "email"}, cbi("luci_statistics/email"), _i18n("email"), 20) - _entry({"admin", "statistics", "system", "cpu"}, cbi("luci_statistics/cpu"), _i18n("cpu"), 30) - _entry({"admin", "statistics", "system", "df"}, cbi("luci_statistics/df"), _i18n("df"), 40) - _entry({"admin", "statistics", "system", "disk"}, cbi("luci_statistics/disk"), _i18n("disk"), 50) - _entry({"admin", "statistics", "system", "irq"}, cbi("luci_statistics/irq"), _i18n("irq"), 60) - _entry({"admin", "statistics", "system", "processes"}, cbi("luci_statistics/processes"), _i18n("processes"), 70) - - entry({"admin", "statistics", "network"}, call("statistics_networkplugins"), _i18n("networkplugins"),40) - _entry({"admin", "statistics", "network", "interface"}, cbi("luci_statistics/interface"), _i18n("interface"), 10) - _entry({"admin", "statistics", "network", "netlink"}, cbi("luci_statistics/netlink"), _i18n("netlink"), 20) - _entry({"admin", "statistics", "network", "iptables"}, cbi("luci_statistics/iptables"), _i18n("iptables"), 30) - _entry({"admin", "statistics", "network", "tcpconns"}, cbi("luci_statistics/tcpconns"), _i18n("tcpconns"), 40) - _entry({"admin", "statistics", "network", "ping"}, cbi("luci_statistics/ping"), _i18n("ping"), 50) - _entry({"admin", "statistics", "network", "dns"}, cbi("luci_statistics/dns"), _i18n("dns"), 60) - _entry({"admin", "statistics", "network", "wireless"}, cbi("luci_statistics/wireless"), _i18n("wireless"), 70) + local labels = { + s_output = _("Output plugins"), + s_system = _("System plugins"), + s_network = _("Network plugins"), + + conntrack = _("Conntrack"), + cpu = _("Processor"), + csv = _("CSV Output"), + df = _("Disk Space Usage"), + disk = _("Disk Usage"), + dns = _("DNS"), + email = _("Email"), + exec = _("Exec"), + interface = _("Interfaces"), + iptables = _("Firewall"), + irq = _("Interrupts"), + iwinfo = _("Wireless"), + load = _("System Load"), + memory = _("Memory"), + netlink = _("Netlink"), + network = _("Network"), + olsrd = _("OLSRd"), + ping = _("Ping"), + processes = _("Processes"), + rrdtool = _("RRDTool"), + tcpconns = _("TCP Connections"), + unixsock = _("UnixSock") + } + + -- our collectd menu + local collectd_menu = { + output = { "csv", "network", "rrdtool", "unixsock" }, + system = { "cpu", "df", "disk", "email", "exec", "irq", "load", "memory", "processes" }, + network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "tcpconns", "iwinfo" } + } + + -- create toplevel menu nodes + local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80) + st.i18n = "statistics" + st.index = true + + entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true + + + -- populate collectd plugin menu + local index = 1 + for section, plugins in luci.util.kspairs( collectd_menu ) do + local e = entry( + { "admin", "statistics", "collectd", section }, + firstchild(), labels["s_"..section], index * 10 + ) + + e.index = true + e.i18n = "rrdtool" + + for j, plugin in luci.util.vspairs( plugins ) do + _entry( + { "admin", "statistics", "collectd", section, plugin }, + cbi("luci_statistics/" .. plugin ), + labels[plugin], j * 10 + ) + end + index = index + 1 + end -- output views - local page = entry( { "admin", "statistics", "graph" }, call("statistics_index"), _i18n("graphs"), 80) + local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80) page.i18n = "statistics" 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 ipairs( tree:plugins() ) do + for i, plugin in luci.util.vspairs( tree:plugins() ) do -- get plugin instances local instances = tree:plugin_instances( plugin ) @@ -86,12 +115,12 @@ function index() -- plugin menu entry entry( { "admin", "statistics", "graph", plugin }, - call("statistics_render"), _i18n( plugin ), i + call("statistics_render"), labels[plugin], i ).query = { timespan = span } -- if more then one instance is found then generate submenu if #instances > 1 then - for j, inst in ipairs(instances) do + for j, inst in luci.util.vspairs(instances) do -- instance menu entry entry( { "admin", "statistics", "graph", plugin, inst }, @@ -102,80 +131,63 @@ function index() end end -function statistics_index() - luci.template.render("admin_statistics/index") -end - -function statistics_outputplugins() - local plugins = { } - - for i, p in ipairs({ "rrdtool", "network", "unixsock", "csv" }) do - plugins[p] = luci.i18n.translate( "stat_" .. p, p ) - end - - luci.template.render("admin_statistics/outputplugins", {plugins=plugins}) -end - -function statistics_systemplugins() - local plugins = { } - - for i, p in ipairs({ "exec", "email", "df", "disk", "irq", "processes", "cpu" }) do - plugins[p] = luci.i18n.translate( "stat_" .. p, p ) - end - - luci.template.render("admin_statistics/systemplugins", {plugins=plugins}) -end - -function statistics_networkplugins() - local plugins = { } - - for i, p in ipairs({ "interface", "netlink", "iptables", "tcpconns", "ping", "dns", "wireless" }) do - plugins[p] = luci.i18n.translate( "stat_" .. p, p ) - end - - luci.template.render("admin_statistics/networkplugins", {plugins=plugins}) -end - - function statistics_render() require("luci.statistics.rrdtool") 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.Session() + local vars = luci.http.formvalue() + local req = luci.dispatcher.context.request + local path = luci.dispatcher.context.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 is_index = false + + -- deliver image + if vars.img then + local l12 = require "luci.ltn12" + local png = io.open(graph.opts.imgpath .. "/" .. vars.img:gsub("%.+", "."), "r") + if png then + luci.http.prepare_content("image/png") + l12.pump.all(l12.source.file(png), luci.http.write) + png:close() + end + return + end + 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] } - end + for i, p in ipairs( luci.dispatcher.context.path ) do + if luci.dispatcher.context.path[i] == "graph" then + plugin = luci.dispatcher.context.path[i+1] + instances = { luci.dispatcher.context.path[i+2] } end + end -- no instance requested, find all instances if #instances == 0 then - instances = { graph.tree:plugin_instances( plugin )[1] } + --instances = { graph.tree:plugin_instances( plugin )[1] } + instances = graph.tree:plugin_instances( plugin ) + is_index = true -- index instance requested elseif instances[1] == "-" then instances[1] = "" + is_index = true end -- render graphs for i, inst in ipairs( instances ) do - for i, img in ipairs( graph:render( plugin, inst ) ) do + for i, img in ipairs( graph:render( plugin, inst, is_index ) ) do table.insert( images, graph:strippngpath( img ) ) + images[images[#images]] = inst end end @@ -183,6 +195,7 @@ function statistics_render() images = images, plugin = plugin, timespans = spans, - current_timespan = span + current_timespan = span, + is_index = is_index } ) end