luci-app-statistics: support graph menu entries without corresponding labels

[project/luci.git] / applications / luci-app-statistics / luasrc / controller / luci_statistics / luci_statistics.lua

diff --git a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 329341d..443f20b 100644 (file)
--- a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -20,16 +20,19 @@ function index()
 
        local labels = {
                s_output        = _("Output plugins"),
-               s_system        = _("System plugins"),
+               s_general       = _("General plugins"),
                s_network       = _("Network plugins"),
 
                conntrack       = _("Conntrack"),
+               contextswitch   = _("Context Switches"),
                cpu                     = _("Processor"),
+               cpufreq         = _("CPU Frequency"),
                csv                     = _("CSV Output"),
                df                      = _("Disk Space Usage"),
                disk            = _("Disk Usage"),
                dns                     = _("DNS"),
                email           = _("Email"),
+               entropy         = _("Entropy"),
                exec            = _("Exec"),
                interface       = _("Interfaces"),
                iptables        = _("Firewall"),
@@ -41,11 +44,14 @@ function index()
                network         = _("Network"),
                nut                     = _("UPS"),
                olsrd           = _("OLSRd"),
+               openvpn         = _("OpenVPN"),
                ping            = _("Ping"),
                processes       = _("Processes"),
                rrdtool         = _("RRDTool"),
+               sensors     = _("Sensors"),
                splash_leases = _("Splash Leases"),
                tcpconns        = _("TCP Connections"),
+               thermal =       _("Thermal"),
                unixsock        = _("UnixSock"),
                uptime          = _("Uptime")
        }
@@ -53,15 +59,19 @@ function index()
        -- our collectd menu
        local collectd_menu = {
                output  = { "csv", "network", "rrdtool", "unixsock" },
-               system  = { "cpu", "df", "disk", "email", "exec", "irq", "load", "memory", "nut", "processes", "uptime" },
-               network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "splash_leases", "tcpconns", "iwinfo" }
+               general = { "contextswitch", "cpu", "cpufreq", "df", "disk", "email",
+                       "entropy", "exec", "irq", "load", "memory",
+                       "nut", "processes", "sensors", "thermal", "uptime" },
+               network = { "conntrack", "dns", "interface", "iptables",
+                       "netlink", "olsrd", "openvpn", "ping",
+                       "splash_leases", "tcpconns", "iwinfo" }
        }
 
        -- create toplevel menu nodes
        local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80)
        st.index = true
 
-       entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true
+       entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Setup"), 20).subindex = true
 
 
        -- populate collectd plugin menu
@@ -78,7 +88,7 @@ function index()
                        _entry(
                                { "admin", "statistics", "collectd", section, plugin },
                                cbi("luci_statistics/" .. plugin ),
-                               labels[plugin], j * 10
+                               labels[plugin] or plugin, j * 10
                        )
                end
 
@@ -86,7 +96,7 @@ function index()
        end
 
        -- output views
-       local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80)
+       local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 10)
              page.setuser  = "nobody"
              page.setgroup = "nogroup"
 
@@ -150,7 +160,6 @@ function statistics_render()
                if png then
                        luci.http.prepare_content("image/png")
                        l12.pump.all(l12.source.file(png), luci.http.write)
-                       png:close()
                end
                return
        end
@@ -170,7 +179,7 @@ function statistics_render()
        if #instances == 0 then
                --instances = { graph.tree:plugin_instances( plugin )[1] }
                instances = graph.tree:plugin_instances( plugin )
-               is_index = true
+               is_index = (#instances > 1)
 
        -- index instance requested
        elseif instances[1] == "-" then