From c5240ade4726aa39cff8f7d93aa5f7760cedb4cf Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Thu, 26 Nov 2009 22:42:42 +0000 Subject: - update to 4.8.1 (Florian La Roche) bz# 516276 - disable ping plugin until liboping is packaged bz# 541744 --- .cvsignore | 2 +- collectd-4.5.4-fix-condrestart.patch | 11 --- collectd-4.5.4-libvirt-reconnect.patch | 61 --------------- collectd-4.6.2-include-collectd.d.patch | 129 +++++++++++++++++--------------- collectd.spec | 32 ++++---- sources | 2 +- 6 files changed, 89 insertions(+), 148 deletions(-) delete mode 100644 collectd-4.5.4-fix-condrestart.patch delete mode 100644 collectd-4.5.4-libvirt-reconnect.patch diff --git a/.cvsignore b/.cvsignore index 9eeecc1..d5cebd8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -collectd-4.6.5.tar.bz2 +collectd-4.8.1.tar.bz2 diff --git a/collectd-4.5.4-fix-condrestart.patch b/collectd-4.5.4-fix-condrestart.patch deleted file mode 100644 index 3982a16..0000000 --- a/collectd-4.5.4-fix-condrestart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/fedora/init.d-collectd.orig 2009-08-11 01:50:15.000000000 +0200 -+++ contrib/fedora/init.d-collectd 2009-08-11 01:51:10.000000000 +0200 -@@ -54,7 +54,7 @@ - start - ;; - condrestart) -- [ -f /var/lock/subsys/$prog ] && restart || : -+ [ -f /var/lock/subsys/$prog ] && stop && start || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" diff --git a/collectd-4.5.4-libvirt-reconnect.patch b/collectd-4.5.4-libvirt-reconnect.patch deleted file mode 100644 index a0de7ce..0000000 --- a/collectd-4.5.4-libvirt-reconnect.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/src/libvirt.c 2009-08-11 23:27:35.000000000 +0200 -+++ b/src/libvirt.c 2009-08-12 00:14:58.000000000 +0200 -@@ -49,6 +49,8 @@ - - /* Connection. */ - static virConnectPtr conn = 0; -+static char *conn_string = NULL; -+static int conn_count = 0; - - /* Seconds between list refreshes, 0 disables completely. */ - static int interval = 60; -@@ -153,14 +155,14 @@ - il_interface_devices = ignorelist_create (1); - - if (strcasecmp (key, "Connection") == 0) { -- if (conn != 0) { -+ if (conn_count++ != 0) { - ERROR ("Connection may only be given once in config file"); - return 1; - } -- conn = virConnectOpenReadOnly (value); -- if (!conn) { -- VIRT_ERROR (NULL, "connection failed"); -- return 1; -+ conn_string = strdup(value); -+ if (conn_string == NULL) { -+ ERROR ("libvirt plugin: Connection strdup failed."); -+ return -1; - } - return 0; - } -@@ -253,10 +255,11 @@ - int i; - - if (conn == NULL) { -- ERROR ("libvirt plugin: Not connected. Use Connection in " -- "config file to supply connection URI. For more information " -- "see "); -- return -1; -+ conn = virConnectOpenReadOnly (conn_string); -+ if (conn == NULL) { -+ ERROR ("libvirt plugin: Not connected."); -+ return -1; -+ } - } - - time (&t); -@@ -264,8 +267,12 @@ - /* Need to refresh domain or device lists? */ - if ((last_refresh == (time_t) 0) || - ((interval > 0) && ((last_refresh + interval) <= t))) { -- if (refresh_lists () != 0) -+ if (refresh_lists () != 0) { -+ if (conn != NULL) -+ virConnectClose (conn); -+ conn = NULL; - return -1; -+ } - last_refresh = t; - } - diff --git a/collectd-4.6.2-include-collectd.d.patch b/collectd-4.6.2-include-collectd.d.patch index 2fec0d3..6ad4ff1 100644 --- a/collectd-4.6.2-include-collectd.d.patch +++ b/collectd-4.6.2-include-collectd.d.patch @@ -1,63 +1,70 @@ -diff -up collectd-4.6.5/src/collectd.conf.in.orig collectd-4.6.5/src/collectd.conf.in ---- collectd-4.6.5/src/collectd.conf.in.orig 2009-09-10 14:16:52.000000000 -0400 -+++ collectd-4.6.5/src/collectd.conf.in 2009-09-11 19:34:18.865782426 -0400 -@@ -26,7 +26,6 @@ FQDNLookup true - # LogLevel info - # +diff -up collectd-4.8.1/src/collectd.conf.in.lr collectd-4.8.1/src/collectd.conf.in +--- collectd-4.8.1/src/collectd.conf.in.lr 2009-10-04 09:46:19.000000000 +0200 ++++ collectd-4.8.1/src/collectd.conf.in 2009-10-10 11:40:27.000000000 +0200 +@@ -50,7 +50,6 @@ FQDNLookup true + # to missing dependencies or because they have been deactivated explicitly. # + ############################################################################## --@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache - @BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups - @BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors - @BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent -@@ -39,45 +38,33 @@ FQDNLookup true - @BUILD_PLUGIN_DBI_TRUE@LoadPlugin dbi - @BUILD_PLUGIN_DF_TRUE@LoadPlugin df - @BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk --@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns --@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email - @BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy - @BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec - @BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount - @BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp - @BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface - @BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables --@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi - @BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs - @BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq --@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt - @BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load - @BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon - @BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached - @BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory - @BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter --@BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql - @BUILD_PLUGIN_NETLINK_TRUE@LoadPlugin netlink - @BUILD_PLUGIN_NETWORK_TRUE@LoadPlugin network - @BUILD_PLUGIN_NFS_TRUE@LoadPlugin nfs --@BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx - @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop - @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@LoadPlugin notify_email - @BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd --@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut - @BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire - @BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn - @BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle --@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl - @BUILD_PLUGIN_PING_TRUE@LoadPlugin ping --@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql - @BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns - @BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes - @BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached --@BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool --@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors - @BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial --@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp - @BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap - @BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail - @BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape -@@ -560,3 +547,5 @@ FQDNLookup true - # - # Target "write" - # -+ +-#@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache + #@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups + #@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors + #@BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent +@@ -65,8 +64,6 @@ FQDNLookup true + #@BUILD_PLUGIN_DBI_TRUE@LoadPlugin dbi + #@BUILD_PLUGIN_DF_TRUE@LoadPlugin df + #@BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk +-#@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns +-#@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email + #@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy + #@BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec + #@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount +@@ -75,41 +72,31 @@ FQDNLookup true + #@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp + @BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface + #@BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables +-#@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi + #@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs + #@BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq + #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java +-#@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt + @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load + #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon + #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec + #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached + @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory + #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter +-#@BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql + #@BUILD_PLUGIN_NETLINK_TRUE@LoadPlugin netlink + @LOAD_PLUGIN_NETWORK@LoadPlugin network + #@BUILD_PLUGIN_NFS_TRUE@LoadPlugin nfs +-#@BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx + #@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop + #@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@LoadPlugin notify_email + #@BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd +-#@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut + #@BUILD_PLUGIN_OLSRD_TRUE@LoadPlugin olsrd + #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire + #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn + #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle +-#@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl + #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping +-#@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql + #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns + #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes + #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols + #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached +-@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool +-#@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors + #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial +-#@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp + #@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap + #@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table + #@BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail +@@ -574,6 +561,7 @@ FQDNLookup true + # CreateFiles true + # CollectStatistics true + # +Include "/etc/collectd.d" + + # + # DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd" diff --git a/collectd.spec b/collectd.spec index b098e4d..8b15d76 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,6 +1,6 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.6.5 +Version: 4.8.1 Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -31,16 +31,6 @@ BuildRequires: OpenIPMI-devel BuildRequires: postgresql-devel BuildRequires: nut-devel -# In function 'strncpy', -# inlined from 'ping_send_one_ipv6' at liboping.c:626: -# /usr/include/bits/string3.h:122: error: call to __builtin___strncpy_chk will always overflow destination buffer -# In function 'strncpy', -# inlined from 'ping_send_one_ipv4' at liboping.c:579: -# /usr/include/bits/string3.h:122: error: call to __builtin___strncpy_chk will always overflow destination buffer - -# PPC/PPC64 disabled due to above error. -ExcludeArch: ppc ppc64 - %description collectd is a small daemon written in C for performance. It reads various system statistics and updates RRD files, creating them if necessary. @@ -180,6 +170,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in --enable-nut \ --enable-postgresql \ --enable-iptables \ + --disable-ping \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -295,6 +286,8 @@ fi %{_libdir}/collectd/irq.so %{_libdir}/collectd/load.so %{_libdir}/collectd/logfile.so +%{_libdir}/collectd/madwifi.so +%{_libdir}/collectd/match_empty_counter.so %{_libdir}/collectd/mbmon.so %{_libdir}/collectd/memcached.so %{_libdir}/collectd/memory.so @@ -302,7 +295,7 @@ fi %{_libdir}/collectd/network.so %{_libdir}/collectd/nfs.so %{_libdir}/collectd/ntpd.so -%{_libdir}/collectd/ping.so +%{_libdir}/collectd/olsrd.so %{_libdir}/collectd/powerdns.so %{_libdir}/collectd/processes.so %{_libdir}/collectd/serial.so @@ -318,17 +311,25 @@ fi %{_libdir}/collectd/vmem.so %{_libdir}/collectd/vserver.so %{_libdir}/collectd/wireless.so -%{_datadir}/collectd/types.db +%{_libdir}/collectd/write_http.so %{_libdir}/collectd/bind.so +%{_libdir}/collectd/conntrack.so %{_libdir}/collectd/curl.so +%{_libdir}/collectd/fscache.so %{_libdir}/collectd/match_regex.so %{_libdir}/collectd/match_timediff.so %{_libdir}/collectd/match_value.so %{_libdir}/collectd/openvpn.so +%{_libdir}/collectd/protocols.so +%{_libdir}/collectd/table.so %{_libdir}/collectd/target_notification.so %{_libdir}/collectd/target_replace.so %{_libdir}/collectd/target_set.so +%{_libdir}/collectd/ted.so +%{_libdir}/collectd/uptime.so + +%{_datadir}/collectd/types.db # collectdclient - TBD reintroduce -devel subpackage? %{_libdir}/libcollectdclient.so @@ -344,6 +345,7 @@ fi %doc %{_mandir}/man1/collectdmon.1* %doc %{_mandir}/man5/collectd.conf.5* %doc %{_mandir}/man5/collectd-exec.5* +%doc %{_mandir}/man5/collectd-java.5* %doc %{_mandir}/man5/collectd-unixsock.5* %doc %{_mandir}/man5/types.db.5* @@ -435,6 +437,10 @@ fi %changelog +* Wed Nov 25 2009 Alan Pevec 4.8.1-1 +- update to 4.8.1 (Florian La Roche) bz# 516276 +- disable ping plugin until liboping is packaged bz# 541744 + * Fri Sep 11 2009 Tom "spot" Callaway 4.6.5-1 - update to 4.6.5 - disable ppc/ppc64 due to compile error diff --git a/sources b/sources index 5a4ebc7..b1e1209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -131e6fbb55f0cf6a069a98eedd21d293 collectd-4.6.5.tar.bz2 +23e07960285d0b5ee746580d6a545175 collectd-4.8.1.tar.bz2 -- cgit