summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2015-08-18 23:05:00 +0300
committerHannu Nyman <hannu.nyman@iki.fi>2015-08-18 23:05:00 +0300
commitff9da6cb7657704b07ed35b4ffb17b9d2bece43d (patch)
tree4e9979547e5403d5d4ab94980cd1074794531daf
parent2a77918b023f6afc754d008a952776da69f0f618 (diff)
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 <hannu.nyman@iki.fi>
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua4
1 files changed, 4 insertions, 0 deletions
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" }
},