From ff9da6cb7657704b07ed35b4ffb17b9d2bece43d Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Tue, 18 Aug 2015 23:05:00 +0300 Subject: 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 --- .../luasrc/statistics/rrdtool/definitions/conntrack.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'applications/luci-app-statistics/luasrc/statistics/rrdtool') 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 ee3d68fe16..fbc47731ef 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" } }, -- cgit v1.2.3 From b7b6ed740b0046bd55de72aef25ec1d26269a620 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Wed, 19 Aug 2015 10:56:30 +0300 Subject: statistics: fix ping graph label regression Earlier update to collectd 5.4.1 changed the field from "ping" to "value", which was changed in the graph definition here, but the label definition was forgotten. Field's label now reads "ping_IPaddr_value". Correct the label definition to show only IPaddr like the other two graphs. Signed-off-by: Hannu Nyman --- .../luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'applications/luci-app-statistics/luasrc/statistics/rrdtool') diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua index 1a72caf227..347d756f7c 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua @@ -9,7 +9,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) { title = "%H: ICMP Round Trip Time", vlabel = "ms", number_format = "%5.1lf ms", data = { sources = { ping = { "value" } }, - options = { ping__ping = { noarea = true, title = "%di" } } + options = { ping__value = { noarea = true, title = "%di" } } } }, -- Ping droprate -- cgit v1.2.3