applications/luci-statistics: add support for conntrack plugin

2 files changed, 11 insertions, 2 deletions

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	= {
 		{ },