Merge pull request #4358 from plm/remove-rrd-path-triple-escape

[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 a0b3fd2c1a47fee0147ddae4864ca5272cef574c..19e34e4bc6eae6652ce51117d3a52db7451b27b1 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
@@ -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
                ];
@@ -515,8 +515,9 @@ return baseclass.extend({
                        if (!gopts.rrasingle)
                                _args.push('GPRINT:%s_min:MIN:\tMin\\: %s'.format(source.sname, numfmt));
 
-                       /* always include AVERAGE */
-                       _args.push('GPRINT:%s_avg:AVERAGE:\tAvg\\: %s'.format(source.sname, numfmt));
+                       /* don't include AVERAGE if noavg option is set */
+                       if (!source.noavg)
+                               _args.push('GPRINT:%s_avg:AVERAGE:\tAvg\\: %s'.format(source.sname, numfmt));
 
                        /* don't include MAX if rrasingle is enabled */
                        if (!gopts.rrasingle)
@@ -605,6 +606,7 @@ return baseclass.extend({
                                                overlay: dopts.overlay || false,
                                                transform_rpn: dopts.transform_rpn || '0,+',
                                                noarea: dopts.noarea || false,
+                                               noavg: dopts.noavg || false,
                                                title: dopts.title || null,
                                                weight: dopts.weight || (dopts.negweight ? -+data_instances[j] : null) || (dopts.posweight ? +data_instances[j] : null) || null,
                                                ds: data_sources[k],