modules/admin-full: implement load graph

[project/luci.git] / modules / admin-full / luasrc / controller / admin / status.lua

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index d8fa9e9..44acab4 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -14,16 +14,22 @@ $Id$
 module("luci.controller.admin.status", package.seeall)
 
 function index()
-       luci.i18n.loadc("admin-core")
+       luci.i18n.loadc("base")
        local i18n = luci.i18n.translate
 
-       entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20).index = true
-       entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("interfaces", "Interfaces"), 1)
-       entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("a_s_ipt", "Firewall"), 2)
-       entry({"admin", "status", "conntrack"}, form("admin_status/conntrack"), i18n("a_n_conntrack"), 3)
-       entry({"admin", "status", "routes"}, form("admin_status/routes"), i18n("a_n_routes"), 4)
-       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 5)
-       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 6)
+       entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true
+       entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("Interfaces"), 1)
+       entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2)
+       entry({"admin", "status", "conntrack"}, template("admin_status/conntrack"), i18n("Active Connections"), 3)
+       entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 4)
+       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 5)
+       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 6)
+
+       entry({"admin", "status", "load"}, template("admin_status/load"), i18n("Realtime Load"), 7).leaf = true
+       entry({"admin", "status", "load_status"}, call("action_load")).leaf = true
+
+       entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 8).leaf = true
+       entry({"admin", "status", "bandwidth_status"}, call("action_bandwidth")).leaf = true
 
 end
 
@@ -52,3 +58,56 @@ function action_iptables()
                luci.template.render("admin_status/iptables")
        end
 end
+
+function action_bandwidth()
+       local path  = luci.dispatcher.context.requestpath
+       local iface = path[#path]
+
+       local fs = require "luci.fs"
+       if fs.access("/var/lib/luci-bwc/if/%s" % iface) then
+               luci.http.prepare_content("application/json")
+
+               local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
+               if bwc then
+                       luci.http.write("[")
+
+                       while true do
+                               local ln = bwc:read("*l")
+                               if not ln then break end
+                               luci.http.write(ln)
+                       end
+
+                       luci.http.write("]")
+                       bwc:close()
+               end
+
+               return
+       end
+
+       luci.http.status(404, "No data available")
+end
+
+function action_load()
+       local fs = require "luci.fs"
+       if fs.access("/var/lib/luci-bwc/load") then
+               luci.http.prepare_content("application/json")
+
+               local bwc = io.popen("luci-bwc -l 2>/dev/null")
+               if bwc then
+                       luci.http.write("[")
+
+                       while true do
+                               local ln = bwc:read("*l")
+                               if not ln then break end
+                               luci.http.write(ln)
+                       end
+
+                       luci.http.write("]")
+                       bwc:close()
+               end
+
+               return
+       end
+
+       luci.http.status(404, "No data available")
+end