function index()
- require("luci.fs")
+ require("nixio.fs")
require("luci.util")
- require("luci.i18n")
require("luci.statistics.datatree")
- -- load language files
- luci.i18n.loadc("rrdtool")
- luci.i18n.loadc("statistics")
-
-- get rrd data tree
local tree = luci.statistics.datatree.Instance()
-- override entry(): check for existance <plugin>.so where <plugin> 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_<str> or fall back to <str>
- 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"),
+ 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", "processes" },
+ network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "tcpconns", "iwinfo" }
}
-- create toplevel menu nodes
- local st = entry({"admin", "statistics"}, call("statistics_index"), _i18n("statistics"), 80)
+ 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"), _i18n("collectd"), 10).subindex = 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
- ).index = true
+ 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 ),
- _i18n( plugin ),
- j * 10
+ labels[plugin], j * 10
)
end
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"
-- 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
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")
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.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
+ 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
images = images,
plugin = plugin,
timespans = spans,
- current_timespan = span
+ current_timespan = span,
+ is_index = is_index
} )
end
projects / project / luci.git / blobdiff