summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-08-19 10:08:42 +0200
committerJo-Philipp Wich <jow@openwrt.org>2015-08-19 10:08:42 +0200
commit8597b86ebfd23e9501508e8f36d717637e21c21d (patch)
tree27684422f69cad00426f8be353279b90b32d86ba /applications
parent2a77918b023f6afc754d008a952776da69f0f618 (diff)
parentb7b6ed740b0046bd55de72aef25ec1d26269a620 (diff)
Merge pull request #444 from hnyman/fixconntrack
statistics: fix conntrack and ping regression caused by collectd changes
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua4
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua2
2 files changed, 5 insertions, 1 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 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" }
},
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