applications/luci-statistics: remove the 10min rra from default config, saves some...

[project/luci.git] / applications / luci-statistics / root / etc / config / luci_statistics

diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics
index 9636c57f88b746bdc0068f76d9fe3427516e21b8..de94b3a6a2e17fd8974d336584fa9be95b8c5aa1 100644 (file)
--- 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' '/etc/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'
@@ -58,14 +64,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 +82,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 +92,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'
@@ -103,7 +112,7 @@ config 'statistics' 'collectd_processes'
 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'
@@ -113,9 +122,12 @@ config 'statistics' 'collectd_unixsock'
 config 'statistics' 'collectd_wireless'
        option 'enable' '1'
 
+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'