modules/admin-full: fix index page (#213)

[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 d283627..956bd47 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,17 +18,21 @@ function index()
        luci.i18n.loadc("base")
        local i18n = luci.i18n.translate
 
-       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"}, alias("admin", "status", "overview"), i18n("Status"), 20).index = true
+       entry({"admin", "status", "overview"}, template("admin_status/index"), i18n("Overview"), 1)
+       entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2).leaf = true
+       entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 3)
+       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 4)
+       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 5)
+
+       entry({"admin", "status", "load"}, template("admin_status/load"), i18n("Realtime Load"), 6).leaf = true
+       entry({"admin", "status", "load_status"}, call("action_load")).leaf = true
 
        entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 7).leaf = true
        entry({"admin", "status", "bandwidth_status"}, call("action_bandwidth")).leaf = true
 
+       entry({"admin", "status", "connections"}, template("admin_status/connections"), i18n("Realtime Connections"), 8).leaf = true
+       entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true
 end
 
 function action_syslog()
@@ -41,8 +46,12 @@ function action_dmesg()
 end
 
 function action_iptables()
-       if luci.http.formvalue("zero") == "1" then
-               luci.util.exec("iptables -Z")
+       if luci.http.formvalue("zero") then
+               if luci.http.formvalue("zero") == "6" then
+                       luci.util.exec("ip6tables -Z")
+               else
+                       luci.util.exec("iptables -Z")
+               end
                luci.http.redirect(
                        luci.dispatcher.build_url("admin", "status", "iptables")
                )
@@ -61,10 +70,10 @@ function action_bandwidth()
        local iface = path[#path]
 
        local fs = require "luci.fs"
-       if fs.access("/var/lib/luci-bwc/%s" % iface) then
+       if fs.access("/var/lib/luci-bwc/if/%s" % iface) then
                luci.http.prepare_content("application/json")
 
-               local bwc = io.popen("luci-bwc -p %q 2>/dev/null" % iface)
+               local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
                if bwc then
                        luci.http.write("[")
 
@@ -81,5 +90,58 @@ function action_bandwidth()
                return
        end
 
-       luci.http.status(404, "No such interface")
+       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
+
+function action_connections()
+       local fs  = require "luci.fs"
+       local sys = require "luci.sys"
+
+       luci.http.prepare_content("application/json")
+
+       luci.http.write("{ connections: ")
+       luci.http.write_json(sys.net.conntrack())
+
+       if fs.access("/var/lib/luci-bwc/connections") then
+               local bwc = io.popen("luci-bwc -c 2>/dev/null")
+               if bwc then
+                       luci.http.write(", statistics: [")
+
+                       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
+       end
+
+       luci.http.write(" }")
 end