Updated collectd (4.9.1).

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index a148b084a321ccad7c8cd966092b7ed27c8a9b56..2f86f0795d10d5a637db2ffd2b38cdf409addfac 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,7 +8,7 @@ Hostname    "localhost"
 BaseDir     "/var/log/rrd/collectd"
 PIDFile     "/var/run/collectd.pid"
 PluginDir   "/usr/lib/collectd"
-TypesDB     "/usr/lib/collectd/types.db"
+TypesDB     "/usr/share/collectd/types.db"
 Interval     30
 ReadThreads  3
 

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 29160941da4dd74982d99d1d68231b0b136d4493..0fe7afc037263aa84335e841a6bb83045c3f7c22 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,113 +1,234 @@
 etc/collectd.conf
 etc/collectd.thermal
-etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S21collectd
 etc/rc.d/rc6.d/K50collectd
 #usr/bin/collectd-nagios
 #usr/etc/collectd.conf
-#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.a
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
+#usr/lib/collectd/apcups.a
 #usr/lib/collectd/apcups.la
 usr/lib/collectd/apcups.so
+#usr/lib/collectd/ascent.a
 #usr/lib/collectd/ascent.la
 usr/lib/collectd/ascent.so
+#usr/lib/collectd/battery.a
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
+#usr/lib/collectd/bind.a
+#usr/lib/collectd/bind.la
+usr/lib/collectd/bind.so
+#usr/lib/collectd/conntrack.a
+#usr/lib/collectd/conntrack.la
+usr/lib/collectd/conntrack.so
+#usr/lib/collectd/contextswitch.a
+#usr/lib/collectd/contextswitch.la
+usr/lib/collectd/contextswitch.so
+#usr/lib/collectd/cpu.a
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
+#usr/lib/collectd/cpufreq.a
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
+#usr/lib/collectd/curl.a
+#usr/lib/collectd/curl.la
+usr/lib/collectd/curl.so
+#usr/lib/collectd/df.a
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
+#usr/lib/collectd/disk.a
 #usr/lib/collectd/disk.la
 usr/lib/collectd/disk.so
+#usr/lib/collectd/dns.a
 #usr/lib/collectd/dns.la
 usr/lib/collectd/dns.so
+#usr/lib/collectd/email.a
 #usr/lib/collectd/email.la
 usr/lib/collectd/email.so
+#usr/lib/collectd/entropy.a
 #usr/lib/collectd/entropy.la
 usr/lib/collectd/entropy.so
+#usr/lib/collectd/exec.a
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-usr/lib/collectd/filecount.la
+#usr/lib/collectd/filecount.a
+#usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
+#usr/lib/collectd/fscache.a
+#usr/lib/collectd/fscache.la
+usr/lib/collectd/fscache.so
+#usr/lib/collectd/hddtemp.a
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
+#usr/lib/collectd/interface.a
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
+#usr/lib/collectd/iptables.a
 #usr/lib/collectd/iptables.la
 usr/lib/collectd/iptables.so
+#usr/lib/collectd/irq.a
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
+#usr/lib/collectd/load.a
 #usr/lib/collectd/load.la
 usr/lib/collectd/load.so
+#usr/lib/collectd/logfile.a
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
+#usr/lib/collectd/madwifi.a
+#usr/lib/collectd/madwifi.la
+usr/lib/collectd/madwifi.so
+#usr/lib/collectd/match_empty_counter.a
+#usr/lib/collectd/match_empty_counter.la
+usr/lib/collectd/match_empty_counter.so
+#usr/lib/collectd/match_hashed.a
+#usr/lib/collectd/match_hashed.la
+usr/lib/collectd/match_hashed.so
+#usr/lib/collectd/match_regex.a
+#usr/lib/collectd/match_regex.la
+usr/lib/collectd/match_regex.so
+#usr/lib/collectd/match_timediff.a
+#usr/lib/collectd/match_timediff.la
+usr/lib/collectd/match_timediff.so
+#usr/lib/collectd/match_value.a
+#usr/lib/collectd/match_value.la
+usr/lib/collectd/match_value.so
+#usr/lib/collectd/memory.a
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
+#usr/lib/collectd/multimeter.a
 #usr/lib/collectd/multimeter.la
 usr/lib/collectd/multimeter.so
