applications/luci-statistics: add support for conntrack plugin

4 files changed, 67 insertions, 2 deletions

diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
new file mode 100644
index 000000000..81e9c05a5
--- /dev/null
+++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
@@ -0,0 +1,21 @@
+--[[
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+	translate("Conntrack Plugin Configuration"),
+	translate("The conntrack plugin collects statistics about the number of tracked connections."))
+
+s = m:section( NamedSection, "collectd_conntrack", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
new file mode 100644
index 000000000..12a1101b7
--- /dev/null
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
@@ -0,0 +1,35 @@
+--[[
+
+Luci statistics - conntrack plugin diagram definition
+(c) 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.conntrack",package.seeall)
+
+function rrdargs( graph, host, plugin, plugin_instance, dtype )
+	return {
+		title = "%H: Conntrack entries",
+		vlabel = "Count",
+		number_format = "%5.0lf",
+		data = {
+			sources = {
+				conntrack = { "entropy" }
+			},
+			options = {
+				conntrack = { 
+					color = "0000ff",
+					title = "Tracked connections"
+				}
+			}
+		}
+	}
+end
diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics
index de94b3a6a..ea3f722a6 100644
--- a/applications/luci-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-statistics/root/etc/config/luci_statistics
@@ -131,3 +131,9 @@ config 'statistics' 'collectd_rrdtool'
 	option 'RRARows' '100'
 	option 'RRASingle' '1'
 	option 'RRATimespans' '1hour 1day 1week 1month 1year'
+
+config 'statistics' 'collectd_memory'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_conntrack'
+	option 'enable' '1'
diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
index 97c3628ab..8d43b8a0b 100755
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -192,7 +192,6 @@ function _list_expand( c, l, nopad )
 				k = n:gsub("(%w+)s", "%1")
 			end
 
-			
 			str = str .. _expand( c[n], k, nopad )
 		end
 	end
@@ -334,7 +333,11 @@ plugins = {
 		{ "Interfaces", "WatchAdds" }
 	},
 
-	memory = { },
+	memory = { 
+		{ },
+		{ },
+		{ }
+	},
 
 	netlink	= {
 		{ },