Merge pull request #444 from hnyman/fixconntrack

statistics: fix conntrack and ping regression caused by collectd changes

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 ee3d68f..fbc4773 100644 (file)
--- 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" }
                        },

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 1a72caf..347d756 100644 (file)
--- 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