* luci/applications: statistics: pick up new rrdtool translations in controller and...
[project/luci.git] / applications / luci-statistics / luasrc / controller / luci_statistics / luci_statistics.lua
index 7fdedfbece37d4d7f992b4861c5c2c182a4e7c9f..53ce34ec3be7a05ec466ecd2a345059006e799a2 100644 (file)
-module("luci.controller.luci_statistics.luci_statistics", package.seeall)
+--[[
+
+Luci statistics - statistics controller module
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+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
 
-require("luci.fs")
-require("luci.i18n")
-require("luci.template")
+        http://www.apache.org/licenses/LICENSE-2.0
 
+$Id$
+
+]]--
+
+module("luci.controller.luci_statistics.luci_statistics", package.seeall)
 
 function index()
 
+       require("luci.fs")
+       require("luci.util")
        require("luci.i18n")
        require("luci.statistics.datatree")
 
-       -- load language file
-       luci.i18n.load("statistics.en") -- XXX: temporary / replace with loadc()
+       -- 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[4] or path[3]
+               local file = path[5] or path[4]
                if luci.fs.isfile( "/usr/lib/collectd/" .. file .. ".so" ) then
                        entry( path, ... )
                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_<str> or fall back to <str>
        function _i18n( str )
                return luci.i18n.translate( "stat_" .. str, str )
        end
 
+       -- 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" }
+       }
+
+       -- 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
 
-       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)
+               index = index + 1
+       end
 
-       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"
 
-       
-       -- public views
-       entry({"freifunk", "statistics"}, call("statistics_index"), "Statistiken", 80).i18n = "statistics"
+       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 )
 
                -- 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
+                       for j, inst in luci.util.vspairs(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
@@ -123,37 +143,34 @@ function statistics_networkplugins()
 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.formvalue()
+       local req   = luci.dispatcher.context.request
+       local path  = luci.dispatcher.context.dispatched.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 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
+        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
@@ -168,5 +185,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