X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-statistics%2Fluasrc%2Fcontroller%2Fluci_statistics%2Fluci_statistics.lua;h=869384c0a693a1fc87a6c8223c791d82d65e457a;hp=f16a655dcff50eaf204b76cd19fa11a3ca8444dd;hb=839dcdc01299869bc714990c19d8e244f18318b5;hpb=66a6492ae5aa9779af6d22eaddf0f5f253ed1189 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 f16a655dcf..869384c0a6 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -17,57 +17,77 @@ module("luci.controller.luci_statistics.luci_statistics", package.seeall) function index() - require("luci.fs") + require("nixio.fs") require("luci.util") - require("luci.i18n") require("luci.statistics.datatree") - -- load language file - luci.i18n.loadc("statistics") - - -- 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[5] or path[4] - if luci.fs.isfile( "/usr/lib/collectd/" .. file .. ".so" ) then + 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 + 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"), + nut = _("UPS"), + olsrd = _("OLSRd"), + ping = _("Ping"), + processes = _("Processes"), + rrdtool = _("RRDTool"), + tcpconns = _("TCP Connections"), + unixsock = _("UnixSock") + } -- our collectd menu local collectd_menu = { - output = { "rrdtool", "network", "unixsock", "csv" }, - system = { "exec", "email", "cpu", "df", "disk", "irq", "processes", "load" }, - network = { "interface", "netlink", "iptables", "tcpconns", "ping", "dns", "wireless" } + output = { "csv", "network", "rrdtool", "unixsock" }, + system = { "cpu", "df", "disk", "email", "exec", "irq", "load", "memory", "nut", "processes" }, + network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "tcpconns", "iwinfo" } } -- create toplevel menu nodes - entry({"admin", "statistics"}, call("statistics_index"), _i18n("statistics"), 80).i18n = "statistics" - entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _i18n("collectd"), 10) + local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80) + 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 - entry( + local e = entry( { "admin", "statistics", "collectd", section }, - call( "statistics_" .. section .. "plugins" ), - _i18n( section .. "plugins" ), - index * 10 + firstchild(), labels["s_"..section], index * 10 ) + e.index = true + for j, plugin in luci.util.vspairs( plugins ) do _entry( { "admin", "statistics", "collectd", section, plugin }, cbi("luci_statistics/" .. plugin ), - _i18n( plugin ), - j * 10 + labels[plugin], j * 10 ) end @@ -75,13 +95,16 @@ function index() end -- output views - local page = entry( { "admin", "statistics", "graph" }, call("statistics_index"), _i18n("graphs"), 80) - page.i18n = "statistics" + local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80) page.setuser = "nobody" page.setgroup = "nogroup" local vars = luci.http.formvalue(nil, true) local span = vars.timespan or nil + local host = vars.host or nil + + -- get rrd data tree + local tree = luci.statistics.datatree.Instance(host) for i, plugin in luci.util.vspairs( tree:plugins() ) do @@ -91,8 +114,8 @@ function index() -- plugin menu entry entry( { "admin", "statistics", "graph", plugin }, - call("statistics_render"), _i18n( plugin ), i - ).query = { timespan = span } + call("statistics_render"), labels[plugin], i + ).query = { timespan = span , host = host } -- if more then one instance is found then generate submenu if #instances > 1 then @@ -101,47 +124,12 @@ function index() entry( { "admin", "statistics", "graph", plugin, inst }, call("statistics_render"), inst, j - ).query = { timespan = span } + ).query = { timespan = span , host = host } end end 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") @@ -150,37 +138,58 @@ function statistics_render() local vars = luci.http.formvalue() local req = luci.dispatcher.context.request - local path = luci.dispatcher.context.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 graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ) ) + 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 host = vars.host or uci:get( "luci_statistics", "collectd", "Hostname" ) or luci.sys.hostname() + local opts = { host = vars.host } + local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ), opts ) + local hosts = graph.tree:host_instances() + + 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.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 + 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 @@ -188,6 +197,9 @@ function statistics_render() images = images, plugin = plugin, timespans = spans, - current_timespan = span + current_timespan = span, + hosts = hosts, + current_host = host, + is_index = is_index } ) end