X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-statistics%2Fluasrc%2Fstatistics%2Frrdtool.lua;h=5d4ad9859d0a1e39691fc80935f34a5b86df55e3;hp=8d3482c161a4db67dce8d71cd59169bf2db8ee2f;hb=8023fb9c433d01db99dc19668f892b4d4269eadb;hpb=7a3493b1f7d75a3945279115324cf2ff4da26b7b

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
index 8d3482c16..5d4ad9859 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
@@ -1,4 +1,4 @@
--- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+-- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
 -- Licensed to the public under the Apache License 2.0.
 
 module("luci.statistics.rrdtool", package.seeall)
@@ -397,6 +397,7 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
 					transform_rpn = dopts.transform_rpn or "0,+",
 					noarea   = dopts.noarea  or false,
 					title    = dopts.title   or nil,
+					weight   = dopts.weight  or nil,
 					ds       = dsource,
 					type     = dtype,
 					instance = dinst,
@@ -457,12 +458,24 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
 			_ti ( _args, "-X" )
 			_ti ( _args, opts.units_exponent )
 		end
+		if opts.alt_autoscale then
+			_ti ( _args, "-A" )
+		end
+		if opts.alt_autoscale_max then
+			_ti ( _args, "-M" )
+		end
 
 		-- store additional rrd options
 		if opts.rrdopts then
 			for i, o in ipairs(opts.rrdopts) do _ti( _args, o ) end
 		end
 
+		-- sort sources
+		table.sort(_sources, function(a, b)
+			local x = a.weight or a.index or 0
+			local y = b.weight or b.index or 0
+			return x < y
+		end)
 
 		-- create DEF statements for each instance
 		for i, source in ipairs(_sources) do