luci-app-statistics: Adjust UI defaults to match config file

Adjust the defaults shown in the LuCI user interface to match
the real default values in the default config file.

(If a plugin is disabled and config values get deleted from
the config file, user has been offered incorrect default
values from UI defaults when the plugin is later re-enabled.)

* dns: set br-lan as the interface
* email: socket in /var/run/collectd/ dir
* interface: set br-lan as the interface
* ping: TTL 127, interval 30
* rrdtool: 1hour as shortest period, 144 RRArows
* tcpconns: Do not monitor all, only 22 80
* unixsock: socket in /var/run/collectd/ dir

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js
index 8ff7052980214d2eddf8835a40b652294aa77a9c..1e130e0236897dbca1d30569c633716881fcfd7b 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js
@@ -16,6 +16,7 @@ return baseclass.extend({
                        _('When none selected, all interfaces will be monitored.'));
                o.multiple = true;
                o.noaliases = true;
+               o.default = 'br-lan';
                o.depends('enable', '1');
 
                o = s.option(form.DynamicList, 'IgnoreSources', _('Ignore source addresses'));

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js
index 51f8284e4823b56001457a1458100b3f4d81c953..1ab44f31ccda4f25bcee8c3462d9194eebdec4dc 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js
@@ -13,7 +13,7 @@ return baseclass.extend({
                o = s.option(form.Flag, 'enable', _('Enable this plugin'));
 
                o = s.option(form.Value, 'SocketFile', _('Socket file'));
-               o.default = '/var/run/collect-email.sock';
+               o.default = '/var/run/collectd/email.sock';
                o.depends('enable', '1');
 
                o = s.option(widgets.GroupSelect, 'SocketGroup', _('Socket group'));

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js
index cb4d680b21cc741f5c3bcf14e5f0c884215f8d28..6ea79a6275599e38d8375e6245614e8fc5ee0cb6 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js
@@ -15,6 +15,7 @@ return baseclass.extend({
                o = s.option(widgets.DeviceSelect, 'Interfaces', _('Monitor interfaces'));
                o.multiple = true;
                o.noaliases = true;
+               o.default = 'br-lan';
                o.depends('enable', '1');
 
                o = s.option(form.Flag, 'IgnoreSelected', _('Monitor all except specified'));

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js
index 33ef8e2b41e96044be3dfec8525d904564718a3f..47ce7fff5295c102a8a2b4a43aa935ecc26a623b 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js
@@ -24,12 +24,12 @@ return baseclass.extend({
                o.value('ipv6');
 
                o = s.option(form.Value, 'TTL', _('TTL for ping packets'));
-               o.default = '128';
+               o.default = '127';
                o.datatype = 'range(0, 255)';
                o.depends('enable', '1');
 
                o = s.option(form.Value, 'Interval', _('Interval for pings'), _('Seconds'));
-               o.default = '1.0';
+               o.default = '30';
                o.datatype = 'ufloat';
                o.depends('enable', '1');
        },

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js
index 4d0520471c4509752f6ce86b125642b7ebc34e57..d25c0f813951205f89fc9bc6b85180efb516b2ad 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js
@@ -36,7 +36,7 @@ return baseclass.extend({
                o.depends('RRASingle', '0');
 
                o = s.option(form.DynamicList, 'RRATimespans', _('Stored timespans'));
-               o.default = '10min 1day 1week 1month 1year';
+               o.default = '1hour 1day 1week 1month 1year';
                o.depends('enable', '1');
                o.validate = function(section_id, value) {
                        if (value == '')
@@ -49,7 +49,7 @@ return baseclass.extend({
                };
 
                o = s.option(form.Value, 'RRARows', _('Rows per RRA'));
-               o.placeholder = '1200';
+               o.default = '144';
                o.datatype = 'min(1)';
                o.depends('enable', '1');
 

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js
index 3bab72776bde30b588165ad15ed94c60681c7d23..84471ebb872d595dd224f00c354bf40d4bc820c1 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js
@@ -14,11 +14,12 @@ return baseclass.extend({
                o = s.option(form.Flag, 'ListeningPorts', _('Monitor all local listen ports'));
                o.depends('enable', '1');
                o.rmempty = false;
-               o.default = '1';
+               o.default = '0';
 
                o = s.option(form.DynamicList, 'LocalPorts', _('Monitor local ports'));
                o.optional = true;
                o.datatype = 'port';
+               o.default = '22 80';
                o.depends({ enable: '1', ListeningPorts: '0' });
 
                o = s.option(form.DynamicList, 'RemotePorts', _('Monitor remote ports'));

diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js
index 996cfda45c6a2db3699ed24f6607cd436aa05f92..88b0b2648572f59d1cbfe6b25f757ccd34a1d0c7 100644 (file)
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js
@@ -13,7 +13,7 @@ return baseclass.extend({
                o = s.option(form.Flag, 'enable', _('Enable this plugin'));
 
                o = s.option(form.Value, 'SocketFile', _('Socket path'));
-               o.default = '/var/run/collect-query.socket';
+               o.default = '/var/run/collectd/query.sock';
                o.depends('enable', '1');
 
                o = s.option(widgets.GroupSelect, 'SocketGroup', _('Socket group'), _('Change the ownership of the socket file to the specified group.'));