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

Merge pull request #444 from hnyman/fixconntrack

Browse source 
statistics: fix conntrack and ping regression caused by collectd changes
This commit is contained in:
Jo-Philipp Wich 2015-08-19 10:08:42 +02:00
commit 8597b86ebf
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,10 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
vlabel = "Count", vlabel = "Count",
number_format = "%5.0lf", number_format = "%5.0lf",
data = { data = {
-- collectd 5.5+: specify "" to exclude "max" instance
instances = {
conntrack = { "" }
},
sources = { sources = {
conntrack = { "value" } conntrack = { "value" }
}, },

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

@ -9,7 +9,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
{ title = "%H: ICMP Round Trip Time", vlabel = "ms", { title = "%H: ICMP Round Trip Time", vlabel = "ms",
number_format = "%5.1lf ms", data = { number_format = "%5.1lf ms", data = {
sources = { ping = { "value" } }, sources = { ping = { "value" } },
options = { ping__ping = { noarea = true, title = "%di" } } options = { ping__value = { noarea = true, title = "%di" } }
} }, } },
-- Ping droprate -- Ping droprate