X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-statistics%2Fluasrc%2Fcontroller%2Fluci_statistics%2Fluci_statistics.lua;h=2f68071532381ccbd1c950ccc53832196bf7f725;hb=dd9606825da5d73883b8313f5af905ea1b2a4d7d;hp=f19d2cdb7fe6af7c0829f421a9c76f85785bc1c1;hpb=1da5feb9f720fd48a886aad09df91bd8cc9df4c8;p=project%2Fluci.git 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 f19d2cdb7..2f6807153 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -1,17 +1,28 @@ -module("luci.controller.luci_statistics.luci_statistics", package.seeall) +--[[ + +Luci statistics - statistics controller module +(c) 2008 Freifunk Leipzig / Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 -require("luci.fs") -require("luci.i18n") -require("luci.template") +$Id$ +]]-- + +module("luci.controller.luci_statistics.luci_statistics", package.seeall) function index() + require("luci.fs") require("luci.i18n") require("luci.statistics.datatree") -- load language file - luci.i18n.load("statistics.en") + luci.i18n.load("statistics.en") -- XXX: temporary / replace with loadc() -- get rrd data tree local tree = luci.statistics.datatree.Instance() @@ -24,47 +35,48 @@ function index() end end - -- override call(): call requested action function with supplied parameters - function _call( func, tree, plugin ) - return function() getfenv()[func]( tree, plugin ) 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"), "Statistiken", 80) - entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), "Collectd", 10) - - entry({"admin", "statistics", "output"}, call("statistics_outputplugins"), "Ausgabeplugins", 20) - _entry({"admin", "statistics", "output", "rrdtool"}, cbi("luci_statistics/rrdtool"), "RRDTool", 10) - _entry({"admin", "statistics", "output", "network"}, cbi("luci_statistics/network"), "Netzwerk", 20) - _entry({"admin", "statistics", "output", "unixsock"}, cbi("luci_statistics/unixsock"), "Unix Socket", 30) - _entry({"admin", "statistics", "output", "csv"}, cbi("luci_statistics/csv"), "CSV", 40) - - entry({"admin", "statistics", "system"}, call("statistics_systemplugins"), "Systemplugins", 30) - _entry({"admin", "statistics", "system", "exec"}, cbi("luci_statistics/exec"), "Exec", 10) - _entry({"admin", "statistics", "system", "email"}, cbi("luci_statistics/email"), "E-Mail", 20) - _entry({"admin", "statistics", "system", "cpu"}, cbi("luci_statistics/cpu"), "Prozessor", 30) - _entry({"admin", "statistics", "system", "df"}, cbi("luci_statistics/df"), "Speicherplatz", 40) - _entry({"admin", "statistics", "system", "disk"}, cbi("luci_statistics/disk"), "Datenträger", 50) - _entry({"admin", "statistics", "system", "irq"}, cbi("luci_statistics/irq"), "Interrupts", 60) - _entry({"admin", "statistics", "system", "processes"}, cbi("luci_statistics/processes"), "Prozesse", 70) - - entry({"admin", "statistics", "network"}, call("statistics_networkplugins"), "Netzwerkplugins", 40) - _entry({"admin", "statistics", "network", "interface"}, cbi("luci_statistics/interface"), "Schnittstellen", 10) - _entry({"admin", "statistics", "network", "netlink"}, cbi("luci_statistics/netlink"), "Netlink", 20) - _entry({"admin", "statistics", "network", "iptables"}, cbi("luci_statistics/iptables"), "Firewall", 30) - _entry({"admin", "statistics", "network", "tcpconns"}, cbi("luci_statistics/tcpconns"), "Verbindungen", 40) - _entry({"admin", "statistics", "network", "ping"}, cbi("luci_statistics/ping"), "Ping", 50) - _entry({"admin", "statistics", "network", "dns"}, cbi("luci_statistics/dns"), "DNS", 60) - _entry({"admin", "statistics", "network", "wireless"}, cbi("luci_statistics/wireless"), "Drahtlos", 70) - - - -- public views - entry({"freifunk", "statistics"}, call("statistics_index"), "Statistiken", 80).i18n = "statistics" + 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) + + + -- output views + local page = entry( { "admin", "statistics", "graph" }, call("statistics_index"), _i18n("graphs"), 80) + page.i18n = "statistics" + page.setuser = "nobody" + page.setgroup = "nogroup" + + local vars = luci.http.formvalues() + local span = vars.timespan or nil for i, plugin in ipairs( tree:plugins() ) do @@ -72,94 +84,87 @@ function index() local instances = tree:plugin_instances( plugin ) -- plugin menu entry - _entry( { "freifunk", "statistics", plugin }, call("statistics_render"), _i18n( plugin ), i ) + entry( + { "admin", "statistics", "graph", plugin }, + call("statistics_render"), _i18n( 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 -- instance menu entry entry( - { "freifunk", "statistics", plugin, inst }, + { "admin", "statistics", "graph", plugin, inst }, call("statistics_render"), inst, j - ) + ).query = { timespan = span } end - end + end end end - function statistics_index() luci.template.render("admin_statistics/index") end function statistics_outputplugins() - plugins = { - rrdtool="RRDTool", - network="Netzwerk", - unixsock="Unix Socket", - csv="CSV" - } + 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() - plugins = { - exec="Exec", - email="E-Mail", - disk="Datenträger", - irq="Interrupts", - processes="Prozesse" - } + 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() - plugins = { - interface="Schnittstellen", - netlink="Netlink", - iptables="Firewall", - tcpconns="Verbindungen", - ping="Ping", - dns="DNS" - } + 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( tree ) +function statistics_render() require("luci.statistics.rrdtool") require("luci.template") - - local req = luci.dispatcher.request - local graph = luci.statistics.rrdtool.Graph() - - local plugin = req[3] - local instances = { req[4] } - local images = { } + 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 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] } + end + end -- no instance requested, find all instances if #instances == 0 then - - instances = graph.tree:plugin_instances( plugin ) - - -- more than one available instance - if #instances > 1 then - - -- redirect to first instance and return - local r = luci.dispatcher.request - local i = instances[1] - if i:len() == 0 then i = "-" end - - luci.http.redirect( luci.dispatcher.build_url( - req[1], req[2], req[3], i - ) ) - - return - end + instances = { graph.tree:plugin_instances( plugin )[1] } -- index instance requested elseif instances[1] == "-" then @@ -174,5 +179,10 @@ function statistics_render( tree ) end end - luci.template.render("public_statistics/graph", { images=images, plugin=plugin } ) + luci.template.render( "public_statistics/graph", { + images = images, + plugin = plugin, + timespans = spans, + current_timespan = span + } ) end