diff options
Diffstat (limited to 'applications/luci-app-statistics/htdocs/luci-static/resources/view')
5 files changed, 30 insertions, 13 deletions
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js index a3189143eb..db24d18592 100644 --- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js +++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js @@ -182,7 +182,7 @@ return view.extend({ E('button', { 'class': 'cbi-button', 'click': function(ev) { location.href = 'collectd' } - }, [ _('Setup collectd') ]) + }, [ _('Set up collectd') ]) ]) ]); }, diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js index a4a8eb2761..864857faa3 100644 --- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js +++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js @@ -11,6 +11,11 @@ return baseclass.extend({ o = s.option(form.Flag, 'enable', _('Enable this plugin')); + o = s.option(form.Flag, 'HideFree', _('Hide free memory'), + _('Hiding the free memory item makes the graph to scale to actual memory usage, not to 100%.')); + o.default = '0'; + o.rmempty = false; + o = s.option(form.Flag, 'ValuesAbsolute', _('Absolute values'), _('When set to true, we request absolute values')); o.default = '1'; 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 e971e2c6c4..7e2704a2c3 100644 --- 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 @@ -16,6 +16,11 @@ return baseclass.extend({ o.default = '/tmp/rrd'; o.depends('enable', '1'); + o = s.option(form.Flag, 'backup', _('Backup RRD statistics'), + _('Backup and restore RRD statistics to/from non-volatile storage around shutdown, reboot, and/or sysupgrade')); + o.default = '0'; + o.depends('enable', '1'); + o = s.option(form.Value, 'StepSize', _('RRD step interval'), _('Seconds')); o.placeholder = '30'; o.datatype = 'uinteger'; diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js index 8424966d2d..a55be1f4f4 100644 --- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js +++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js @@ -8,6 +8,8 @@ var sensorTypes = [ /^(?:ain|in|vccp|vdd|vid|vin|volt|voltbatt|vrm)[0-9]*$/, 'voltage', /^(?:cpu_temp|remote_temp|temp)[0-9]*$/, 'temperature', /^(?:fan)[0-9]*$/, 'fanspeed', + /^(?:humidity)[0-9]*$/, 'humidity', + /^(?:curr)[0-9]*$/, 'current', /^(?:power)[0-9]*$/, 'power' ]; 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 84471ebb87..526b10f3c3 100644 --- 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 @@ -19,25 +19,30 @@ return baseclass.extend({ 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.default = '22'; + o.depends('enable', '1'); o = s.option(form.DynamicList, 'RemotePorts', _('Monitor remote ports')); o.optional = true; o.datatype = 'port'; - o.depends({ enable: '1', ListeningPorts: '0' }); + o.depends('enable', '1'); + + o = s.option(form.Flag, 'AllPortsSummary', _('Summary of all ports')); + o.rmempty = false; + o.depends('enable', '1'); }, configSummary: function(section) { var lports = L.toArray(section.LocalPorts), - rports = L.toArray(section.RemotePorts); - - if (section.ListeningPorts == '1') - return _('Monitoring local listen ports'); - else - return _('Monitoring %s and %s').format( - N_(lports.length, 'one local port', '%d local ports').format(lports.length), - N_(rports.length, 'one remote port', '%d remote ports').format(rports.length) - ); + rports = L.toArray(section.RemotePorts), + listen = section.ListeningPorts == '1', + summary = section.AllPortsSummary == '1'; + + return _('Monitoring %s and %s, %s %s').format( + N_(lports.length, 'one local', '%d local').format(lports.length), + N_(rports.length, 'one remote port', '%d remote ports').format(rports.length), + listen ? _('all local listening ports,') : '', + summary ? _('summary of all ports') : _('no summary') + ); } }); |