applications/luci-statistics: Add ping interval option, closes #136

diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
index 56d6a93d023d49fa45330bd44a3ed0ea169299fb..c55ac87368900c65f31d391492a9a69c8e645da1 100644 (file)
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
+++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
@@ -28,7 +28,7 @@ enable = s:option( Flag, "enable", translate("Enable this plugin") )
 enable.default = 0
 
 -- collectd_ping.hosts (Host)
-hosts = s:option( Value, "Hosts", translate("Monitor hosts") )
+hosts = s:option( Value, "Hosts", translate("Monitor hosts"), translate ("Add multiple hosts separated by space."))
 hosts.default = "127.0.0.1"
 hosts:depends( "enable", 1 )
 
@@ -38,4 +38,10 @@ ttl.isinteger = true
 ttl.default   = 128
 ttl:depends( "enable", 1 )
 
+-- collectd_ping.interval (Interval)
+interval = s:option( Value, "Interval", translate("Interval for pings"), translate ("Seconds") )
+interval.isinteger = true
+interval.default   = 30
+interval:depends( "enable", 1 )
+
 return m

diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics
index fe3a1cba94c9e5792d80c8dab9b2f63248e971bc..ea0ae6d89ebdea3fee62e66bb420573c78f0170b 100644 (file)
--- a/applications/luci-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-statistics/root/etc/config/luci_statistics
@@ -15,6 +15,7 @@ config 'statistics' 'collectd'
 config 'statistics' 'collectd_ping'
        option 'enable' '0'
        option 'TTL' '127'
+       option 'Interval' '30'
        option 'Hosts' '127.0.0.1'
 
 config 'statistics' 'collectd_csv'

diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
index 8bd6262ef6504e9b40dae3abea047b679fae837f..4c396ff057c2f22f3f85535b59aa1100191fffd9 100755 (executable)
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -330,7 +330,7 @@ plugins = {
        network = config_network,
 
        ping    = {
-               { "TTL" },
+               { "TTL", "Interval" },
                { },
                { "Hosts" }
        },

diff --git a/po/de/statistics.po b/po/de/statistics.po
index e737d3895ab51c2a9bfb0a0a7d247f3aa548b06e..4e67e82eff1df95e1d1fec92dadb5c69c8d6007b 100644 (file)
--- a/po/de/statistics.po
+++ b/po/de/statistics.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 17:57+0200\n"
-"PO-Revision-Date: 2009-05-21 19:32+0200\n"
-"Last-Translator: Jo-Philipp Wich <xm@subsignal.org>\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2010-11-18 19:06+0100\n"
+"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,6 +63,10 @@ msgstr "Prozessor"
 msgid "Ping"
 msgstr "Ping"
 
+#. Interval of pings
+msgid "Interval for pings"
+msgstr "Intervall zwischen den Pings"
+
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
 msgid "Firewall"

diff --git a/po/templates/statistics.pot b/po/templates/statistics.pot
index 2cbe6994deb218f66dab93d606d468851f330da3..df448bd9995d932b78bb344171e229e2276e3e37 100644 (file)
--- a/po/templates/statistics.pot
+++ b/po/templates/statistics.pot
@@ -51,6 +51,10 @@ msgstr ""
 msgid "Ping"
 msgstr ""
 
+#. Interval of pings
+msgid "Interval for pings"
+msgstr ""
+
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
 msgid "Firewall"