Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / common / collectd

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 42fcbb1c7941fca0d6328d8c9f52a7a47e23badf..e29d0779e23b819e673468c282eda175c4a6bfb3 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,9 +1,15 @@
 etc/collectd.conf
+etc/collectd.custom
+etc/collectd.precache
+etc/collectd.thermal
 etc/rc.d/rc0.d/K50collectd
-etc/rc.d/rc3.d/S21collectd
+etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
 #usr/bin/collectd-nagios
 #usr/etc/collectd.conf
+#usr/include/collectd
+#usr/include/collectd/client.h
+#usr/include/collectd/lcc_features.h
 #usr/lib/collectd
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
@@ -13,10 +19,20 @@ usr/lib/collectd/apcups.so
 usr/lib/collectd/ascent.so
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
+#usr/lib/collectd/bind.la
+usr/lib/collectd/bind.so
+#usr/lib/collectd/conntrack.la
+usr/lib/collectd/conntrack.so
+#usr/lib/collectd/contextswitch.la
+usr/lib/collectd/contextswitch.so
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
+#usr/lib/collectd/curl.la
+usr/lib/collectd/curl.so
+#usr/lib/collectd/curl_xml.la
+usr/lib/collectd/curl_xml.so
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
 #usr/lib/collectd/disk.la
@@ -29,8 +45,10 @@ usr/lib/collectd/email.so
 usr/lib/collectd/entropy.so
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-usr/lib/collectd/filecount.la
+#usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
+#usr/lib/collectd/fscache.la
+usr/lib/collectd/fscache.so
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
 #usr/lib/collectd/interface.la
@@ -43,6 +61,18 @@ usr/lib/collectd/irq.so
 usr/lib/collectd/load.so
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
+#usr/lib/collectd/madwifi.la
+usr/lib/collectd/madwifi.so
+#usr/lib/collectd/match_empty_counter.la
+usr/lib/collectd/match_empty_counter.so
+#usr/lib/collectd/match_hashed.la
+usr/lib/collectd/match_hashed.so
+#usr/lib/collectd/match_regex.la
+usr/lib/collectd/match_regex.so
+#usr/lib/collectd/match_timediff.la
+usr/lib/collectd/match_timediff.so
+#usr/lib/collectd/match_value.la
+usr/lib/collectd/match_value.so
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
 #usr/lib/collectd/multimeter.la
@@ -53,12 +83,22 @@ usr/lib/collectd/network.so
 usr/lib/collectd/nfs.so
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
+#usr/lib/collectd/olsrd.la
+usr/lib/collectd/olsrd.so
+#usr/lib/collectd/openvpn.la
+usr/lib/collectd/openvpn.so
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
+#usr/lib/collectd/protocols.la
+usr/lib/collectd/protocols.so
+#usr/lib/collectd/python.la
+usr/lib/collectd/python.so
+#usr/lib/collectd/rrdcached.la
+usr/lib/collectd/rrdcached.so
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
 #usr/lib/collectd/sensors.la
@@ -67,17 +107,30 @@ usr/lib/collectd/sensors.so
 usr/lib/collectd/swap.so
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
+#usr/lib/collectd/table.la
+usr/lib/collectd/table.so
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
+#usr/lib/collectd/target_notification.la
+usr/lib/collectd/target_notification.so
+#usr/lib/collectd/target_replace.la
+usr/lib/collectd/target_replace.so
+#usr/lib/collectd/target_scale.la
+usr/lib/collectd/target_scale.so
+#usr/lib/collectd/target_set.la
+usr/lib/collectd/target_set.so
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-usr/lib/collectd/thermal.la
+#usr/lib/collectd/ted.la
+usr/lib/collectd/ted.so
+#usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-usr/lib/collectd/types.db
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
+#usr/lib/collectd/uptime.la
+usr/lib/collectd/uptime.so
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
 #usr/lib/collectd/uuid.la
@@ -86,24 +139,38 @@ usr/lib/collectd/uuid.so
 usr/lib/collectd/vmem.so
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
-#usr/lib/perl5/site_perl/5.8.8/Collectd
-#usr/lib/perl5/site_perl/5.8.8/Collectd.pm
-#usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
+#usr/lib/collectd/write_http.la
+usr/lib/collectd/write_http.so
+#usr/lib/libcollectdclient.la
+usr/lib/libcollectdclient.so
+usr/lib/libcollectdclient.so.0
+usr/lib/libcollectdclient.so.0.0.0
+#usr/lib/perl5/site_perl/5.12.3/Collectd
+#usr/lib/perl5/site_perl/5.12.3/Collectd.pm
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/Monitorus.pm
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/OpenVZ.pm
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Unixsock.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd/.packlist
+#usr/lib/pkgconfig/libcollectdclient.pc
 usr/sbin/collectd
 usr/sbin/collectdmon
-usr/share/collectd
-usr/share/collectd/postgresql_default.conf
+#usr/share/collectd
+#usr/share/collectd/postgresql_default.conf
+usr/share/collectd/types.db
 #usr/share/man/man1/collectd-nagios.1
 #usr/share/man/man1/collectd.1
 #usr/share/man/man1/collectdmon.1
 #usr/share/man/man3/Collectd::Unixsock.3
 #usr/share/man/man5/collectd-email.5
 #usr/share/man/man5/collectd-exec.5
+#usr/share/man/man5/collectd-java.5
 #usr/share/man/man5/collectd-perl.5
+#usr/share/man/man5/collectd-python.5
 #usr/share/man/man5/collectd-snmp.5
 #usr/share/man/man5/collectd-unixsock.5
 #usr/share/man/man5/collectd.conf.5
 #usr/share/man/man5/types.db.5
 #var/lib/collectd
+etc/rc.d/init.d/collectd