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

Merge pull request #721 from kdarbyshirebryant/maxrrdtool

Browse source 
Graph the max value rather than avg if rrdsingle disabled
This commit is contained in:
Hannu Nyman 2016-05-12 10:24:42 +03:00
commit 0c09e4e23f
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
View file

@ -171,16 +171,29 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
-- is first source in stack or overlay source: source_stk = source_nnl -- is first source in stack or overlay source: source_stk = source_nnl
if not prev or source.overlay then if not prev or source.overlay then
if self.opts.rrasingle then
-- create cdef statement for cumulative stack (no NaNs) and also -- create cdef statement for cumulative stack (no NaNs) and also
-- for display (preserving NaN where no points should be displayed) -- for display (preserving NaN where no points should be displayed)
_tif( _args, "CDEF:%s_stk=%s_nnl", source.sname, source.sname ) _tif( _args, "CDEF:%s_stk=%s_nnl", source.sname, source.sname )
_tif( _args, "CDEF:%s_plot=%s_avg", source.sname, source.sname ) _tif( _args, "CDEF:%s_plot=%s_avg", source.sname, source.sname )
else
-- create cdef statement for cumulative stack (no NaNs) and also
-- for display (preserving NaN where no points should be displayed)
_tif( _args, "CDEF:%s_stk=%s_nnl", source.sname, source.sname )
_tif( _args, "CDEF:%s_plot=%s_max", source.sname, source.sname )
end
-- is subsequent source without overlay: source_stk = source_nnl + previous_stk -- is subsequent source without overlay: source_stk = source_nnl + previous_stk
else else
if self.opts.rrasingle then
-- create cdef statement -- create cdef statement
_tif( _args, "CDEF:%s_stk=%s_nnl,%s_stk,+", source.sname, source.sname, prev ) _tif( _args, "CDEF:%s_stk=%s_nnl,%s_stk,+", source.sname, source.sname, prev )
_tif( _args, "CDEF:%s_plot=%s_avg,%s_stk,+", source.sname, source.sname, prev ) _tif( _args, "CDEF:%s_plot=%s_avg,%s_stk,+", source.sname, source.sname, prev )
else
-- create cdef statement
_tif( _args, "CDEF:%s_stk=%s_nnl,%s_stk,+", source.sname, source.sname, prev )
_tif( _args, "CDEF:%s_plot=%s_max,%s_stk,+", source.sname, source.sname, prev )
end
end end
-- create multiply by minus one cdef if flip is enabled -- create multiply by minus one cdef if flip is enabled