commit collectd for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package collectd for openSUSE:Factory
checked in at Thu Feb 3 02:08:31 CET 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/collectd/collectd.changes 2010-12-21 15:30:02.000000000 +0100
@@ -0,0 +1,494 @@
+-------------------------------------------------------------------
+Tue Dec 21 14:27:22 UTC 2010 - lslezak@suse.cz
+
+- fixed packaging on openSUSE-11.4 - some perl-files are not
+ generated, disabled plugin-notify-desktop - it doesn't build
+
+-------------------------------------------------------------------
+Thu Dec 9 12:11:28 UTC 2010 - schubi@novell.com
+
+- Update to version 4.9.4 in order to fix security issue:
+ CVE-2010-4336
+
+-------------------------------------------------------------------
+Sun Jul 11 00:00:58 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to 4.10.1:
+ * the shutdown speed when terminating the read threads has been improved
+ * libcollectdclient: a format error in the PUTVAL command has been removed
+ * DF plugin: an error message shown when cu_mount_getlist fails has been added
+ * Processes plugin: missing initialization code for IO members of a struct has been added
+ * Python plugin: memory leaks in the write and notification callbacks have been fixed; a possible crash when the plugin was loaded but not configured has been fixed
+ * SNMP plugin: verbosity with regard to unknown ASN types has been increased
+ * PowerDNS plugin: compatibility changes for PowerDNS 2.9.22 and above have been applied
+
+- changes from 4.10.0:
+ * JSON output now includes the dstypes and dsnames fields
+ * the new Timeout option can be used to specify a timeout for missing values
+ * Apache plugin: support for IdleWorkers (Apache 1.*: IdleServers) has been added
+ * cURL plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
+ * cURL-XML plugin: new plugin allows to read XML files using cURL and extract metrics included in the files
+ * FileCount plugin: the new IncludeHidden option allows to include hidden files and directories in the statistics
+ * LogFile plugin: the new PrintSeverity option allows to include the severity of a message in the output
+ * memcachec plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
+ * Modbus plugin: new plugin allows to read registers from Modbus-TCP enabled devices
+ * Network plugin: new Interface option allows to set the interface to be used for multicast and, if supported, unicast traffic
+ * OpenVPN plugin: the CollectUserCount and CollectIndividualUsers options allow more detailed control over how to report sessions of multiple users
+ * Pinba plugin: new plugin receives timing information from the Pinba PHP extension, which can be used for profiling PHP code and webserver performance
+ * Ping plugin: new MaxMissed allows to re-resolve a hosts address when it doesn't reply to a number of ping requests
+ * PostgreSQL plugin: the Interval config option has been added; the plugin has been relicensed under the 2-clause BSD license
+ * Processes plugin: support for code and data virtual memory sizes has been added
+ * Python plugin: support for Python 3 has been implemented
+ * RouterOS plugin: support for collecting CPU load, memory usage, used and free disk space, sectors written and number of bad blocks from MikroTik devices has been added
+ * Swap plugin: support for Linux < 2.6 has been added
+ * Tail plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
+ * Write HTTP plugin: the StoreRates option has been added
+ * RegEx match: the Invert option has been added
+
+- bumped in-tree libnetlink_version version from 2.6.33 to 2.6.34
+
+-------------------------------------------------------------------
+Fri Apr 23 12:32:21 UTC 2010 - pascal.bleser@opensuse.org
+
+- bumped in-tree libnetlink_version version from 2.6.29-1 to 2.6.33
+
+- update to 4.9.2:
+ * append a newline to messages written to STDERR.
+ * serialization of NANs in JSON format has been fixed
+ * checks whether a "sleep" returned early have been added
+ * continue reading files in a directory when parsing one file fails
+ * Apache plugin: collection of the number of active connections has been fixed for Apache 2.*
+ * Exec plugin: error messages have been improved; the "running" flag is now cleared correctly when forking a child fails
+ * IPTables plugin: fix a violation of aliasing rules
+ * Java plugin: the Java API files are now packaged into a .jar file
+ * Network plugin: fix a segmentation fault when receiving packets with an unknown data source type
+ * Network plugin: a memory leak when receiving encrypted network packets has been fixed
+ * Oracle plugin: fix checking for lost connections and reconnect in this case
+ * UnixSock plugin: a memory leak in the "LISTVAL" command has been fixed
+ * Write HTTP plugin: use the "any" authentication schema, used to be "digest"
+
+-------------------------------------------------------------------
+Fri Jan 15 23:35:19 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to 4.9.1:
+ * RRDtool plugin: fix a bug with random write timeouts: due to an
+ incorrect initialization some files may be suspended basically
+ indefinitely; after flushing the files they were written
+ regularly again
+ * documentation: some manpage fixes
+ * default config: added sample configuration for missing plugins
+ * apache plugin: fix a segmentation fault in the config handling
+ of VerifyPeer / VerifyHost
+ * processes plugin: fix handling of derive data sources
+ * RouterOS plugin: use the node name for the "host" field
+ * monitorus plugin: put the plugin into the "Collectd::Plugins"
+ namespace
+ * Perl bindings: fix a warning that was printed when building
+ debugging output
+
+-------------------------------------------------------------------
+Mon Dec 21 13:40:31 UTC 2009 - pascal.bleser@opensuse.org
+
+- update to 4.9.0:
+ * new plugins: NetApp, Python, RouterOS, ContextSwitch, Monitorus,
+ OpenVZ
+ * timing information is now collected in the cURL plugin
+ * the possibility to set the source address and device used has
+ been added to the Ping plug-in
+ * the detail provided by the DF plug-in has been enhanced
+ * collection of IO-metrics has been added to the Processes plugin
+
+-------------------------------------------------------------------
+Sat Dec 19 23:11:00 UTC 2009 - pascal.bleser@opensuse.org
+
+- update to 4.8.2:
+ * fixes a memory leak in the "listval" command
+ * adds detection of dead connections and reconnection in the GenericJMX and Oracle plugins
+ * fixes handling of negative values and hex strings has been corrected in the SNMP plugin
+ * improved treatment of error messages when no log plugin was loaded
+
+- build memcachec and dbi plugins
+
+-------------------------------------------------------------------
+Wed Oct 7 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
+
+- split out -virt plugin package to avoid depending on libvirt.so and libxenstore.so
+ in the main package
+- more preconfigured integration and documentation mangling for files under contrib/
+- split out spamassassin contrib files into their own package, properly preconfigured
+- fix Apache2 configuration file in -web subpackage
+
+-------------------------------------------------------------------
+Sun Oct 4 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
+
+- update to 4.8.1:
+ * UnixSock plugin: fix a (well hidden) race condition related to file descriptor handling
+
+- changes from 4.8.0:
+ * collectd: two new data source types, DERIVE and ABSOLUTE, have been added: DERIVE can be used for counters that are reset occasionally
+ * thresholds: the advanced threshold options “Percentage”, “Hits”, and “Hysteresis” have been added
+ * cURL-JSON plugin: the new cURL-JSON plugin reads JSON files using the cURL library and parses the contents according to user specification; among other things, this allows to read statistics from a CouchDB instance
+ * DF plugin: using the new “ReportByDevice” option the device rather than the mount point can be used to identify partitions
+ * DNS plugin: the possibility to ignore numeric QTypes has been added
+ * GenericJMX plugin: the new, Java-based GenericJMX plugin allows to query arbitrary data from a Java process using the Java Management Extensions (JMX)
+ * MadWifi plugin: the new MadWifi plugin collects information about Atheros wireless LAN chipsets from the MadWifi driver
+ * network plugin: the receive- and send-buffer-sizes have been made configurable, allowing for bigger and smaller packets
+ * olsrd plugin: the new OLSR plugin queries routing information from the Optimized Link State Routing daemon
+ * RRDtool plugin: a new configuration option allows to define a random write delay when writing RRD files; this spreads the load created by writing RRD files more evenly
+ * Swap plugin: the possibility to collect swapped in/out pages has been added to the Swap plugin
+ * TokyoTyrant plugin: the new TokyoTyrant plugin reads the number of records and file size from a running Tokyo Tyrant server
+ * UnixSock plugin: add the GETTHRESHOLD command: this command can be used to query the thresholds configured for a particular identifier
+ * Write HTTP plugin: the new Write HTTP plugin sends the values collected by collectd to a web-server using HTTP POST requests
+ * Empty Counter match: the new Empty Counter match matches value lists, where at least one data source is of type COUNTER and the counter value of all counter data sources is zero
+
+-------------------------------------------------------------------
+Sat Sep 26 00:00:00 CEST 2009 - kkaempf@suse.de
+
+- temporarily disable perl plugin for opensuse 11.2, must fix configure check first
+
+-------------------------------------------------------------------
+Mon Jul 27 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
+
+- update to 4.7.2:
+ * several bugs in the threshold and notification subsystems have been fixed
+ * portability of the “memcached” plug-in has been improved
+
+-------------------------------------------------------------------
+Wed May 13 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
+
+- update the in-tree libnetlink to 2.6.29-1
+- added missing ldconfig for libcollectclient0
+- update to 4.7.0:
+ * apache plugin: support to query multiple servers has been added
+ * apache plugin: handling of lighttpd's scoreboard statistics has been improved
+ * conntrack plugin: the new conntrack plugin collects the connection tracking table size
+ * fscache plugin: the new fscache plugin collects statistics about Linux' file-system based caching framework
+ * gmond plugin: the new gmond plugin can receive and interpret multicast traffic from Ganglia's gmond daemon
+ * java plugin: the new java plugin exports the collectd API to Java, making it possible to write extensions to collectd in Java
+ * memcachec plugin: the new memcachec plugin queries data from a memcached daemon and parses it similar to the cURL plugin
+ * memcached plugin: support for connections over UNIX domain sockets has been added
+ * mysql plugin: support to query multiple databases has been added
+ * mysql plugin: master/slave statistics have been added
+ * mysql plugin: lock statistics have been added
+ * network plugin: the possibility to sign or encrypt network traffic has been added
+ * protocols plugin: the new protocols plugin provides information about network protocols, such as IP, TCP and UDP
+ * snmp plugin: the intervals given in the configuration of the SNMP plugin must no longer be a multiple of the global interval
+ * table plugin: the new Table plugin provides parsing for table-like structured files, such as many files beneath /proc
+ * ted plugin: the new TED plugin reads power consumption measurements from “The Energy Detective” (TED)
+ * onewire plugin: the new Interval option allows collecting information from OneWire sensors at arbitrary intervals
+ * ping plugin: support for collecting the drop rate and standard deviation of round-trip times has been added
+ * uptime plugin: the new uptime plugin can collect the server's uptime
+
+-------------------------------------------------------------------
+Thu Mar 19 00:00:00 CET 2009 - pascal.bleser@opensuse.org
+
+- update to 4.6.2:
+ * collection of the number of cached RR-sets has been fixed in the "BIND" plugin
+ * filter chains can now be configured without a default target
+ * portability fixes have been added to the "DNS" and "Oracle" plugins
+ * a typo that prevented the module from being used correctly has been
+ corrected in the "TimeDiff" match
+ * a possible race condition during startup has been fixed in the "RRDtool" plugin
+
+-------------------------------------------------------------------
+Mon Feb 23 00:00:00 CET 2009 - pascal.bleser@opensuse.org
+
+- update to 4.6.1:
+ * fixes an off-by-one error in the IPMI plugin
++++ 297 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/collectd/collectd.changes
calling whatdependson for head-i586
New:
----
collectd-4.10.2.tar.bz2
collectd-collection3.patch
collectd-fix-config.patch
collectd-fix-warnings.patch
collectd-fix_broken_perl-5.10.patch
collectd-fix_collectd_config_path_in_snmp_probe.patch
collectd-fix_collection_cgi.patch
collectd-fix_libltdl_autoreconf.patch
collectd-fix_spamassassin_doc.patch
collectd-iproute2-HZ.patch
collectd-js.apache2.conf
collectd-lib64.patch
collectd-perl-vendor.patch
collectd-pthread.pc
collectd-split_README.patch
collectd-version.patch
collectd.apache2.conf
collectd.changes
collectd.spec
collectd.suse.init
iproute2-2.6.34.tar.bz2
iproute2-optflags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ collectd.spec ++++++
++++ 874 lines (skipped)
++++++ collectd-collection3.patch ++++++
--- contrib/collection3/bin/graph.cgi.orig 2009-10-07 23:29:32.000000000 +0200
+++ contrib/collection3/bin/graph.cgi 2009-10-07 23:51:50.000000000 +0200
@@ -2,10 +2,9 @@
use strict;
use warnings;
-use lib ('../lib');
+use lib ('/usr/lib/collectd-js');
use utf8;
-use FindBin ('$RealBin');
use Carp (qw(confess cluck));
use CGI (':cgi');
use RRDs ();
@@ -49,7 +48,7 @@
HTTP
}
-gc_read_config ("$RealBin/../etc/collection.conf");
+gc_read_config ("/etc/collectd/collection-js.conf");
if ($GraphWidth)
{
--- contrib/collection3/bin/index.cgi.orig 2009-10-07 23:30:27.000000000 +0200
+++ contrib/collection3/bin/index.cgi 2009-10-07 23:52:09.000000000 +0200
@@ -17,11 +17,10 @@
use strict;
use warnings;
-use lib ('../lib');
+use lib ('/usr/lib/collectd-js');
use utf8;
use Carp (qw(cluck confess));
-use FindBin ('$RealBin');
use CGI (':cgi');
use CGI::Carp ('fatalsToBrowser');
use HTML::Entities ('encode_entities');
@@ -59,7 +58,7 @@
exit 1;
}
-gc_read_config ("$RealBin/../etc/collection.conf");
+gc_read_config ("/etc/collectd/collection-js.conf");
$Actions{$action}->();
exit (0);
@@ -144,9 +143,9 @@
print < $file,
-LowerCaseNames => 1,
--- contrib/collection3/lib/Collectd/Config.pm.orig 2009-10-07 23:32:23.000000000 +0200
+++ contrib/collection3/lib/Collectd/Config.pm 2009-10-07 23:34:57.000000000 +0200
@@ -58,7 +58,7 @@
return (1);
}
- $file ||= "etc/collection.conf";
+ $file ||= "/etc/collectd/collection-js.conf";
%conf = ParseConfig (-ConfigFile => $file,
-LowerCaseNames => 1,
++++++ collectd-fix-config.patch ++++++
--- src/collectd.conf.in.orig 2010-07-09 12:01:59.000000000 +0200
+++ src/collectd.conf.in 2010-07-12 01:05:24.000000000 +0200
@@ -12,10 +12,10 @@
#Hostname "localhost"
FQDNLookup true
-#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@"
-#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid"
-#PluginDir "@prefix@/lib/@PACKAGE_NAME@"
-#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
+#BaseDir "/var/lib/@PACKAGE_NAME@"
+#PIDFile "/var/run/@PACKAGE_NAME@.pid"
+#PluginDir "@libdir@/@PACKAGE_NAME@"
+#TypesDB "@libdir@/@PACKAGE_NAME@/types.db"
#Interval 10
#Timeout 2
#ReadThreads 5
@@ -149,7 +149,7 @@
#<Plugin apache>
# URL "http://localhost/status?auto"
-# User "www-user"
+# User "www"
# Password "secret"
# CACert "/etc/ssl/ca.crt"
#</Plugin>
@@ -161,7 +161,7 @@
#<Plugin ascent>
# URL "http://localhost/ascent/status/"
-# User "www-user"
+# User "www"
# Password "secret"
# CACert "/etc/ssl/ca.crt"
#</Plugin>
@@ -186,7 +186,7 @@
#</Plugin>
#<Plugin csv>
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+# DataDir "/var/lib/@PACKAGE_NAME@/csv"
# StoreRates false
#</Plugin>
@@ -299,7 +299,7 @@
#</Plugin>
#<Plugin email>
-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+# SocketFile "/var/run/@PACKAGE_NAME@-email"
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
@@ -881,7 +881,7 @@
#</Plugin>
#<Plugin unixsock>
-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
+# SocketFile "/var/run/@PACKAGE_NAME@-unixsock"
# SocketGroup "collectd"
# SocketPerms "0660"
#</Plugin>
++++++ collectd-fix-warnings.patch ++++++
--- src/netlink.c.orig 2009-02-17 12:56:09.000000000 +0100
+++ src/netlink.c 2009-02-17 12:56:44.000000000 +0100
@@ -573,7 +573,7 @@
}
if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
- NULL, NULL) != 0)
+ (rtnl_filter_t)NULL, NULL) != 0)
{
ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
return (-1);
@@ -611,7 +611,7 @@
}
if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
- NULL, NULL) != 0)
+ (rtnl_filter_t)NULL, NULL) != 0)
{
ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
continue;
++++++ collectd-fix_broken_perl-5.10.patch ++++++
--- src/perl.c.orig 2008-04-02 21:06:14.000000000 +0200
+++ src/perl.c 2008-04-02 21:15:50.000000000 +0200
@@ -1440,7 +1440,13 @@
log_debug ("perl_config: loading perl plugin \"%s\"", value);
load_module (PERL_LOADMOD_NOIMPORT,
- newSVpv (module_name, strlen (module_name)), Nullsv);
+ newSVpv (module_name, strlen (module_name)),
+#if PERL_VERSION >= 10
+ newSViv(0)
+#else
+ Nullsv
+#endif
+ );
return 0;
} /* static int perl_config_loadplugin (oconfig_item_it *) */
++++++ collectd-fix_collectd_config_path_in_snmp_probe.patch ++++++
--- contrib/snmp-probe-host.px.orig 2009-10-07 22:55:23.000000000 +0200
+++ contrib/snmp-probe-host.px 2009-10-07 22:57:45.000000000 +0200
@@ -290,7 +290,7 @@
=cut
my $host;
-my $file = '/etc/collectd/collectd.conf';
+my $file = '/etc/collectd.conf';
my $community = 'public';
my $conf;
my $working_data;
++++++ collectd-fix_collection_cgi.patch ++++++
--- contrib/collection.cgi.orig 2010-04-22 11:30:07.000000000 +0200
+++ contrib/collection.cgi 2010-05-20 18:23:38.000000000 +0200
@@ -11,7 +11,7 @@
use RRDs ();
use Data::Dumper ();
-our $Config = "/etc/collection.conf";
+our $Config = "/etc/collectd/collection.conf";
our @DataDirs = ();
our @DontShowTypes = ();
our $LibDir;
--- contrib/collection.conf.orig 2010-04-22 11:29:35.000000000 +0200
+++ contrib/collection.conf 2010-05-20 18:23:38.000000000 +0200
@@ -1,3 +1,2 @@
-datadir: "/opt/collectd/var/lib/collectd/rrd/"
-libdir: "/opt/collectd/lib/collectd/"
-
+datadir: "/var/lib/collectd/"
+libdir: "@@LIBDIR@@/collectd/"
++++++ collectd-fix_libltdl_autoreconf.patch ++++++
--- Makefile.in.orig 2009-07-27 16:44:54.000000000 +0200
+++ Makefile.in 2009-07-27 16:45:08.000000000 +0200
@@ -263,7 +263,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I libltdl
SUBDIRS = libltdl src bindings
INCLUDES = $(LTDLINCL)
EXTRA_DIST = contrib version-gen.sh
--- Makefile.am.orig 2009-07-27 16:44:44.000000000 +0200
+++ Makefile.am 2009-07-27 16:44:52.000000000 +0200
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I libltdl
SUBDIRS = libltdl src bindings
++++++ collectd-fix_spamassassin_doc.patch ++++++
--- contrib/SpamAssassin/Collectd.pm.orig 2009-10-07 22:34:14.000000000 +0200
+++ contrib/SpamAssassin/Collectd.pm 2009-10-07 22:36:50.000000000 +0200
@@ -4,13 +4,7 @@
Collectd - plugin for filling collectd with stats
-=head1 INSTALLATION
-
-Just copy Collectd.pm into your SpamAssassin Plugin path
-(e.g /usr/share/perl5/Mail/SpamAssassin/Plugin/) and
-add a loadplugin call into your init.pre file.
-
=head1 SYNOPSIS
loadplugin Mail::SpamAssassin::Plugin::Collectd
++++++ collectd-iproute2-HZ.patch ++++++
--- lib/utils.c.orig 2008-04-17 19:12:54.000000000 +0200
+++ lib/utils.c 2008-05-08 00:20:27.000000000 +0200
@@ -33,6 +33,10 @@
#include "utils.h"
+#ifndef HZ
+#define HZ sysconf(_SC_CLK_TCK)
+#endif
+
int get_integer(int *val, const char *arg, int base)
{
long res;
@@ -430,8 +434,8 @@
int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
{
- const __u32 *a1 = a->data;
- const __u32 *a2 = b->data;
+ const __u32 *a1 = (__u32*)a->data;
+ const __u32 *a2 = (__u32*)b->data;
int words = bits >> 0x05;
bits &= 0x1f;
++++++ collectd-js.apache2.conf ++++++
<IfModule mod_cgi.c>
ScriptAlias /collectd-js /srv/www/collectd-js/bin/index.cgi
# Access control:
participants (1)
-
root@hilbert.suse.de