From: Hannu Nyman Date: Wed, 10 Nov 2021 20:27:43 +0000 (+0200) Subject: luci-app-statistics: adjust graph size fallback to defaults X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=5b3fa3cdc7530887898f5dc38d6dd15b88c66b5f;p=project%2Fluci.git luci-app-statistics: adjust graph size fallback to defaults 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 --- diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js index 19e34e4bc6..0e8414ff2f 100644 --- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js +++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js @@ -149,9 +149,9 @@ return baseclass.extend({ hostname = data[1]; this.opts.host = uci.get('luci_statistics', 'collectd', 'Hostname') || hostname; - this.opts.timespan = uci.get('luci_statistics', 'rrdtool', 'default_timespan') || 900; - this.opts.width = uci.get('luci_statistics', 'rrdtool', 'image_width') || 400; - this.opts.height = uci.get('luci_statistics', 'rrdtool', 'image_height') || 100; + this.opts.timespan = uci.get('luci_statistics', 'rrdtool', 'default_timespan') || 3600; + this.opts.width = uci.get('luci_statistics', 'rrdtool', 'image_width') || 600; + 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.rrasingle = (uci.get('luci_statistics', 'collectd_rrdtool', 'RRASingle') == '1'); this.opts.rramax = (uci.get('luci_statistics', 'collectd_rrdtool', 'RRAMax') == '1'); diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics index 581a1f5a2c..7ed2c5c190 100644 --- a/applications/luci-app-statistics/root/etc/config/luci_statistics +++ b/applications/luci-app-statistics/root/etc/config/luci_statistics @@ -12,6 +12,7 @@ config statistics 'collectd' config statistics 'rrdtool' option default_timespan '1hour' option image_width '600' + option image_height '150' option image_path '/tmp/rrdimg' # output plugins