Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-statistics: add transform_rpn option to graphs, use it for nut battery life

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Jo-Philipp Wich 2012-12-14 13:27:43 +00:00
parent 1461a0dba1
commit ac472f9ebc
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-statistics/luasrc/statistics/rrdtool.lua
View file

@ -156,11 +156,14 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
if not ds or ds:len() == 0 then ds = "value" end if not ds or ds:len() == 0 then ds = "value" end
_tif( _args, "DEF:%s_avg=%s:%s:AVERAGE", inst, rrd, ds ) _tif( _args, "DEF:%s_avg_raw=%s:%s:AVERAGE", inst, rrd, ds )
_tif( _args, "CDEF:%s_avg=%s_avg_raw,%s", inst, inst, source.transform_rpn )
if not self.opts.rrasingle then if not self.opts.rrasingle then
_tif( _args, "DEF:%s_min=%s:%s:MIN", inst, rrd, ds ) _tif( _args, "DEF:%s_min_raw=%s:%s:MIN", inst, rrd, ds )
_tif( _args, "DEF:%s_max=%s:%s:MAX", inst, rrd, ds ) _tif( _args, "CDEF:%s_min=%s_min_raw,%s", inst, inst, source.transform_rpn )
_tif( _args, "DEF:%s_max_raw=%s:%s:MAX", inst, rrd, ds )
_tif( _args, "CDEF:%s_max=%s_max_raw,%s", inst, inst, source.transform_rpn )
end end
_tif( _args, "CDEF:%s_nnl=%s_avg,UN,0,%s_avg,IF", inst, inst, inst ) _tif( _args, "CDEF:%s_nnl=%s_avg,UN,0,%s_avg,IF", inst, inst, inst )
@ -403,6 +406,7 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
flip = dopts.flip or false, flip = dopts.flip or false,
total = dopts.total or false, total = dopts.total or false,
overlay = dopts.overlay or false, overlay = dopts.overlay or false,
transform_rpn = dopts.transform_rpn or "0,+",
noarea = dopts.noarea or false, noarea = dopts.noarea or false,
title = dopts.title or nil, title = dopts.title or nil,
ds = dsource, ds = dsource,

4
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
View file

@ -86,7 +86,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
local timeleft = { local timeleft = {
title = "%H: Time left on UPS \"%pi\"", title = "%H: Time left on UPS \"%pi\"",
vlabel = "Minutes", vlabel = "Minutes",
number_format = "%7lfm", number_format = "%.1lfm",
data = { data = {
sources = { sources = {
timeleft = { "timeleft" } timeleft = { "timeleft" }
@ -95,7 +95,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
timeleft = { "battery" } timeleft = { "battery" }
}, },
options = { options = {
timeleft_battery = { color = "0000ff", title = "Time left"} timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/" }
} }
} }
} }