From: Hannu Nyman Date: Tue, 18 Aug 2015 20:05:00 +0000 (+0300) Subject: statistics: fix conntrack regression caused by collectd 5.5.0 X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=ff9da6cb7657704b07ed35b4ffb17b9d2bece43d statistics: fix conntrack regression caused by collectd 5.5.0 Collectd 5.5.0 introduced new data to conntrack plugin: In addition to the number of tracked connections there is also the static max conntrack value and the calculated use percentage. Luci's conntrack plugin intrepretes "conntrack-max" as a new data instance and includes it in the graph in addition to the real "conntrack" number. Eliminate "max" from graph by specifying empty "" instance as data source. Signed-off-by: Hannu Nyman --- diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua index ee3d68fe1..fbc47731e 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua @@ -9,6 +9,10 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) vlabel = "Count", number_format = "%5.0lf", data = { + -- collectd 5.5+: specify "" to exclude "max" instance + instances = { + conntrack = { "" } + }, sources = { conntrack = { "value" } },