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

Merge pull request #455 from hnyman/backport-stats

Browse source 
for-15.05: statistics: Backport recent improvements
This commit is contained in:
hnyman 2015-08-29 15:48:31 +03:00
commit 8d2b5702ec
4 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -457,6 +457,12 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
_ti ( _args, "-X" ) _ti ( _args, "-X" )
_ti ( _args, opts.units_exponent ) _ti ( _args, opts.units_exponent )
end end
if opts.alt_autoscale then
_ti ( _args, "-A" )
end
if opts.alt_autoscale_max then
_ti ( _args, "-M" )
end
-- store additional rrd options -- store additional rrd options
if opts.rrdopts then if opts.rrdopts then

19
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
View file

@ -8,22 +8,23 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
title = "%H: Processor usage on core #%pi", title = "%H: Processor usage on core #%pi",
y_min = "0", y_min = "0",
alt_autoscale_max = true,
vlabel = "Percent", vlabel = "Percent",
number_format = "%5.1lf%%", number_format = "%5.1lf%%",
data = { data = {
instances = { instances = {
cpu = { "idle", "user", "system", "nice" } cpu = { "user", "nice", "system", "softirq", "interrupt" }
}, },
options = { options = {
cpu_idle = { color = "ffffff" }, cpu_idle = { color = "ffffff", title = "Idle" },
cpu_nice = { color = "00e000" }, cpu_nice = { color = "00e000", title = "Nice" },
cpu_user = { color = "0000ff" }, cpu_user = { color = "0000ff", title = "User" },
cpu_wait = { color = "ffb000" }, cpu_wait = { color = "ffb000", title = "Wait" },
cpu_system = { color = "ff0000" }, cpu_system = { color = "ff0000", title = "System" },
cpu_softirq = { color = "ff00ff" }, cpu_softirq = { color = "ff00ff", title = "Softirq" },
cpu_interrupt = { color = "a000a0" }, cpu_interrupt = { color = "a000a0", title = "Interrupt" },
cpu_steal = { color = "000000" } cpu_steal = { color = "000000", title = "Steal" }
} }
} }
} }

2
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
View file

@ -17,6 +17,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
title = "%H: Memory usage", title = "%H: Memory usage",
vlabel = "MB", vlabel = "MB",
number_format = "%5.1lf%s", number_format = "%5.1lf%s",
y_min = "0",
alt_autoscale_max = true,
data = { data = {
instances = { instances = {
memory = { "free", "buffered", "cached", "used" } memory = { "free", "buffered", "cached", "used" }

7
applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
View file

@ -8,7 +8,10 @@
<h2><a id="content" name="content"><%:Statistics%></a></h2> <h2><a id="content" name="content"><%:Statistics%></a></h2>
<p><%_The statistics package is based on <a href="http://collectd.org/index.shtml">Collectd</a> <p><%_The statistics package uses <a href="https://collectd.org/">Collectd</a>
and uses <a href="http://oss.oetiker.ch/rrdtool/">RRD Tool</a> to render diagram images from collected data.%></p> to gather data and <a href="http://oss.oetiker.ch/rrdtool/">RRDtool</a> to
render diagram images.%></p>
<p><%_You can install additional collectd-mod-* plugins to enable more statistics.%></p>
<%+footer%> <%+footer%>