* luci-0.8: backport statistics fixes

diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 7ca8a5aa374f734bcf4f1c3c5e00136fbe710bf9..0aa66362bdd88348f59202221b34f5bcdcaace99 100644 (file)
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -50,8 +50,12 @@ function index()
        }
 
        -- 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)
+       local st = entry({"admin", "statistics"},             call("statistics_index"),        _i18n("statistics"), 80)
+       st.i18n = "statistics"
+       st.index = true
+       
+       entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _i18n("collectd"),   10).subindex = true
+       
 
        -- populate collectd plugin menu
        local index = 1
@@ -61,7 +65,7 @@ function index()
                        call( "statistics_" .. section .. "plugins" ),
                        _i18n( section .. "plugins" ),
                        index * 10
-               )
+               ).index = true
 
                for j, plugin in luci.util.vspairs( plugins ) do
                        _entry(

diff --git a/applications/luci-statistics/luasrc/i18n/statistics.de.lua b/applications/luci-statistics/luasrc/i18n/statistics.de.lua
index 11d94322e5c9ffc97753e02232602481d0781abb..1e2e1f1a2b541f5f4e5fcc202c6b4f51d09e0f61 100644 (file)
--- a/applications/luci-statistics/luasrc/i18n/statistics.de.lua
+++ b/applications/luci-statistics/luasrc/i18n/statistics.de.lua
@@ -22,6 +22,9 @@ stat_rrdtool = 'RRDTool'
 stat_network = 'Netzwerk'
 stat_csv = 'CSV Ausgabe'
 stat_load = 'Systemlast'
+stat_dns = 'DNS'
+stat_email = 'Email'
+stat_unixsock = 'UnixSock'
 lucistatistics = 'Statistiken'
 lucistatistics_collectd = 'Collectd Einstellungen'
 lucistatistics_collectd_desc = 'Collectd ist ein schlankes Dienstprogramm zum Sammeln von Systemdaten aus verschiedenen Quellen mittels diverser Plugins. Auf dieser Seite können generelle Einstellungen für den Collectd-Daemon vorgenommen werden.'
@@ -137,6 +140,7 @@ lucistatistics_collectdnetlink_classes = 'Shapingklassen überwachen'
 lucistatistics_collectdnetlink_classes_desc = 'Strg gedrückt halten um mehrere zu wählen'
 lucistatistics_collectdnetlink_filters = 'Filterklassen überwachen'
 lucistatistics_collectdnetlink_filters_desc = 'Strg gedrückt halten um mehrere zu wählen'
+lucistatistics_collectdnetlink_ignoreselected = 'Alle außer Ausgewählte überwachen'
 lucistatistics_collectdnetwork = 'Network Plugin Konfiguration'
 lucistatistics_collectdnetwork_desc = 'Das Network-Plugin ermöglicht die netzwerkgestützte Kommunikation zwischen verschiedenen Collectd-Instanzen. Collectd kann gleichzeitig im Server- und Client-Modus betrieben werden. Im Client-Modus werden lokal gesammelte Daten an einen Collectd-Server übermittelt, im Server-Modus empfängt die lokale Instanz Daten von anderen Installationen.'
 lucistatistics_collectdnetwork_enable = 'Plugin aktivieren'

diff --git a/applications/luci-statistics/luasrc/i18n/statistics.de.xml b/applications/luci-statistics/luasrc/i18n/statistics.de.xml
index 1dee01c650175d2671773fda606cec196ade18da..060bbc8ed2dfab437b53d2584036d797b9a57f7d 100644 (file)
--- a/applications/luci-statistics/luasrc/i18n/statistics.de.xml
+++ b/applications/luci-statistics/luasrc/i18n/statistics.de.xml
@@ -27,6 +27,9 @@
 <i18n:msg xml:id="stat_network">Netzwerk</i18n:msg>
 <i18n:msg xml:id="stat_csv">CSV Ausgabe</i18n:msg>
 <i18n:msg xml:id="stat_load">Systemlast</i18n:msg>
+<i18n:msg xml:id="stat_dns">DNS</i18n:msg>
+<i18n:msg xml:id="stat_email">Email</i18n:msg>
+<i18n:msg xml:id="stat_unixsock">UnixSock</i18n:msg>
 
 <i18n:msg xml:id="lucistatistics">Statistiken</i18n:msg>
 
@@ -168,6 +171,7 @@
 <i18n:msg xml:id="lucistatistics_collectdnetlink_classes_desc">Strg gedrückt halten um mehrere zu wählen</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdnetlink_filters">Filterklassen überwachen</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdnetlink_filters_desc">Strg gedrückt halten um mehrere zu wählen</i18n:msg>
+<i18n:msg xml:id="lucistatistics_collectdnetlink_ignoreselected">Alle außer Ausgewählte überwachen</i18n:msg>
 
 <i18n:msg xml:id="lucistatistics_collectdnetwork">Network Plugin Konfiguration</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdnetwork_desc">Das Network-Plugin ermöglicht die netzwerkgestützte Kommunikation zwischen verschiedenen Collectd-Instanzen. Collectd kann gleichzeitig im Server- und Client-Modus betrieben werden. Im Client-Modus werden lokal gesammelte Daten an einen Collectd-Server übermittelt, im Server-Modus empfängt die lokale Instanz Daten von anderen Installationen.</i18n:msg>

diff --git a/applications/luci-statistics/luasrc/i18n/statistics.en.lua b/applications/luci-statistics/luasrc/i18n/statistics.en.lua
index aecdba9f4ec170f82943cdd8d08723c022f17c52..c12b42007b7c980925e868e5ad17e5f747a97f17 100644 (file)
--- a/applications/luci-statistics/luasrc/i18n/statistics.en.lua
+++ b/applications/luci-statistics/luasrc/i18n/statistics.en.lua
@@ -22,6 +22,9 @@ stat_rrdtool = 'RRDTool'
 stat_network = 'Network'
 stat_csv = 'CSV Output'
 stat_load = 'System Load'
+stat_dns = 'DNS'
+stat_email = 'Email'
+stat_unixsock = 'UnixSock'
 lucistatistics = 'Statistics'
 lucistatistics_collectd = 'Collectd Settings'
 lucistatistics_collectd_desc = 'Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.'
@@ -65,7 +68,7 @@ lucistatistics_collectddns_enable = 'Enable this plugin'
 lucistatistics_collectddns_interfaces = 'Monitor interfaces'
 lucistatistics_collectddns_interfaces_desc = 'multiple separated by space'
 lucistatistics_collectddns_ignoresources = 'Ignore source addresses'
-lucistatistics_collectddns_ignoresources_desc = 'multiple separated by space'
+lucistatistics_collectddns_ignoresources_desc = 'hold Ctrl while clicking to select multiple interfaces'
 lucistatistics_collectdemail = 'E-Mail Plugin Configuration'
 lucistatistics_collectdemail_desc = 'The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.'
 lucistatistics_collectdemail_enable = 'Enable this plugin'
@@ -137,6 +140,7 @@ lucistatistics_collectdnetlink_classes = 'Shaping class monitoring'
 lucistatistics_collectdnetlink_classes_desc = 'hold Ctrl while clicking to select multiple interfaces'
 lucistatistics_collectdnetlink_filters = 'Filter class monitoring'
 lucistatistics_collectdnetlink_filters_desc = 'hold Ctrl while clicking to select multiple interfaces'
+lucistatistics_collectdnetlink_ignoreselected = 'Monitor all except selected ones'
 lucistatistics_collectdnetwork = 'Network Plugin Configuration'
 lucistatistics_collectdnetwork_desc = 'The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.'
 lucistatistics_collectdnetwork_enable = 'Enable this plugin'

diff --git a/applications/luci-statistics/luasrc/i18n/statistics.en.xml b/applications/luci-statistics/luasrc/i18n/statistics.en.xml
index 0f84ff8e62ad3da70c6849996cd1da9d761003d3..016e042c19b9faa6a4233c20ec5c140011ca6322 100644 (file)
--- a/applications/luci-statistics/luasrc/i18n/statistics.en.xml
+++ b/applications/luci-statistics/luasrc/i18n/statistics.en.xml
@@ -27,6 +27,9 @@
 <i18n:msg xml:id="stat_network">Network</i18n:msg>
 <i18n:msg xml:id="stat_csv">CSV Output</i18n:msg>
 <i18n:msg xml:id="stat_load">System Load</i18n:msg>
+<i18n:msg xml:id="stat_dns">DNS</i18n:msg>
+<i18n:msg xml:id="stat_email">Email</i18n:msg>
+<i18n:msg xml:id="stat_unixsock">UnixSock</i18n:msg>
 
 <i18n:msg xml:id="lucistatistics">Statistics</i18n:msg>
 
@@ -78,7 +81,7 @@
 <i18n:msg xml:id="lucistatistics_collectddns_interfaces">Monitor interfaces</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectddns_interfaces_desc">multiple separated by space</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectddns_ignoresources">Ignore source addresses</i18n:msg>
-<i18n:msg xml:id="lucistatistics_collectddns_ignoresources_desc">multiple separated by space</i18n:msg>
+<i18n:msg xml:id="lucistatistics_collectddns_ignoresources_desc">hold Ctrl while clicking to select multiple interfaces</i18n:msg>
 
 <i18n:msg xml:id="lucistatistics_collectdemail">E-Mail Plugin Configuration</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdemail_desc">The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.</i18n:msg>
@@ -167,6 +170,7 @@
 <i18n:msg xml:id="lucistatistics_collectdnetlink_classes_desc">hold Ctrl while clicking to select multiple interfaces</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdnetlink_filters">Filter class monitoring</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdnetlink_filters_desc">hold Ctrl while clicking to select multiple interfaces</i18n:msg>
+<i18n:msg xml:id="lucistatistics_collectdnetlink_ignoreselected">Monitor all except selected ones</i18n:msg>
 
 <i18n:msg xml:id="lucistatistics_collectdnetwork">Network Plugin Configuration</i18n:msg>
 <i18n:msg xml:id="lucistatistics_collectdnetwork_desc">The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.</i18n:msg>

diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
index be391a9c089f207e27e17a1cbbfacd781728d4f0..02fa4cb0b124dc834463f45b6d2c6fc822d49fbe 100644 (file)
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
+++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
@@ -26,13 +26,15 @@ enable = s:option( Flag, "enable" )
 enable.default = 0
 
 -- collectd_dns.interfaces (Interface)
-interfaces = s:option( ListValue, "Interfaces" )
+interfaces = s:option( MultiValue, "Interfaces" )
+interfaces.widget = "select"
+interfaces.size   = 5
 interfaces:depends( "enable", 1 )
 interfaces:value("any")
 for k, v in pairs(luci.sys.net.devices()) do
-       interfaces:value(v)
+        interfaces:value(v)
 end
-
+         
 -- collectd_dns.ignoresources (IgnoreSource)
 ignoresources = s:option( Value, "IgnoreSources" )
 ignoresources.default = "127.0.0.1"