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

[project/luci.git] / applications / luci-app-statistics / htdocs / luci-static / resources / statistics / rrdtool.js

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 4c3c8da5cdedb453891420666af54e2406ed2166..0e8414ff2f5ce4825ce1022dbda5f71a7acd3ad3 100644 (file)
--- 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');
@@ -334,7 +334,7 @@ return baseclass.extend({
                var cmdline = [
                        'graph', '-', '-a', 'PNG',
                        '-s', 'NOW-%s'.format(timespan || this.opts.timespan),
-                       '-e', 'NOW-60',
+                       '-e', 'NOW-15',
                        '-w', width || this.opts.width,
                        '-h', height || this.opts.height
                ];
@@ -376,7 +376,7 @@ return baseclass.extend({
 
                function __def(source) {
                        var inst = source.sname,
-                           rrd  = source.rrd.replace(/[\\:]/g, '\\$&'),
+                           rrd  = source.rrd,
                            ds   = source.ds || 'value';
 
                        _args.push(