From 86ff4bd3a4a39674c51bd52576a0a87e803a7c53 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 23 Aug 2015 21:02:14 +0300 Subject: [PATCH 1/2] statistics: support rrdtool's alt_autoscale and alt_autoscale_max options Implement support for alternative scaling of the y-axis. By default, rrdtool will autoscale to 1,2,5,10,20,50,100,200,... etc., which is not always suitable (e.g. memory charts for device with 128 MB). Rrdtool 1.0.50 already supports alternative autoscaling that creates a tighter y-axis. Implement graph-level options in Luci statistics to support those boolean options as "alt_autoscale" and "alt_autoscale_max". info at http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html Signed-off-by: Hannu Nyman --- .../luci-app-statistics/luasrc/statistics/rrdtool.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua index 1f8f4ff88b..d8317a8177 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua @@ -457,6 +457,12 @@ 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 From 9a06498dbdf5f5878d2ce86a4b9ac8abc9173bdc Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 23 Aug 2015 21:12:56 +0300 Subject: [PATCH 2/2] statistics: memory plugin - improve graph by better scaling of y-axis Utilise alt_autoscale_max to make the memory chart y-axis to scale better for devices with e.g. 128 MB RAM. Also fix the axis min value to 0. Signed-off-by: Hannu Nyman --- .../luasrc/statistics/rrdtool/definitions/memory.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua index a1c65f56d7..53d559c599 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua @@ -17,6 +17,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) title = "%H: Memory usage", vlabel = "MB", number_format = "%5.1lf%s", + y_min = "0", + alt_autoscale_max = true, data = { instances = { memory = { "free", "buffered", "cached", "used" }