+#usr/lib/collectd/network.a
 #usr/lib/collectd/network.la
 usr/lib/collectd/network.so
+#usr/lib/collectd/nfs.a
 #usr/lib/collectd/nfs.la
 usr/lib/collectd/nfs.so
+#usr/lib/collectd/ntpd.a
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
+#usr/lib/collectd/olsrd.a
+#usr/lib/collectd/olsrd.la
+usr/lib/collectd/olsrd.so
+#usr/lib/collectd/openvpn.a
+#usr/lib/collectd/openvpn.la
+usr/lib/collectd/openvpn.so
+#usr/lib/collectd/ping.a
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
+#usr/lib/collectd/powerdns.a
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
+#usr/lib/collectd/processes.a
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
+#usr/lib/collectd/protocols.a
+#usr/lib/collectd/protocols.la
+usr/lib/collectd/protocols.so
+#usr/lib/collectd/python.a
+#usr/lib/collectd/python.la
+usr/lib/collectd/python.so
+#usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
+#usr/lib/collectd/sensors.a
 #usr/lib/collectd/sensors.la
 usr/lib/collectd/sensors.so
+#usr/lib/collectd/swap.a
 #usr/lib/collectd/swap.la
 usr/lib/collectd/swap.so
+#usr/lib/collectd/syslog.a
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
+#usr/lib/collectd/table.a
+#usr/lib/collectd/table.la
+usr/lib/collectd/table.so
+#usr/lib/collectd/tail.a
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
+#usr/lib/collectd/target_notification.a
+#usr/lib/collectd/target_notification.la
+usr/lib/collectd/target_notification.so
+#usr/lib/collectd/target_replace.a
+#usr/lib/collectd/target_replace.la
+usr/lib/collectd/target_replace.so
+#usr/lib/collectd/target_scale.a
+#usr/lib/collectd/target_scale.la
+usr/lib/collectd/target_scale.so
+#usr/lib/collectd/target_set.a
+#usr/lib/collectd/target_set.la
+usr/lib/collectd/target_set.so
+#usr/lib/collectd/tcpconns.a
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
+#usr/lib/collectd/teamspeak2.a
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-usr/lib/collectd/thermal.la
+#usr/lib/collectd/ted.a
+#usr/lib/collectd/ted.la
+usr/lib/collectd/ted.so
+#usr/lib/collectd/thermal.a
+#usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-usr/lib/collectd/types.db
+#usr/lib/collectd/unixsock.a
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
+#usr/lib/collectd/uptime.a
+#usr/lib/collectd/uptime.la
+usr/lib/collectd/uptime.so
+#usr/lib/collectd/users.a
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
+#usr/lib/collectd/uuid.a
 #usr/lib/collectd/uuid.la
 usr/lib/collectd/uuid.so
+#usr/lib/collectd/vmem.a
 #usr/lib/collectd/vmem.la
 usr/lib/collectd/vmem.so
+#usr/lib/collectd/wireless.a
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
+#usr/lib/collectd/write_http.a
+#usr/lib/collectd/write_http.la
+usr/lib/collectd/write_http.so
+#usr/lib/libcollectdclient.a
+#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.8.8/Collectd
 #usr/lib/perl5/site_perl/5.8.8/Collectd.pm
+#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins
+#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/Monitorus.pm
+#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/OpenVZ.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/pkgconfig/libcollectdclient.pc
 usr/sbin/collectd
 usr/sbin/collectdmon
 #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

diff --git a/lfs/collectd b/lfs/collectd
index b65eb7d90cfe55f375cb4bca65bbb525a19df8d4..78840563c9b10fab419c3a858b04539834f443b5 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.5.4
+VER        = 4.9.1
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b59500d1346c16a63ba10cbc6c0cf7df
+$(DL_FILE)_MD5 = 5753496651c8c84afaea1fe290876bfc
 
 install : $(TARGET)
 
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
                --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
                --enable-{tcpconns,unixsock,users,wireless} \
-               --with-rrdtool=/usr/share/rrdtool-1.2.15
+               --with-librrd=/usr/share/rrdtool-1.2.30
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
        ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd