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=04cdd7ce2663af8c16860303501ec20d94d0dffd;hp=df262a11541d1872302cac7fb3af793c76110315;hb=52673c157bb30700ede902fd92daa152d423209e;hpb=d35a620e9f5665a94967f4bd02c93581a1dd7e00 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 df262a115..04cdd7ce2 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -1,107 +1,193 @@ +--[[ + +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 + +$Id$ + +]]-- + module("luci.controller.luci_statistics.luci_statistics", package.seeall) -local fs = require("luci.fs") -local tpl = require("luci.template") -local rrd = require("luci.statistics.rrdtool") -local data = require("luci.statistics.datatree").Instance() +function index() + + require("luci.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() -function _entry( path, ... ) - local file = path[4] or path[3] - if fs.isfile( "/usr/lib/collectd/" .. file .. ".so" ) then - entry( path, ... ) + -- 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 + entry( path, ... ) + end end -end + -- override i18n(): try to translate stat_ or fall back to + function _i18n( str ) + return luci.i18n.translate( "stat_" .. str, str ) + end -function index() - entry({"admin", "statistics"}, statistics_index, "Statistiken", 80) - entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), "Collectd", 10) - - entry({"admin", "statistics", "output"}, 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"}, 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"}, 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) - - - -- public views - entry({"freifunk", "statistics"}, statistics_index, "Statistiken", 80) - - for i, plugin in ipairs( data:plugins() ) do - _entry({"freifunk", "statistics", plugin}, statistics_render, plugin, i) + -- our collectd menu + local collectd_menu = { + output = { "rrdtool", "network", "unixsock", "csv" }, + system = { "exec", "email", "cpu", "df", "disk", "irq", "processes" }, + network = { "interface", "netlink", "iptables", "tcpconns", "ping", "dns", "wireless" } + } + + -- 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) + + -- populate collectd plugin menu + local index = 1 + for section, plugins in luci.util.kspairs( collectd_menu ) do + entry( + { "admin", "statistics", "collectd", section }, + call( "statistics_" .. section .. "plugins" ), + _i18n( section .. "plugins" ), + index * 10 + ) + + for j, plugin in luci.util.vspairs( plugins ) do + _entry( + { "admin", "statistics", "collectd", section, plugin }, + cbi("luci_statistics/" .. plugin ), + _i18n( plugin ), + j * 10 + ) + end + + index = index + 1 end -end + -- 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 luci.util.vspairs( tree:plugins() ) do + + -- get plugin instances + local instances = tree:plugin_instances( plugin ) + + -- plugin menu entry + 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 luci.util.vspairs(instances) do + -- instance menu entry + entry( + { "admin", "statistics", "graph", plugin, inst }, + call("statistics_render"), inst, j + ).query = { timespan = span } + end + end + end +end function statistics_index() - tpl.render("admin_statistics/index") + luci.template.render("admin_statistics/index") end function statistics_outputplugins() - plugins = { - rrdtool="RRDTool", - network="Netzwerk", - unixsock="Unix Socket", - csv="CSV" - } + local plugins = { } - tpl.render("admin_statistics/outputplugins", {plugins=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 - tpl.render("admin_statistics/systemplugins", {plugins=plugins}) + 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 - tpl.render("admin_statistics/networkplugins", {plugins=plugins}) + luci.template.render("admin_statistics/networkplugins", {plugins=plugins}) end function statistics_render() - local plugin = luci.dispatcher.request[3] + + 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 + 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 = { } - for i, inst in ipairs( data:plugin_instances( plugin ) ) do - local graph = rrd.Graph() - for i, img in ipairs( graph:render( "OpenWrt", plugin, inst ) ) do - table.insert( images, img ) + -- 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 )[1] } + + -- index instance requested + elseif instances[1] == "-" then + instances[1] = "" + end + + + -- render graphs + for i, inst in ipairs( instances ) do + for i, img in ipairs( graph:render( plugin, inst ) ) do + table.insert( images, graph:strippngpath( img ) ) end end - tpl.render("public_statistics/graph", { images=images, plugin=plugin } ) + luci.template.render( "public_statistics/graph", { + images = images, + plugin = plugin, + timespans = spans, + current_timespan = span + } ) end