From: Sebastian Harl Date: Wed, 28 Nov 2012 07:19:33 +0000 (+0100) Subject: Merged branch 'experimental' into debmon-squeeze. X-Git-Tag: collectd-5.2.0-1--debmon60+1~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a5b2676ab872ffee1355317d4868d3f4bb21dbb1;p=pkg-collectd.git Merged branch 'experimental' into debmon-squeeze. Conflicts: debian/changelog debian/collectd.conf --- a5b2676ab872ffee1355317d4868d3f4bb21dbb1 diff --cc debian/changelog index 2178008,f7d674b..e7d8185 --- a/debian/changelog +++ b/debian/changelog @@@ -1,22 -1,60 +1,79 @@@ + collectd (5.2.0-1) experimental; urgency=low + + * New upstream release: + - ping plugin: Don't abort if ping_send fails but report an error only; + thanks to Bernd Zeimetz for reporting this (Closes: #630683). + - df plugin: Ignore "rootfs" file-system type to make sure that root + file-system statistics are only collected once; thanks to Florian La + Roche for reporting this (Closes: #657122). + - Fixed parse errors when using (including) empty config files; thanks to + Reinhard Tartler for reporting this (Closes: #592881). + New plugins: + - Aggregate multiple values lists into one: aggregation + - Query statistics from BSD's packet filter: pf (FreeBSD only) + * Uploading to experimental because of the Wheezy freeze. + * debian/control, debian/rules: + - Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable + the 'pf' plugin on non-kfreebsd systems. + * debian/patches: + - Removed migrate-4-5-df.dpatch; merged upstream. + - Removed rtnl_dump_filter.dpatch; merged upstream. + - Added myplugin_includes.dpatch -- change the example plugin include path + to /usr/include/collectd/core/ (see below). + - rrd_filter_path.dpatch: Also patch the migrate-4-5 script; while this is + not required for the (optional) auto-migration when updating the package + (the full path is passed as an argument) it helps the user to just use + the script without the need to add further arguments; thanks to Joey + Hess for reporting this (Closes: #689001). + * debian/rules: + - Fix installation paths used for Perl bindings. Upstream now passes + INSTALL_BASE rather than PREFIX to Makefile.PL which resulted in the + bindings being installed to different locations than before. + * debian/collectd-utils.install: + - Install collectd-tg(1). + * debian/libcollectdclient-dev.install: + - Install the libcollectdclient network*.h header files. + * Renamed libcollectclient0 to libcollectdclient1 due to the SONAME version + bump. + * debian/libcollectdclient1.symbols: + - Updated for 5.2. + * debian/collectd-dev.install: + - Install the collectd (daemon) headers to /usr/include/collectd/core/ + rather than /usr/include/collectd/. The latter is used by + libcollectdclient which causes file conflicts. + * debian/collectd.conf: + - Let the 'df' plugin ignore 'rootfs' (else, the root file-system would + appear twice, causing one of the updates to fail and spam the log) and + the usual virtual / temporary file-systems (cf. #657122). + * debian/collectd-core.postrm: + - Source the debconf confmodule to make the db_* functions available; + thanks to Joey Hess and YunQiang Su for reporting this + (Closes: #680172, #688285). + * debian/po: + - Updated Brazilian Portuguese debconf templates; thanks to Adriano Rafael + Gomes (Closes: #685760). + + -- Sebastian Harl Tue, 20 Nov 2012 15:40:12 +0100 + +collectd (5.1.0-3~bpo60+2) squeeze-backports; urgency=low + + * Disable the netlink plugin, as it does not compile anyways + + -- Reinhard Tartler Sat, 24 Nov 2012 14:46:58 +0100 + +collectd (5.1.0-3~bpo60+1) squeeze-backports; urgency=low + + * Rebuild for squeeze-backports. + * debian/rules, debian/control: + - Disabled modbus plugin, libmodbus-dev is not available on Squeeze. + - Disabled AMQP plugin, librabbitmq-dev is not available on Squeeze. + * debian/rules, debian/collectd-core.overrides: + - Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk (without arch). + * debian/collectd.conf: + - Removed sample config for the 'amqp' plugin. + + -- Sebastian Harl Fri, 03 Aug 2012 12:04:12 +0000 + collectd (5.1.0-3) unstable; urgency=low * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst: diff --cc debian/collectd.conf index 2efd8eb,9b6acea..43a76fa --- a/debian/collectd.conf +++ b/debian/collectd.conf @@@ -29,6 -52,14 +52,13 @@@ LoadPlugin syslo LogLevel info + ############################################################################## + # LoadPlugin section # + #----------------------------------------------------------------------------# + # Specify what features to activate. # + ############################################################################## + + #LoadPlugin aggregation -#LoadPlugin amqp #LoadPlugin apache #LoadPlugin apcups #LoadPlugin ascent @@@ -118,6 -149,47 +148,33 @@@ LoadPlugin user #LoadPlugin write_http #LoadPlugin write_mongodb + ############################################################################## + # Plugin configuration # + #----------------------------------------------------------------------------# + # In this section configuration stubs for each plugin are provided. A desc- # + # ription of those options is available in the collectd.conf(5) manual page. # + ############################################################################## + + # + # + # #Host "unspecified" + # Plugin "cpu" + # #PluginInstance "unspecified" + # Type "cpu" + # #TypeInstance "unspecified" + # + # GroupBy "Host" + # GroupBy "TypeInstance" + # + # CalculateNum false + # CalculateSum false + # CalculateAverage true + # CalculateMinimum false + # CalculateMaximum false + # CalculateStddev false + # + # + -# -# -# Host "localhost" -# Port "5672" -# VHost "/" -# User "guest" -# Password "guest" -# Exchange "amq.fanout" -# RoutingKey "collectd" -# Persistent false -# StoreRates false -# -# - # # # URL "http://localhost/server-status?auto"