X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-statistics%2Froot%2Fetc%2Fconfig%2Fluci_statistics;h=4d26b933d99cdd7f42edd4243d855f5458d1876d;hb=a8024bc0da8a06c83a99dfe5478a7a2c5dc53742;hp=db5bb577e1cf342f6734d02e41dc0cf935a73ca6;hpb=1da3c32a73b384e77b5958ac601a232f462d888d;p=project%2Fluci.git

diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics
index db5bb577e..4d26b933d 100644
--- a/applications/luci-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-statistics/root/etc/config/luci_statistics
@@ -1,15 +1,21 @@
+config 'statistics' 'rrdtool'
+        option 'default_timespan' '1hour'
+        option 'image_width' '600'
+        option 'image_path' '/tmp/rrdimg'
+
 config 'statistics' 'collectd'
 	option 'BaseDir' '/var/run/collectd'
 	option 'Include' '/etc/collectd/conf.d'
 	option 'PIDFile' '/var/run/collectd.pid'
 	option 'PluginDir' '/usr/lib/collectd'
-	option 'TypesDB' '/usr/lib/collectd/types.db'
+	option 'TypesDB' '/usr/share/collectd/types.db'
 	option 'Interval' '30'
 	option 'ReadThreads' '2'
 
 config 'statistics' 'collectd_ping'
 	option 'enable' '0'
 	option 'TTL' '127'
+	option 'Interval' '30'
 	option 'Hosts' '127.0.0.1'
 
 config 'statistics' 'collectd_csv'
@@ -40,13 +46,7 @@ config 'statistics' 'collectd_email'
 	option 'SocketGroup' 'nogroup'
 
 config 'statistics' 'collectd_exec'
-	option 'enable' '1'
-
-config 'collectd_exec_input'
-	option 'cmdline' '/usr/bin/stat-input-olsr'
-
-config 'collectd_exec_notify'
-	option 'cmdline' '/usr/bin/stat-output-syslog'
+	option 'enable' '0'
 
 config 'statistics' 'collectd_interface'
 	option 'enable' '1'
@@ -58,14 +58,14 @@ config 'statistics' 'collectd_iptables'
 
 config 'collectd_iptables_match'
 	option 'table' 'nat'
-	option 'chain' 'luci_freifunk_postrouting'
+	option 'chain' 'luci_fw_postrouting'
 	option 'target' 'MASQUERADE'
 	option 'source' '192.168.1.0/24'
 	option 'outputif' 'br-ff'
 	option 'name' 'Verkehr LAN-Clients'
 
 config 'collectd_iptables_match'
-	option 'chain' 'luci_freifunk_postrouting'
+	option 'chain' 'luci_fw_postrouting'
 	option 'table' 'nat'
 	option 'target' 'MASQUERADE'
 	option 'source' '10.61.230.0/24'
@@ -76,6 +76,9 @@ config 'statistics' 'collectd_irq'
 	option 'enable' '0'
 	option 'Irqs' '2 3 4 7'
 
+config 'statistics' 'collectd_load'
+	option 'enable' '1'
+
 config 'statistics' 'collectd_logfile'
 	option 'enable' '0'
 	option 'LogLevel' 'notice'
@@ -83,7 +86,7 @@ config 'statistics' 'collectd_logfile'
 	option 'Timestamp' '1'
 
 config 'statistics' 'collectd_netlink'
-	option 'enable' '1'
+	option 'enable' '0'
 	option 'IgnoreSelected' '0'
 	option 'VerboseInterfaces' 'br-lan br-ff'
 	option 'QDiscs' 'br-lan br-ff'
@@ -91,31 +94,40 @@ config 'statistics' 'collectd_netlink'
 config 'statistics' 'collectd_network'
 	option 'enable' '0'
 
-config 'collectd_network_listen'
-	option 'host' '0.0.0.0'
-
-config 'collectd_network_server'
-	option 'host' '0.0.0.0'
-
 config 'statistics' 'collectd_processes'
 	option 'enable' '1'
+	option 'Processes' 'uhttpd dnsmasq dropbear'
 
 config 'statistics' 'collectd_tcpconns'
 	option 'enable' '1'
 	option 'ListeningPorts' '0'
-	option 'LocalPorts' '22 80 443'
+	option 'LocalPorts' '22 80'
 
 config 'statistics' 'collectd_unixsock'
 	option 'enable' '0'
 	option 'SocketFile' '/var/run/collectd/query.sock'
 	option 'SocketGroup' 'nogroup'
 
-config 'statistics' 'collectd_wireless'
+config 'statistics' 'collectd_cpu'
 	option 'enable' '1'
 
 config 'statistics' 'collectd_rrdtool'
 	option 'enable' '1'
 	option 'DataDir' '/tmp'
 	option 'RRARows' '100'
-	option 'RRASingle' '0'
-	option 'RRATimespans' '600 86400 604800 2678400'
+	option 'RRASingle' '1'
+	option 'RRATimespans' '1hour 1day 1week 1month 1year'
+
+config 'statistics' 'collectd_memory'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_conntrack'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_olsrd'
+	option 'enable' '1'
+	option 'Port' '2006'
+	option 'Host' '127.0.0.1'
+
+config 'statistics' 'collectd_iwinfo'
+	option 'enable' '1'