Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-statistics: adjust graph size fallback to defaults

Browse source 
Adjust the fallback timespan and graph width to the current config
defaults. (The default width in /etc/config/luci_statistics has been
600 already since commit 7ab8b51bd in March 2010.)

Expose the graph height in the config file and
increase it from 100 to 150 to keep the original aspect ratio.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2021-11-10 22:27:43 +02:00
parent 1532873362
commit 5b3fa3cdc7
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js
View file

@ -149,9 +149,9 @@ return baseclass.extend({
hostname = data[1]; hostname = data[1];
this.opts.host = uci.get('luci_statistics', 'collectd', 'Hostname') || hostname; this.opts.host = uci.get('luci_statistics', 'collectd', 'Hostname') || hostname;
this.opts.timespan = uci.get('luci_statistics', 'rrdtool', 'default_timespan') || 900; this.opts.timespan = uci.get('luci_statistics', 'rrdtool', 'default_timespan') || 3600;
this.opts.width = uci.get('luci_statistics', 'rrdtool', 'image_width') || 400; this.opts.width = uci.get('luci_statistics', 'rrdtool', 'image_width') || 600;
this.opts.height = uci.get('luci_statistics', 'rrdtool', 'image_height') || 100; this.opts.height = uci.get('luci_statistics', 'rrdtool', 'image_height') || 150;
this.opts.rrdpath = (uci.get('luci_statistics', 'collectd_rrdtool', 'DataDir') || '/tmp/rrd').replace(/\/$/, ''); this.opts.rrdpath = (uci.get('luci_statistics', 'collectd_rrdtool', 'DataDir') || '/tmp/rrd').replace(/\/$/, '');
this.opts.rrasingle = (uci.get('luci_statistics', 'collectd_rrdtool', 'RRASingle') == '1'); this.opts.rrasingle = (uci.get('luci_statistics', 'collectd_rrdtool', 'RRASingle') == '1');
this.opts.rramax = (uci.get('luci_statistics', 'collectd_rrdtool', 'RRAMax') == '1'); this.opts.rramax = (uci.get('luci_statistics', 'collectd_rrdtool', 'RRAMax') == '1');

1
applications/luci-app-statistics/root/etc/config/luci_statistics
View file

@ -12,6 +12,7 @@ config statistics 'collectd'
config statistics 'rrdtool' config statistics 'rrdtool'
option default_timespan '1hour' option default_timespan '1hour'
option image_width '600' option image_width '600'
option image_height '150'
option image_path '/tmp/rrdimg' option image_path '/tmp/rrdimg'
# output plugins # output plugins