![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Thu, 28 Jul 2016 19:26:00 +0000 (21:26 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Thu, 28 Jul 2016 19:26:00 +0000 (21:26 +0200) |
51 files changed:
diff --git a/debian/README.Debian b/debian/README.Debian
index fbbb43f5d475429d6dae1e8f0fc9ad8e8cb466ca..cab3f6438cc1b39149199b0bf1a0062bbd592502 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
- Originally, plugins for collectd had to be written in C and linked as shared
objects. Starting with version 4.0.0, it is also possible to use plugins
written in the scripting language Perl or implemented as separate processes.
- See collectd-perl(5) and collectd-exec(5) for details.
+ In later versions, support for Java and Python has been added. See the
+ appropriate collectd-<extension>(5) manual page for details.
- If you want to contribute plugins to the official distribution you should
read http://collectd.org/dev-info.shtml.
diff --git a/debian/changelog b/debian/changelog
index 6f83f95bb297b9d3a8d74079bbcc348d232765fd..031793ad0e4d5c2cfb8e1603bbfac3811eae1e0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
+collectd (5.4.1-6) unstable; urgency=medium
+
+ * debian/patches:
+ - Added bts770681_riemann_ack: upstream fix for the write_riemann plugin
+ to avoid locking up a remote Riemann instance; thanks to Marc Fournier
+ for reporting this (Closes: #770681).
+ - Added bts747093_lvm_segfault: upstream fix for a segfault in the LVM
+ plugin; thanks to Bernd Zeimetz and Marc Fournier for reporting this
+ (Closes: #747093).
+ - Added bts770683_curl_init: upstream fix for a segfault in plugins using
+ libcurl caused by concurrent memory access; thanks to Marc Fournier for
+ reporting this (Closes: #770683, cf. #735173).
+ - Added bts750440_config_segfault: upstream fix for a segfault when
+ including empty config files; thanks to Bernd Zeimetz and Marc Fournier
+ for reporting this (Closes: #750440, #770685).
+ - Added bts770688_snmp_memleak: upstream fix for a memory leak in the
+ SNMP plugin; thanks to Marc Fournier for reporting this
+ (Closes: #770688).
+ - Added bts770690_java_jni_thread_detach: upstream fix for locking up the
+ Java plugin by not properly detaching from the JVM in error conditions;
+ thanks to Marc Fournier for reporting this (Closes: #770690).
+ - Added bts770693_timestamps: upstream fix for handling internal
+ timestamps; thanks to Marc Fournier for reporting this (Closes: #770693)
+ - Added bts770694_loglevel: upstream fix to correct logging behavior when
+ using an invalid log level; thanks to Marc Fournier for reporting this
+ (Closes: #770694, #687067).
+
+ -- Sebastian Harl <tokkee@debian.org> Sun, 23 Nov 2014 15:27:15 +0100
+
+collectd (5.4.1-5) unstable; urgency=medium
+
+ * debian/rules:
+ - Fixed a typo preventing the fix for #760719 to be active
+ (Closes: #760719).
+
+ -- Sebastian Harl <tokkee@debian.org> Sun, 28 Sep 2014 17:13:07 +0000
+
+collectd (5.4.1-4) unstable; urgency=medium
+
+ * debian/rules:
+ - Disable preprocessor warnings on kfreebsd to work around an error
+ resulting from a redefined macro in PostgreSQL's pg_config_manual.h;
+ thanks to Ivo De Decker for reporting this (Closes: #760719).
+ * debian/control, debian/rules:
+ - Disable the 'java' plugin on sparc for now. It fails to build.
+
+ -- Sebastian Harl <tokkee@debian.org> Sun, 28 Sep 2014 01:59:14 +0200
+
+collectd (5.4.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control:
+ - Build-Depend on libprotobuf-c-dev instead of libprotobuf-c0-dev due to
+ the protobuf-c transition (Closes: #756422).
+
+ -- Robert S. Edmonds <edmonds@debian.org> Tue, 12 Aug 2014 15:36:27 -0400
+
+collectd (5.4.1-3) unstable; urgency=medium
+
+ * debian/control:
+ - Added libupsclient-dev as primary alternate build-dep to
+ libupsclient1-dev; thanks to Laurent Bigonville for reporting this and
+ Marc Fournier for sending a patch (Closes: #730397).
+
+ -- Sebastian Harl <tokkee@debian.org> Mon, 28 Apr 2014 23:29:53 +0200
+
+collectd (5.4.1-2) unstable; urgency=medium
+
+ * debian/rules, debian/control:
+ - Disable varnish for now; it does not work with varnish 4;
+ c.f. https://bugs.debian.org/745902 (Closes: #745894).
+ - Drop build dependency on libvarnishapi-dev.
+ - Build-depend on libow-dev and re-enable the onewire plugin; thanks to
+ Adam Smutnicki for pointing this out (Closes: #744956).
+ * debian/rules:
+ - Added INSTALL_BASE= to perl options; else, modules are installed
+ into $HOME.
+ - Prepend collectd/core to collectd's header files; thanks to Sergio
+ Jimenez for reporting this (Closes: #739516).
+ * debian/patches:
+ - Added collection.cgi.dpatch fixing apache data-sources; thanks to
+ Fabiano Pires for reporting this and providing a patch
+ (Closes: #743881).
+ - Added myplugin_api.dpatch updating myplugin.c to the latest API.
+
+ -- Sebastian Harl <tokkee@debian.org> Sat, 26 Apr 2014 16:54:19 +0200
+
+collectd (5.4.1-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Fixed a segfault when using <Match> without an Instance; thanks to
+ Alexander Golovko for reporting this (Closes: #732701).
+ - Fixed gcrypt initialization issues (partly fixed in 5.1.1 already);
+ thanks to Pieter Lexis for reporting this (Closes: #735173).
+ * debian/patches:
+ - Removed amqp_0_4.dpatch; merged upstream.
+ * debian/control:
+ - Updated standards-version to 3.9.5; no changes.
+ * debian/rules:
+ - Use -Wno-error=deprecated-declarations to suppress libdbi deprecation
+ warnings for now; they would else cause build failures due to -Werror.
+
+ -- Sebastian Harl <tokkee@debian.org> Tue, 28 Jan 2014 21:47:00 +0100
+
+collectd (5.4.0-3) unstable; urgency=low
+
+ * debian/control:
+ - Removed build-dep on iproute-dev which is about to be removed and has
+ been superseded by libmnl-dev in collectd. Thanks to Laurent Bigonville
+ and Andreas Henriksson for reporting this (Closes: #726921).
+ * debian/collectd.conf:
+ - Removed sample configuration for the write_mongodb plugin; the plugin is
+ not available on Debian; thanks to Bryan Fullerton for reporting this
+ (cf. LP:#1206813, Closes: #724699).
+ * debian/patches:
+ - Added amqp_0_4.dpatch: Added support for rabbitmq-c 0.4.x.
+
+ -- Sebastian Harl <tokkee@debian.org> Sat, 23 Nov 2013 16:08:05 +0100
+
+collectd (5.4.0-2) unstable; urgency=low
+
+ * debian/control:
+ - Limit build-dependency on libmnl-dev to linux-any. debian/rules already
+ did the right thing and excluded the 'netlink' plugin on kfreebsd.
+ Thanks to Ivo De Decker for reporting this (Closes: #724911).
+
+ -- Sebastian Harl <tokkee@debian.org> Thu, 03 Oct 2013 12:23:18 +0200
+
+collectd (5.4.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #723187):
+ - MySQL plugin now uses the name of the <Database> block rather than the
+ database name to identify the read callback; thanks to Mathieu Parent
+ for reporting this (Closes: #703446).
+ - Fixed a segfault in the ethstat plugin; thanks to Maximilian Engelhardt
+ for reporting this (Closes: #698584).
+ - The swap plugin now reports NaN rather than failing if no swap space is
+ available; thanks to Simon Richter for reporting this (Closes: #679163).
+ New plugins:
+ - read statistics from Aquaero 5 watercooling boards: aquaero (disabled in
+ Debian because of missing dependencies)
+ - CPU accounting information for Linux process groups: cgroups (disabled
+ on non-Linux systems)
+ - Logical Volume Manager usage: lvm (disabled on non-Linux systems)
+ - Intel Many-Integrated-Core (MIC) statistics: mic (disabled in Debian
+ because of missing dependencies)
+ - statistics of sigrok-supported devices: sigrok (disabled in Debian
+ because of missing dependencies)
+ - aggregate values received with the StatsD protocol: statsd
+ - incremental parsing of CSV files: tail_csv
+ - send collected values to Riemann: write_riemann
+ * Uploading to unstable; Wheezy has long been released.
+ * debian/patches:
+ - Removed pod-perl-5.18.dpatch; applied upstream.
+ * debian/control, debian/rules:
+ - Depend on libmnl-dev and enable the netlink plugin on all architectures
+ (upstream removed the dependency on the netlink library which is only
+ available as a static non-PIC library on Debian) (Closes: #531352).
+ - Depend on liblvm2-dev and enable the LVM plugin on Linux.
+ * debian/rules:
+ - Disable the aquaero plugin which requires libaquaero5.
+ - Disable the cgroups plugin on non-Linux.
+ - Disable the MIC plugin which requires libmic.
+ - Disable the sigrok plugin which requires libsigrok >= 0.2.0.
+ - Removed the Perl INSTALL_BASE workaround introduced in 5.2.0-1.
+ * debian/control:
+ - Removed build-dependency on libhal-dev; HAL is deprecated and will be
+ removed from Debian. It was optionally used by the uuid plugin.
+ (Closes: #615203)
+ - Build-conflict with libhal-dev to ensure consistent builds (cf. #615203).
+ - Let libcollectdclient-dev replace/break collectd-dev (<< 5.2.0-1)
+ because it ships files previously shipped by that package; thanks to
+ Andreas Beckmann for reporting this (Closes: #717973).
+ - Let collectd-core / collectd suggest / recommend default-jre-headless
+ (cf. #683525).
+ * debian/collectd-core.collectd.init.d:
+ - Do not use different PID files for collectd and collectdmon. Else, a
+ process might be left-over after changing USE_COLLECTDMON and restarting
+ collectd. Thanks to Dennis Hoppe for reporting this (Closes: #704048).
+ * debian/collectd-core.templates, debian/po/:
+ - Fixed path-names of NEWS.Debian.gz and the migrate scripts; thanks to
+ Uli Martens for reporting this (Closes: #719292).
+ * debian/po/:
+ - Updated Italian debconf template translation; thanks to Beatrice
+ Torracca (Closes: #705869).
+ - Updated Japanese debconf template translation; thanks to 'victory'
+ (Closes: #715283).
+ * debian/collectd.conf:
+ - Recursively include all '*.conf' files in /etc/collectd/collectd.conf.d/
+ using the new 'Include' option's 'Filter' feature; thanks to Laurent
+ Bigonville for suggesting this change (Closes: #690668).
+
+ -- Sebastian Harl <tokkee@debian.org> Wed, 18 Sep 2013 13:26:58 +0200
+
+collectd (5.2.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ - Removed postgresql_writer_memleak.dpatch -- applied upstream.
+ * debian/collectd-utils.install:
+ - Install collectd-tg manpage.
+ * debian/control:
+ - Updated standards-version to 3.9.4 -- no changes.
+
+ -- Sebastian Harl <tokkee@debian.org> Wed, 30 Jan 2013 21:35:30 +0100
+
+collectd (5.2.0-2) experimental; urgency=low
+
+ * debian/patches:
+ - Added postgresql_writer_memleak.dpatch fixing a memory leak in the
+ PostgreSQL writer implementation.
+
+ -- Sebastian Harl <tokkee@debian.org> Thu, 29 Nov 2012 09:09:51 +0100
+
+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 <tokkee@debian.org> Tue, 20 Nov 2012 15:40:12 +0100
+
+collectd (5.1.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with perl 5.18: POD errors":
+ add patch pod-perl-5.18 that adds =encoding to some POD files.
+ (Closes: #708718)
+ * Fix "Transition package to use default java implementation":
+ apply modified patch from Ubuntu / James Page:
+ - switch build dependency from openjdk-6-jdk to default-jdk
+ - set JAVA_HOME to /usr/lib/jvm/default-java
+ - update lintian override accordingly
+ (Closes: #683525)
+
+ -- gregor herrmann <gregoa@debian.org> Sun, 26 May 2013 00:52:37 +0200
+
collectd (5.1.0-3+deb7u1) wheezy-security; urgency=high
* debian/patches/CVE-2016-6254.dpatch: Fix heap overflow in the network
index dc582e4fa433d931f4848eb27e6550f2ecc24d89..f18b994c316fbf57250db7ec0cd0ebd4a668fa30 100755 (executable)
USE_COLLECTDMON=1
COLLECTDMON_DAEMON=/usr/sbin/collectdmon
-COLLECTDMON_PIDFILE=/var/run/collectdmon.pid
MAXWAIT=30
ulimit -c unlimited
fi
-if test "$USE_COLLECTDMON" == 1; then
- _PIDFILE="$COLLECTDMON_PIDFILE"
-else
- _PIDFILE="$PIDFILE"
-fi
-
# return:
# 0 if config is fine
# 1 if there is a syntax error
fi
if test "$USE_COLLECTDMON" == 1; then
- start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
- --exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \
+ start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" \
+ --exec $COLLECTDMON_DAEMON -- -P "$PIDFILE" -- -C "$CONFIGFILE" \
|| return 2
else
- start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
- --exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE" \
+ start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" \
+ --exec $DAEMON -- -C "$CONFIGFILE" -P "$PIDFILE" \
|| return 2
fi
return 0
# 1 if the daemon was already stopped
# 2 if daemon could not be stopped
d_stop() {
- PID=$( cat "$_PIDFILE" 2> /dev/null ) || true
+ PID=$( cat "$PIDFILE" 2> /dev/null ) || true
- start-stop-daemon --stop --quiet --oknodo --pidfile "$_PIDFILE"
+ start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE"
rc="$?"
if test "$rc" -eq 2; then
esac
;;
status)
- status_of_proc -p "$_PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
+ status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
;;
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
index ec28843e0f0552c27f32b32d6479c9860ae54318..b67a020b31de6d002b9ef662d47ff8a29120068a 100644 (file)
# The "java" plugin uses libjvm.so which can only be found in a non-standard
# directory. According to the Java guys the path name and the ABI is stable
# though ...
-collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk-*
+collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/default-java/jre/lib/*/server
index cdeabe48b57c354aa31f2c528ee0dbe68000798a..43700cdb2756fcc257de2dbac527845be1932070 100755 (executable)
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+. /usr/share/debconf/confmodule
case "$1" in
purge)
index f8ab94f2e3bf52c5a8558ae2c3cb1eb7688f993d..02b301c13a8453324a91961ef9243204d276e582 100644 (file)
_Description: Layout of RRD files has changed
The layout of the RRD files created by collectd has changed significantly
since version 3.x. In order to keep your old data you have to migrate it.
- This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px.
+ This can be done by using /usr/lib/collectd/utils/migrate-3-4.px.
.
This step requires both the perl and the rrdtool packages to be installed,
which is currently not the case. You need to perform the migration manually.
.
- See /usr/share/doc/collectd-core/NEWS.Debian for details.
+ See /usr/share/doc/collectd-core/NEWS.Debian.gz for details.
Template: collectd/auto-migrate-3-4
Type: boolean
_Description: Automatically try to migrate your RRD files?
The layout of the RRD files created by collectd has changed significantly
since version 3.x. In order to keep your old data you have to migrate it.
- This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px.
+ This can be done by using /usr/lib/collectd/utils/migrate-3-4.px.
.
This step can be done automatically. In this case a backup of
/var/lib/collectd/ is made in /var/backups/. This script is still
experimental, though. Do not expect it to work in all cases.
.
- See /usr/share/doc/collectd-core/NEWS.Debian for details.
+ See /usr/share/doc/collectd-core/NEWS.Debian.gz for details.
Template: collectd/migration-4-5
Type: note
_Description: Layout of RRD files has changed in version 5.0
The layout of some RRD files created by collectd has changed since version
4.x. In order to keep your old data you have to migrate it. This can be done
- by using /usr/lib/collectd-core/utils/migrate-4-5.px.
+ by using /usr/lib/collectd/utils/migrate-4-5.px.
.
This step requires both the perl and the rrdtool packages to be installed,
which is currently not the case. You need to perform the migration manually.
.
- See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at
+ See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at
<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
Template: collectd/auto-migrate-4-5
_Description: Automatically try to migrate your RRD files?
The layout of some RRD files created by collectd has changed since version
4.x. In order to keep your old data you have to migrate it. This can be done
- by using /usr/lib/collectd-core/utils/migrate-4-5.px.
+ by using /usr/lib/collectd/utils/migrate-4-5.px.
.
This step can be done automatically. In this case a backup of
/var/lib/collectd/ is made in /var/backups/. This script is still
experimental, though. Do not expect it to work in all cases.
.
- See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at
+ See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at
<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
Template: collectd/postrm_purge_data
index ea6252fdeb8a5a0ed96526c2aa84d545a9bca670..5696e472171b4488e65f6b9ca4f636af6ab2c758 100644 (file)
src/liboconfig/oconfig.h usr/include/collectd/liboconfig
-src/*.h usr/include/collectd
+src/*.h usr/include/collectd/core
index f77c860d4bfa77b6e3b656f9dcd516260abdad58..9a7ad8fead57007d64b022f3e0544d1a56da4023 100644 (file)
usr/bin/collectdctl
usr/bin/collectd-nagios
+usr/bin/collectd-tg
usr/share/man/man1/collectdctl.1
usr/share/man/man1/collectd-nagios.1
+usr/share/man/man1/collectd-tg.1
diff --git a/debian/collectd.conf b/debian/collectd.conf
index 74770533ff16cd056a8311df3c48489c2e858e61..fe3125cd8151cc2898331b8b45dcd5333852da57 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
# You should also read /usr/share/doc/collectd-core/README.Debian.plugins
# before enabling any more plugins.
+##############################################################################
+# Global #
+#----------------------------------------------------------------------------#
+# Global settings for the daemon. #
+##############################################################################
+
#Hostname "localhost"
FQDNLookup true
#BaseDir "/var/lib/collectd"
#PluginDir "/usr/lib/collectd"
#TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
+
+#----------------------------------------------------------------------------#
+# When enabled, plugins are loaded automatically with the default options #
+# when an appropriate <Plugin ...> block is encountered. #
+# Disabled by default. #
+#----------------------------------------------------------------------------#
+#AutoLoadPlugin false
+
+#----------------------------------------------------------------------------#
+# Interval at which to query values. This may be overwritten on a per-plugin #
+# base by using the 'Interval' option of the LoadPlugin block: #
+# <LoadPlugin foo> #
+# Interval 60 #
+# </LoadPlugin> #
+#----------------------------------------------------------------------------#
#Interval 10
+
#Timeout 2
#ReadThreads 5
+#WriteThreads 5
+
+# Limit the size of the write queue. Default is no limit. Setting up a limit
+# is recommended for servers handling a high volume of traffic.
+#WriteQueueLimitHigh 1000000
+#WriteQueueLimitLow 800000
+
+##############################################################################
+# Logging #
+#----------------------------------------------------------------------------#
+# Plugins which provide logging functions should be loaded first, so log #
+# messages generated when loading or configuring other plugins can be #
+# accessed. #
+##############################################################################
#LoadPlugin logfile
LoadPlugin syslog
LogLevel info
</Plugin>
+##############################################################################
+# LoadPlugin section #
+#----------------------------------------------------------------------------#
+# Specify what features to activate. #
+##############################################################################
+
+#LoadPlugin aggregation
#LoadPlugin amqp
#LoadPlugin apache
#LoadPlugin apcups
#LoadPlugin ascent
LoadPlugin battery
#LoadPlugin bind
+#LoadPlugin cgroups
#LoadPlugin conntrack
#LoadPlugin contextswitch
LoadPlugin cpu
#LoadPlugin java
#LoadPlugin libvirt
LoadPlugin load
+#LoadPlugin lvm
#LoadPlugin madwifi
#LoadPlugin mbmon
#LoadPlugin md
#LoadPlugin memcachec
#LoadPlugin memcached
LoadPlugin memory
+#LoadPlugin modbus
#LoadPlugin multimeter
#LoadPlugin mysql
#LoadPlugin netlink
#LoadPlugin sensors
#LoadPlugin serial
#LoadPlugin snmp
+#LoadPlugin statsd
LoadPlugin swap
#LoadPlugin table
#LoadPlugin tail
+#LoadPlugin tail_csv
#LoadPlugin tcpconns
#LoadPlugin teamspeak2
#LoadPlugin ted
#LoadPlugin wireless
#LoadPlugin write_graphite
#LoadPlugin write_http
-#LoadPlugin write_mongodb
+#LoadPlugin write_riemann
+
+##############################################################################
+# 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. #
+##############################################################################
+
+#<Plugin "aggregation">
+# <Aggregation>
+# #Host "unspecified"
+# Plugin "cpu"
+# PluginInstance "/[0,2,4,6,8]$/"
+# Type "cpu"
+# #TypeInstance "unspecified"
+#
+# SetPlugin "cpu"
+# SetPluginInstance "even-%{aggregation}"
+#
+# GroupBy "Host"
+# GroupBy "TypeInstance"
+#
+# CalculateNum false
+# CalculateSum false
+# CalculateAverage true
+# CalculateMinimum false
+# CalculateMaximum false
+# CalculateStddev false
+# </Aggregation>
+#</Plugin>
#<Plugin amqp>
# <Publish "name">
#<Plugin apcups>
# Host "localhost"
# Port "3551"
+# ReportSeconds true
#</Plugin>
#<Plugin ascent>
# </View>
#</Plugin>
+#<Plugin "cgroups">
+# CGroup "libvirt"
+# IgnoreSelected false
+#</Plugin>
+
#<Plugin csv>
# DataDir "/var/lib/collectd/csv"
# StoreRates false
# SelectDB "custdb0"
# Query "num_of_customers"
# Query "..."
+# Host "..."
# </Database>
#</Plugin>
-#<Plugin df>
+<Plugin df>
# Device "/dev/sda1"
# Device "192.168.0.2:/mnt/nfs"
# MountPoint "/home"
# FSType "ext3"
-# IgnoreSelected false
+
+ # ignore rootfs; else, the root file-system would appear twice, causing
+ # one of the updates to fail and spam the log
+ FSType rootfs
+ # ignore the usual virtual / temporary file-systems
+ FSType sysfs
+ FSType proc
+ FSType devtmpfs
+ FSType devpts
+ FSType tmpfs
+ FSType fusectl
+ FSType cgroup
+ IgnoreSelected true
+
# ReportByDevice false
# ReportReserved false
# ReportInodes false
-#</Plugin>
+
+# ValuesAbsolute true
+# ValuesPercentage false
+</Plugin>
#<Plugin disk>
# Disk "hda"
#</Plugin>
#<Plugin memcached>
-# Socket "/var/run/memcached.sock"
+# <Instance "local">
+# Socket "/var/run/memcached.sock"
# or:
-# Host "127.0.0.1"
-# Port "11211"
+# Host "127.0.0.1"
+# Port "11211"
+# </Instance>
+#</Plugin>
+
+#<Plugin modbus>
+# <Data "data_name">
+# RegisterBase 1234
+# RegisterType float
+# Type gauge
+# Instance "..."
+# </Data>
+#
+# <Host "name">
+# Address "addr"
+# Port "1234"
+# Interval 60
+#
+# <Slave 1>
+# Instance "foobar" # optional
+# Collect "data_name"
+# </Slave>
+# </Host>
#</Plugin>
#<Plugin mysql>
# Host "localhost"
# Port 123
# ReverseLookups false
+# IncludeUnitID true
#</Plugin>
#<Plugin nut>
# </Result>
# </Query>
#
+# <Writer sqlstore>
+# # See /usr/share/doc/collectd-core/examples/postgresql/collectd_insert.sql for details
+# Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);"
+# StoreRates true
+# </Writer>
+#
# <Database foo>
# Host "hostname"
# Port 5432
# Query backend # predefined
# Query rt36_tickets
# </Database>
+#
+# <Database qux>
+# Service "collectd_store"
+# Writer sqlstore
+# # see collectd.conf(5) for details
+# CommitInterval 30
+# </Database>
#</Plugin>
#<Plugin powerdns>
# DaemonAddress "unix:/var/run/rrdcached.sock"
# DataDir "/var/lib/rrdcached/db/collectd"
# CreateFiles true
+# CreateFilesAsync false
# CollectStatistics true
+#
+# The following settings are rather advanced
+# and should usually not be touched:
+# StepSize 10
+# HeartBeat 20
+# RRARows 1200
+# RRATimespan 158112000
+# XFF 0.1
#</Plugin>
<Plugin rrdtool>
# CacheTimeout 120
# CacheFlush 900
# WritesPerSecond 30
+# CreateFilesAsync false
# RandomTimeout 0
#
# The following settings are rather advanced
# </Host>
#</Plugin>
+#<Plugin statsd>
+# Host "::"
+# Port "8125"
+# DeleteCounters false
+# DeleteTimers false
+# DeleteGauges false
+# DeleteSets false
+# TimerPercentile 90.0
+#</Plugin>
+
#<Plugin swap>
# ReportByDevice false
+# ReportBytes true
#</Plugin>
#<Plugin table>
# </File>
#</Plugin>
+#<Plugin "tail_csv">
+# <Metric "dropped">
+# Type "percent"
+# Instance "dropped"
+# ValueFrom 1
+# </Metric>
+# <Metric "mbps">
+# Type "bytes"
+# Instance "wire-realtime"
+# ValueFrom 2
+# </Metric>
+# <Metric "alerts">
+# Type "alerts_per_second"
+# ValueFrom 3
+# </Metric>
+# <Metric "kpps">
+# Type "kpackets_wire_per_sec.realtime"
+# ValueFrom 4
+# </Metric>
+# <File "/var/log/snort/snort.stats">
+# Instance "snort-eth0"
+# Interval 600
+# Collect "dropped" "mbps" "alerts" "kpps"
+# TimeFrom 0
+# </File>
+#</Plugin>
+
#<Plugin tcpconns>
# ListeningPorts false
# LocalPort "25"
# <Instance>
# CollectCache true
# CollectBackend true
+# CollectBan false # Varnish 3 only
# CollectConnections true
+# CollectDirectorDNS false # Varnish 3 only
# CollectSHM true
# CollectESI false
# CollectFetch false
# CollectHCB false
-# CollectSMA false
+# CollectObjects false
+# CollectPurge false # Varnish 2 only
+# CollectSession false
+# CollectSMA false # Varnish 2 only
# CollectSMS false
-# CollectSM false
+# CollectSM false # Varnish 2 only
+# CollectStruct false
# CollectTotals false
+# CollectUptime false
+# CollectdVCL false
# CollectWorkers false
# </Instance>
#
#</Plugin>
#<Plugin write_graphite>
-# <Carbon>
+# <Node "example">
# Host "localhost"
# Port "2003"
+# Protocol "tcp"
+# LogSendErrors true
# Prefix "collectd"
# Postfix "collectd"
-# StoreRates false
+# StoreRates true
# AlwaysAppendDS false
# EscapeCharacter "_"
-# </Carbon>
+# </Node>
#</Plugin>
#<Plugin write_http>
# </URL>
#</Plugin>
-#<Plugin write_mongodb>
+#<Plugin write_riemann>
# <Node "example">
# Host "localhost"
-# Port "27017"
-# Timeout 1000
-# StoreRates false
-# <Node>
+# Port 5555
+# Protocol UDP
+# StoreRates true
+# AlwaysAppendDS false
+# TTLFactor 2.0
+# </Node>
+# Tag "foobar"
#</Plugin>
-Include "/etc/collectd/filters.conf"
-Include "/etc/collectd/thresholds.conf"
+<Include "/etc/collectd/collectd.conf.d">
+ Filter "*.conf"
+</Include>
index 9ae1c89f5f7b763ec88ded7d6258be623cfb5da9..9947c7e328fcb93a83f729669a8af90d7383d987 100644 (file)
--- a/debian/collectd.install
+++ b/debian/collectd.install
../collectd.conf etc/collectd/
-../thresholds.conf ../filters.conf etc/collectd/
+../thresholds.conf ../filters.conf etc/collectd/collectd.conf.d/
diff --git a/debian/control b/debian/control
index 7d587f1f835a2b489d82d834eb329a179d925921..5aec6a6d0658d0983a2b8fbc73b1a165013184a1 100644 (file)
--- a/debian/control
+++ b/debian/control
Maintainer: Sebastian Harl <tokkee@debian.org>
Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
bison, flex, autotools-dev, libltdl-dev, pkg-config,
- iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-any !hurd-any],
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
+ kfreebsd-kernel-headers [kfreebsd-any],
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
libesmtp-dev,
libganglia1-dev (>= 3) [linux-any],
libgcrypt11-dev,
libglib2.0-dev,
- libhal-dev,
libkvm-dev [kfreebsd-any],
+ liblvm2-dev [linux-any],
libmemcached-dev,
libmodbus-dev,
+ libmnl-dev [linux-any],
libmysqlclient-dev,
libnotify-dev,
libopenipmi-dev,
liboping-dev (>= 0.3.3),
+ libow-dev,
libpcap0.8-dev | libpcap-dev,
libperl-dev,
libpq-dev,
- libprotobuf-c0-dev,
+ libprotobuf-c-dev,
librabbitmq-dev,
librrd-dev (>= 1.4~),
libsensors4-dev [linux-any],
+# libsigrok-dev (>= 0.2~),
# libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
libtokyocabinet-dev [linux-any],
libtokyotyrant-dev [linux-any],
- libupsclient1-dev,
- libvarnish-dev,
+ libupsclient-dev | libupsclient1-dev,
+# libvarnishapi-dev,
libvirt-dev (>= 0.4.0-6) [linux-any],
libxml2-dev,
libyajl-dev,
linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
- openjdk-6-jdk [!hppa !kfreebsd-any !hurd-any],
+ default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
protobuf-c-compiler,
python-dev
-Build-Conflicts: libpthread-dev
-Standards-Version: 3.9.3
+Build-Conflicts: libpthread-dev, libhal-dev
+Standards-Version: 3.9.5
Homepage: http://collectd.org/
Vcs-Git: git://git.tokkee.org/pkg-collectd.git
Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
apache2, apcupsd, bind9, hddtemp, iptables, ipvsadm, lm-sensors, mbmon,
memcached, mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
pdns-server, postgresql, time-daemon,
- ${shlibs:Suggests}
+ ${shlibs:Suggests}, default-jre-headless
Replaces: collectd (<< 4.8.2-1~)
Description: statistics collection and monitoring daemon (core system)
collectd is a small daemon which collects system information periodically and
* Ascent server statistics: ascent
* battery status: battery
* bind9 name-server and zone statistics: bind
+ * CGroups resource usage: cgroups
* connection tracking table size: conntrack
* number of context switches done by the operating system: contextswitch
* CPU utilization: cpu
* CPU, disk, network statistics of guest systems: libvirt
* system load averages: load
* logging to files, STDOUT and STDERR: logfile
+ * Logical Volume Manager usage: lvm
* Atheros wireless LAN chipset statistics: madwifi
* motherboard monitor: mbmon
* Query and parse data from a memcache daemon: memcachec
* lm_sensors information (e.g. CPU temperature, fan speeds): sensors
* serial port traffic: serial
* values from SNMP enabled network devices: snmp
+ * aggregate values received with the StatsD protocol: statsd
* swap usage: swap
* logging to syslog: syslog
* parse table-like structured files: table
* incremental parsing of logfiles: tail
+ * incremental parsing of CSV files: tail_csv
* number of TCP connections to specific ports: tcpconns
* TeamSpeak2 server statistics: teamspeak2
* power consumption measurements from "The Energy Detective" (TED): ted
* detailed virtual memory statistics: vmem
* system resources used by Linux-VServers: vserver
* wireless network stats: wireless
+ * send collected values to a graphite server: write_graphite
* send collected values to a web-server: write_http
+ * send collected values to a riemann server: write_riemann
Package: collectd
Architecture: any
Depends: collectd-core, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${shlibs:Recommends}
+Recommends: ${shlibs:Recommends}, default-jre-headless
Description: statistics collection and monitoring daemon
collectd is a small daemon which collects system information periodically and
provides mechanisms to monitor and store the values in a variety of ways.
Priority: extra
Depends: collectd-core (= ${binary:Version}), ${misc:Depends}
Recommends: collectd-utils (= ${binary:Version}),
- libcollectdclient0 (= ${binary:Version})
+ libcollectdclient1 (= ${binary:Version})
Description: statistics collection and monitoring daemon (debugging symbols)
collectd is a small daemon which collects system information periodically and
provides mechanisms to monitor and store the values in a variety of ways.
Package: collectd-dev
Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.2~),
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.5~),
${misc:Depends}
Description: statistics collection and monitoring daemon (development files)
collectd is a small daemon which collects system information periodically and
Package: libcollectdclient-dev
Section: libdevel
Architecture: any
-Depends: libcollectdclient0 (= ${binary:Version}), ${misc:Depends}
+Depends: libcollectdclient1 (= ${binary:Version}), ${misc:Depends}
+Replaces: collectd-dev (<< 5.2.0-1)
+Breaks: collectd-dev (<< 5.2.0-1)
Description: client library for collectd's control interface (development files)
libcollectdclient provides an API to access the control interface provided by
the unixsock plugin of collectd, a statistics collection and monitoring
@@ -248,7 +259,7 @@ Description: client library for collectd's control interface (development files)
.
This package contains the header files and the static library.
-Package: libcollectdclient0
+Package: libcollectdclient1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index 97e46db7a246c4bc5cc792cbfddfdf6eb186e4d7..9d49570b43d681c756c25e0b7e574939763c438a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
Copyright Holders (in alphabetical order):
Adrian Perez <aperez@igalia.com>
Alessandro Iurlano <alessandro.iurlano@gmail.com>
+ Alex Deymo
Alexander Wirt <formorer@formorer.de>
Américo Monteiro
Amit Gupta <amit.gupta221@gmail.com>
Andre M. Hedrick <andre@suse.com>
+ Andreas Henriksson <andreas@fatal.se>
Andrés J. Díaz <ajdiaz at connectical.com>
Anthony Dewhurst <dewhurst@gmail>
Anthony Gialluca <tonyabg@charter.net>
Antony Dovgal <tony@daylessday.org>
+ Battelle Memorial Institute
+ Bert Vermeulen <bert@biot.com>
Bruno Prémont <bonbons@linux-vserver.org>
- C-Ware, Inc.
+ Chad Malfait <malfaitc@yahoo.com>
Clay Loveless <clay@killersoft.com>
Clément Stenac <clement.stenac@diwi.org>
+ Cosmin Ioiart <cioiart@gmail.com>
+ C-Ware, Inc.
Cyril Feraudet <cyril@feraudet.com>
David Bacher <drbacher@gmail.com>
Doug MacEachern <dougm@hyperic.com>
Jacobo Tarrio <jtarrio@debian.org>
Jason Pepas <cell@ices.utexas.edu>
Jeff Green <jeff@kikisoso.org>
+ Jérôme Renard <jerome.renard@gmail.com>
Joe Dalton <joedalton2@yahoo.dk>
Jonathan Kolb <jon@b0g.us>
Jorge Barreiro <yortx.barry@gmail.com>
Justo Alonso Achaques <justo.alonso@gmail.com>
Kai Wasserbäch <debian@carbon-project.org>
Kern Sibbald
+ Kris Nielander <nielander@fox-it.com>
Lubos Stanek <lubek@users.sourceforge.net>
Lyonel Vincent <lyonel@ezix.org>
Manuel Sanmartin
+ Marc Fournier <marc.fournier@camptocamp.com>
Marco Chiappero <marco@absence.it>
Mariusz Gronczewski <xani666@gmail.com>
Martin Bagge <brother@bsnet.se>
Michał Mirosław <mirq-linux@rere.qmqm.pl>
Mirko Buffoni <briareos@eswat.org>
Netfilter Core Team
+ Nicolas Szalay
Niki W. Waibel <niki.waibel@newlogic.com>
noris network AG
Novell Inc.
Peter Holik <peter@holik.at>
Peter Kese <peter.kese@ijs.si>
Phoenix Kayo <kayo.k11.4@gmail.com>
+ Pierre-Yves Ritschard <pyr@openbsd.org>
Red Hat Inc.
Rodolphe Quiédeville <rquiedeville@bearstech.com>
Scott Garrett <sgarrett@technomancer.com>
Simon Kuhnle <simon@blarzwurst.de>
Sjoerd van der Berg <harekiet@users.sourceforge.net>
Stefan Hacker <d0t@dbclan.de>
+ Stefan Rinkes <stefan.rinkes@gmail.org>
Stefan Völkel <bd@bc-bd.org>
Steven Clarke <steven@monmouth.demon.co.uk>
Sven Trenkel <collectd@semidefinite.de>
Vincent Stehlé <vincent.stehle@free.fr>
Wensong Zhang <wensong@linuxvirtualserver.org>
Wouter Gadeyne
+ Xin Li <delphij@FreeBSD.org>
Yuri Kozlov <yuray@komyakino.ru>
Licenses:
contrib/examples/MyPlugin.pm
contrib/examples/myplugin.c
contrib/cussh.pl
- src/libcollectdclient/lcc_features.h
- src/libcollectdclient/lcc_features.h.in
src/collectdmon.c
src/collectdmon.pod
src/email.c
src/zfs_arc.c
Copyright © 2009 Anthony Dewhurst <dewhurst@gmail>
Copyright © 2012 Aurelien Rougemont
+ Copyright © 2013 Xin Li <delphij@FreeBSD.org>
License: GNU General Public License
File contrib/network-proxy.py
Copyright © 2009 Amit Gupta <amit.gupta221@gmail.com>
License: GNU General Public License
+ File src/aquaero.c
+ Copyright © 2013 Alex Deymo
+ License: GNU General Public License
+
File src/apcups.c
- Copyright © 2006-2007 Florian Forster <octo@verplant.org>
+ Copyright © 2006-2012 Florian Forster <octo@verplant.org>
Copyright © 2006 Anthony Gialluca <tonyabg@charter.net>
Copyright © 2000-2004 Kern Sibbald
Copyright © 1996-1999 Andre M. Hedrick <andre@suse.com>
Copyright © 2009,2010 Florian Forster <octo@verplant.org>
License: GNU General Public License
+ File src/cgroups.c
+ Copyright © 2011 Michael Stapelberg <michael@stapelberg.de>
+ Copyright © 2013 Florian Forster <octo@collectd.org>
+ License: GNU General Public License
+
Files src/collectd-perl.pod
src/logfile.c
src/match_regex.c
src/utils_complain.c
src/utils_complain.h
src/vserver.c
- Copyright © 2006-2009 Florian Forster
+ Copyright © 2006-2013 Florian Forster
Copyright © 2006-2009 Sebastian Harl
License: GNU General Public License
Files src/csv.c
src/curl_json.c
- Copyright © 2006-2011 Florian Forster <octo@verplant.org>
+ Copyright © 2006-2013 Florian Forster <octo@verplant.org>
Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
License: GNU General Public License
Files src/disk.c
src/interface.c
src/load.c
- Copyright © 2005-2008 Florian Forster <octo@verplant.org>
+ Copyright © 2005-2012 Florian Forster <octo@verplant.org>
Copyright © 2009 Manuel Sanmartin
License: GNU General Public License
Copyright © 2006-2008 Red Hat Inc.
License: GNU General Public License
+ File src/lvm.c
+ Copyright © 2013 Chad Malfait <malfaitc@yahoo.com>
+ License: GNU General Public License
+
File src/madwifi.c
Copyright © 2009 Ondrej 'SanTiago' Zajicek <santiago@crfreenet.org>
License: GNU General Public License
File src/memcached.c
Copyright © 2007 Antony Dovgal
- Copyright © 2007-2009 Florian Forster <octo@verplant.org>
+ Copyright © 2007-2012 Florian Forster <octo@verplant.org>
Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
- Copyright © Franck Lombardi
+ Copyright © 2009 Franck Lombardi
+ Copyright © 2012 Nicolas Szalay
License: GNU General Public License
File src/memory.c
Copyright © 2009 Manuel Sanmartin
License: GNU General Public License
+ File src/mic.c
+ Copyright © 2013 Battelle Memorial Institute
+ Author: Evan Felix <evan.felix@pnnl.gov>
+ License: GNU General Public License
+
File src/modbus.c
Copyright © 2010-2011 noris network AG
Author: Florian Forster <octo@noris.net>
Copyright © 2009 Rodolphe Quiédeville <rquiedeville@bearstech.com>
License: GNU General Public License
+ File src/netlink.c
+ Copyright © 2007-2010 Florian 'octo' Forster <octo@collectd.org>
+ Copyright © 2008-2012 Sebastian Harl <sh@tokkee.org>
+ Copyright © 2013 Andreas Henriksson <andreas@fatal.se>
+ Copyright © 2013 Marc Fournier <marc.fournier@camptocamp.com>
+ License: GNU General Public License
+
File src/nfs.c
Copyright © 2005, 2006 Jason Pepas <cell@ices.utexas.edu>
+ Copyright © 2012, 2013 Florian octo Forster <octo@collectd.org>
License: GNU General Public License
File src/notify_email.c
Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
Copyright © 2009 Manuel Sanmartin
Copyright © 2010 Clément Stenac <clement.stenac@diwi.org>
+ Copyright © 2012 Cosmin Ioiart <cioiart@gmail.com>
License: GNU General Public License
File src/rrdtool.c
- Copyright © 2006-2008 Florian Forster <octo@verplant.org>
+ Copyright © 2006-2013 Florian Forster <octo@verplant.org>
Copyright © 2008 Sebastian Harl <sh@tokkee.org>
Copyright © 2009 Mariusz Gronczewski <xani666@gmail.com>
License: GNU General Public License
Copyright © 2005, 2006 David Bacher <drbacher@gmail.com>
License: GNU General Public License
+ File src/sigrok.c
+ Copyright © 2013 Bert Vermeulen <bert@biot.com>
+ License: GNU General Public License
+
File src/swap.c
- Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+ Copyright © 2005-2012 Florian Forster <octo@verplant.org>
Copyright © 2009 Stefan Völkel <bd@bc-bd.org>
Copyright © 2009 Manuel Sanmartin
License: GNU General Public License
+ File src/tail_csv.c
+ Copyright © 2013 Kris Nielander <nielander@fox-it.com>
+ Copyright © 2013 Florian Forster <octo@collectd.org>
+ License: GNU General Public License
+
File src/tape.c
Copyright © 2005, 2006 Scott Garrett <sgarrett@technomancer.com>
License: GNU General Public License
Copyright © 2008 Oleg King <king2@kaluga.ru>
License: GNU General Public License
+ File src/utils_format_graphite.c
+ Copyright © 2012 Thomas Meson <zllak@hycik.org>
+ Copyright © 2012 Florian octo Forster <octo@collectd.org>
+ License: GNU General Public License
+
+ File src/utils_format_graphite.h
+ Copyright © 2012 Thomas Meson <zllak@hycik.org>
+ License: GNU General Public License
+
File src/utils_ignorelist.c
Copyright © 2006 Lubos Stanek <lubek@users.sourceforge.net>
Copyright © 2008 Florian Forster <octo@verplant.org>
Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
License: GNU General Public License
+ File src/varnish.c
+ Copyright © 2010 Jérôme Renard
+ Copyright © 2010 Marc Fournier
+ Copyright © 2010-2012 Florian Forster
+ License: GNU General Public License
+
File src/write_graphite.c
Copyright © 2009 Paul Sadauskas
Copyright © 2009 Doug MacEachern
Copyright © 2011 Scott Sanders
Copyright © 2012 Pierre-Yves Ritschard
- Copyright © 2007-2012 Florian octo Forster
+ Copyright © 2007-2013 Florian octo Forster
License: GNU General Public License
File src/write_http.c
License: GNU General Public License
File src/write_mongodb.c
- Copyright © 2010-2012 Florian Forster
+ Copyright © 2010-2013 Florian Forster
Copyright © 2010 Akkarit Sangpetch
Copyright © 2012 Chris Lundquist
- All other files (except libltdl/*, src/network.c, src/postgresql.c,
- src/utils_dns.* and contrib/SpamAssassin/*):
- Copyright © 2005-2012 Florian Forster <octo@verplant.org>
+ All other files (except otherwise listed):
+ Copyright © 2005-2013 Florian Forster <octo@verplant.org>
License: GNU General Public License
This package is free software; you can redistribute it and/or modify
3. This notice may not be removed or altered from any source distribution.
Files libltdl/* (except libltdl/m4/*)
- Copyright © 1998-2010 Free Software Foundation, Inc.
+ Copyright © 1998-2011 Free Software Foundation, Inc.
License: GNU Lesser General Public License
File src/network.c
- Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+ Copyright © 2005-2013 Florian Forster <octo@verplant.org>
Copyright © 2009 Aman Gupta <aman@tmm1.net>
License: GNU Lesser General Public License
DEALINGS IN THE SOFTWARE.
Files libltdl/m4/*
- Copyright © 1996-2009 Free Software Foundation, Inc.
+ Copyright © 1996-2011 Free Software Foundation, Inc.
This file is free software; the Free Software Foundation gives
unlimited permission to copy and/or distribute it, with or without
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+ File contrib/postgresql/collectd_insert.sql
+ Copyright © 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ License: 2-clause BSD License
+
File src/postgresql.c
- Copyright © 2008-2009 Sebastian Harl <sh@tokkee.org>
+ Copyright © 2008-2012 Sebastian Harl <sh@tokkee.org>
Copyright © 2009 Florian Forster <octo@verplant.org>
License: 2-clause BSD License
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+ File src/amqp.c
+ Copyright © 2009 Sebastien Pahl <sebastien.pahl@dotcloud.com>
+ Copyright © 2010-2012 Florian Forster <octo@verplant.org>
+ License: MIT License
+
Files src/collectd-python.pod
src/cpython.h
- src/netapp.c
src/pyconfig.c
src/python.c
src/pyvalues.c
- Copyright © 2009 Sven Trenkel <collectd@semidefinite.de>
+ Copyright © 2009-2010 Sven Trenkel <collectd@semidefinite.de>
License: MIT License
- File src/amqp.c
- Copyright © 2009 Sebastien Pahl <sebastien.pahl@dotcloud.com>
- Copyright © 2010-2012 Florian Forster <octo@verplant.org>
+ Files src/libcollectdclient/collectd/lcc_features.h
+ src/libcollectdclient/collectd/lcc_features.h.in
+ Copyright © 2009 Sebastian Harl <sh@tokkee.org>
+ License: MIT License
+
+ File src/netapp.c
+ Copyright © 2009-2010 Sven Trenkel <collectd@semidefinite.de>
+ Copyright © 2012-2013 teamix GmbH
+ License: MIT License
+
+ Other files in src/libcollectdclient/ and src/utils_random.*
+ Copyright © 2005-2013 Florian octo Forster <octo@verplant.org>
License: MIT License
Permission is hereby granted, free of charge, to any person obtaining a
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+ File src/pf.c
+ Copyright © 2010 Pierre-Yves Ritschard <pyr@openbsd.org>
+ Copyright © 2011 Stefan Rinkes <stefan.rinkes@gmail.org>
+
+ Files src/statsd.c
+ src/utils_latency.c
+ src/utils_latency.h
+ Copyright © 2013 Florian 'octo' Forster <octo@collectd.org>
+
+ File src/write_riemann.c
+ Copyright © 2012, 2013 Pierre-Yves Ritschard <pyr@spootnik.org>
+ Copyright © 2013 Florian octo Forster <octo@collectd.org>
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
Files contrib/SpamAssassin/*
Copyright © 2006 Alexander Wirt <formorer@formorer.de>
index 6cad707ff6203f0c4ae1373be9ce16b01bea5f95..60cf2bdea8dc85792f83f34e2eb25fedb08d2d8f 100644 (file)
usr/include/collectd/client.h usr/include/collectd
usr/include/collectd/lcc_features.h usr/include/collectd
+usr/include/collectd/network.h usr/include/collectd
+usr/include/collectd/network_buffer.h usr/include/collectd
usr/lib/pkgconfig/libcollectdclient.pc
usr/lib/libcollectdclient.so
diff --git a/debian/libcollectdclient0.install b/debian/libcollectdclient0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcollectdclient.so.*
-
diff --git a/debian/libcollectdclient0.symbols b/debian/libcollectdclient0.symbols
+++ /dev/null
@@ -1,14 +0,0 @@
-libcollectdclient.so.0 libcollectdclient0 #MINVER#
- lcc_connect@Base 4.6.0
- lcc_disconnect@Base 4.6.0
- lcc_flush@Base 4.6.0
- lcc_getval@Base 4.6.0
- lcc_identifier_to_string@Base 4.6.0
- lcc_listval@Base 4.6.0
- lcc_putval@Base 4.6.0
- lcc_sort_identifiers@Base 5.1.0
- lcc_strerror@Base 4.6.0
- lcc_string_to_identifier@Base 4.6.0
- lcc_version@Base 4.6.0
- lcc_version_extra@Base 4.6.0
- lcc_version_string@Base 4.6.0
diff --git a/debian/libcollectdclient1.install b/debian/libcollectdclient1.install
--- /dev/null
@@ -0,0 +1,2 @@
+usr/lib/libcollectdclient.so.*
+
diff --git a/debian/libcollectdclient1.symbols b/debian/libcollectdclient1.symbols
--- /dev/null
@@ -0,0 +1,29 @@
+libcollectdclient.so.1 libcollectdclient1 #MINVER#
+ lcc_connect@Base 4.6.0
+ lcc_disconnect@Base 4.6.0
+ lcc_flush@Base 4.6.0
+ lcc_getval@Base 4.6.0
+ lcc_identifier_compare@Base 5.2.0
+ lcc_identifier_to_string@Base 4.6.0
+ lcc_listval@Base 4.6.0
+ lcc_network_buffer_add_value@Base 5.2.0
+ lcc_network_buffer_create@Base 5.2.0
+ lcc_network_buffer_destroy@Base 5.2.0
+ lcc_network_buffer_finalize@Base 5.2.0
+ lcc_network_buffer_get@Base 5.2.0
+ lcc_network_buffer_initialize@Base 5.2.0
+ lcc_network_buffer_set_security_level@Base 5.2.0
+ lcc_network_create@Base 5.2.0
+ lcc_network_destroy@Base 5.2.0
+ lcc_network_values_send@Base 5.2.0
+ lcc_putval@Base 4.6.0
+ lcc_server_create@Base 5.2.0
+ lcc_server_destroy@Base 5.2.0
+ lcc_server_set_security_level@Base 5.2.0
+ lcc_server_set_ttl@Base 5.2.0
+ lcc_sort_identifiers@Base 5.1.0
+ lcc_strerror@Base 4.6.0
+ lcc_string_to_identifier@Base 4.6.0
+ lcc_version@Base 4.6.0
+ lcc_version_extra@Base 4.6.0
+ lcc_version_string@Base 4.6.0
diff --git a/debian/patches/00list b/debian/patches/00list
index 1e263d1ac3b03213cf0da32b07c28d8edd27d48a..6a4b44179a27b0a0f010445fb8cc961c5fcf03d0 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
bts832577-gcry-control.dpatch
rrd_filter_path.dpatch
collection_conf_path.dpatch
+collection.cgi.dpatch
+myplugin_includes.dpatch
+myplugin_api.dpatch
bts559801_plugin_find_fix.dpatch
-rtnl_dump_filter.dpatch
-migrate-4-5-df.dpatch
+bts770681_riemann_ack.dpatch
+bts747093_lvm_segfault.dpatch
+bts770683_curl_init.dpatch
+bts750440_config_segfault.dpatch
+bts770688_snmp_memleak.dpatch
+bts770690_java_jni_thread_detach.dpatch
+bts770693_timestamps.dpatch
+bts770694_loglevel.dpatch
diff --git a/debian/patches/bts747093_lvm_segfault.dpatch b/debian/patches/bts747093_lvm_segfault.dpatch
--- /dev/null
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: bts747093_lvm_segfault.dpatch by Jan Kundrát <jan.kundrat@cesnet.cz>
+## DP:
+## DP: lvm: Fix segfault when there are no logical volumes.
+## DP:
+## DP: Upstream bug report:
+## DP: https://github.com/collectd/collectd/issues/558
+## DP:
+## DP: Upstream commit:
+## DP: https://github.com/jktjkt/collectd/commit/40dde67
+
+@DPATCH@
+
+diff a/src/lvm.c b/src/lvm.c
+--- a/src/lvm.c
++++ b/src/lvm.c
+@@ -53,6 +53,11 @@ static int vg_read(vg_t vg, char const *vg_name)
+ lvm_submit (vg_name, "free", lvm_vg_get_free_size(vg));
+
+ lvs = lvm_vg_list_lvs(vg);
++ if (!lvs) {
++ /* no VGs are defined, which is not an error per se */
++ return (0);
++ }
++
+ dm_list_iterate_items(lvl, lvs) {
+ lvm_submit(vg_name, lvm_lv_get_name(lvl->lv), lvm_lv_get_size(lvl->lv));
+ }
diff --git a/debian/patches/bts750440_config_segfault.dpatch b/debian/patches/bts750440_config_segfault.dpatch
--- /dev/null
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts750440_config_segfault.dpatch by Wilfried Goesgens <dothebart@citadel.org>
+##
+## DP: Fixed a segfault when handling/including empty config files.
+## DP:
+## DP: Correctly handle the case of empty "children" nodes.
+## DP:
+## DP: Upstream bug report:
+## DP: https://github.com/collectd/collectd/issues/638
+## DP:
+## DP: Upstream commit:
+## DP: https://github.com/dothebart/collectd/commit/2923883
+
+@DPATCH@
+
+diff a/src/configfile.c b/src/configfile.c
+--- a/src/configfile.c
++++ b/src/configfile.c
+@@ -414,6 +414,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
+
+ /* Resize the memory containing the children to be big enough to hold
+ * all children. */
++ if (dst->children_num + src->children_num - 1 == 0)
++ {
++ dst->children_num = 0;
++ return (0);
++ }
++
+ temp = (oconfig_item_t *) realloc (dst->children,
+ sizeof (oconfig_item_t)
+ * (dst->children_num + src->children_num - 1));
+@@ -514,7 +520,8 @@ static int cf_include_all (oconfig_item_t *root, int depth)
+ continue;
+
+ /* Now replace the i'th child in `root' with `new'. */
+- cf_ci_replace_child (root, new, i);
++ if (cf_ci_replace_child (root, new, i) < 0)
++ return (-1);
+
+ /* ... and go back to the new i'th child. */
+ --i;
diff --git a/debian/patches/bts770681_riemann_ack.dpatch b/debian/patches/bts770681_riemann_ack.dpatch
--- /dev/null
@@ -0,0 +1,171 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts770681_riemann_ack.dpatch by John-John Tedro <udoprog@spotify.com>
+##
+## DP: write_riemann plugin: Receive acknowledge message when using TCP.
+## DP:
+## DP: Not receiving an acknowledge message when communicating with riemann
+## DP: over TCP will cause the riemann instance to eventually hang for
+## DP: extended periods of time because of resource exhaustion.
+## DP:
+## DP: Upstream bug report:
+## DP: https://github.com/collectd/collectd/pull/425
+## DP:
+## DP: Upstream commit:
+## DP: https://github.com/spotify/collectd/commit/78c0678
+
+@DPATCH@
+
+diff a/src/write_riemann.c b/src/write_riemann.c
+--- a/src/write_riemann.c
++++ b/src/write_riemann.c
+@@ -176,32 +176,30 @@ riemann_disconnect (struct riemann_host *host)
+ return (0);
+ }
+
+-static int
+-riemann_send(struct riemann_host *host, Msg const *msg)
++static inline int
++riemann_send_msg(struct riemann_host *host, const Msg *msg)
+ {
+- u_char *buffer;
++ int status = 0;
++ u_char *buffer = NULL;
+ size_t buffer_len;
+- int status;
+-
+- pthread_mutex_lock (&host->lock);
+
+ status = riemann_connect (host);
++
+ if (status != 0)
+- {
+- pthread_mutex_unlock (&host->lock);
+ return status;
+- }
+
+ buffer_len = msg__get_packed_size(msg);
++
+ if (host->use_tcp)
+ buffer_len += 4;
+
+ buffer = malloc (buffer_len);
++
+ if (buffer == NULL) {
+- pthread_mutex_unlock (&host->lock);
+ ERROR ("write_riemann plugin: malloc failed.");
+ return ENOMEM;
+ }
++
+ memset (buffer, 0, buffer_len);
+
+ if (host->use_tcp)
+@@ -216,26 +214,105 @@ riemann_send(struct riemann_host *host, Msg const *msg)
+ }
+
+ status = (int) swrite (host->s, buffer, buffer_len);
++
+ if (status != 0)
+ {
+ char errbuf[1024];
+
+- riemann_disconnect (host);
+- pthread_mutex_unlock (&host->lock);
+-
+ ERROR ("write_riemann plugin: Sending to Riemann at %s:%s failed: %s",
+ (host->node != NULL) ? host->node : RIEMANN_HOST,
+ (host->service != NULL) ? host->service : RIEMANN_PORT,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
++
+ sfree (buffer);
+ return -1;
+ }
+
+- pthread_mutex_unlock (&host->lock);
+ sfree (buffer);
+ return 0;
+ }
+
++static inline int
++riemann_recv_ack(struct riemann_host *host)
++{
++ int status = 0;
++ Msg *msg = NULL;
++ uint32_t header;
++
++ status = (int) sread (host->s, &header, 4);
++
++ if (status != 0)
++ return -1;
++
++ size_t size = ntohl(header);
++
++ // Buffer on the stack since acknowledges are typically small.
++ u_char buffer[size];
++ memset (buffer, 0, size);
++
++ status = (int) sread (host->s, buffer, size);
++
++ if (status != 0)
++ return status;
++
++ msg = msg__unpack (NULL, size, buffer);
++
++ if (msg == NULL)
++ return -1;
++
++ if (!msg->ok)
++ {
++ ERROR ("write_riemann plugin: Sending to Riemann at %s:%s acknowledgement message reported error: %s",
++ (host->node != NULL) ? host->node : RIEMANN_HOST,
++ (host->service != NULL) ? host->service : RIEMANN_PORT,
++ msg->error);
++
++ msg__free_unpacked(msg, NULL);
++ return -1;
++ }
++
++ msg__free_unpacked (msg, NULL);
++ return 0;
++}
++
++/**
++ * Function to send messages (Msg) to riemann.
++ *
++ * Acquires the host lock, disconnects on errors.
++ */
++static int
++riemann_send(struct riemann_host *host, Msg const *msg)
++{
++ int status = 0;
++ pthread_mutex_lock (&host->lock);
++
++ status = riemann_send_msg(host, msg);
++
++ if (status != 0) {
++ riemann_disconnect (host);
++ pthread_mutex_unlock (&host->lock);
++ return status;
++ }
++
++ /*
++ * For TCP we need to receive message acknowledgemenent.
++ */
++ if (host->use_tcp)
++ {
++ status = riemann_recv_ack(host);
++
++ if (status != 0)
++ {
++ riemann_disconnect (host);
++ pthread_mutex_unlock (&host->lock);
++ return status;
++ }
++ }
++
++ pthread_mutex_unlock (&host->lock);
++ return 0;
++}
++
+ static int riemann_event_add_tag (Event *event, char const *tag) /* {{{ */
+ {
+ return (strarray_add (&event->tags, &event->n_tags, tag));
diff --git a/debian/patches/bts770683_curl_init.dpatch b/debian/patches/bts770683_curl_init.dpatch
--- /dev/null
@@ -0,0 +1,95 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts770683_curl_init.dpatch by Jeremy Katz <jeremy@katzbox.net>
+##
+## DP: Call curl_global_init() in _init of plugins using curl.
+## DP:
+## DP: curl_global_init() or curl_easy_init() has to be called in the init
+## DP: callback of plugins using curl while collectd still runs single
+## DP: threaded. Else, collectd may crash with a segfault due to concurrent
+## DP: memory access by curl.
+## DP:
+## DP: Upstream bug report:
+## DP: https://github.com/collectd/collectd/issues/526
+## DP:
+## DP: Upstream commits:
+## DP: https://github.com/katzj/collectd/commit/401fa6e
+
+@DPATCH@
+
+diff a/src/curl.c b/src/curl.c
+--- a/src/curl.c
++++ b/src/curl.c
+@@ -569,6 +569,7 @@ static int cc_init (void) /* {{{ */
+ INFO ("curl plugin: No pages have been defined.");
+ return (-1);
+ }
++ curl_global_init (CURL_GLOBAL_SSL);
+ return (0);
+ } /* }}} int cc_init */
+
+diff a/src/curl_json.c b/src/curl_json.c
+--- a/src/curl_json.c
++++ b/src/curl_json.c
+@@ -957,9 +957,18 @@ static int cj_read (user_data_t *ud) /* {{{ */
+ return cj_perform (db);
+ } /* }}} int cj_read */
+
++static int cj_init (void) /* {{{ */
++{
++ /* Call this while collectd is still single-threaded to avoid
++ * initialization issues in libgcrypt. */
++ curl_global_init (CURL_GLOBAL_SSL);
++ return (0);
++} /* }}} int cj_init */
++
+ void module_register (void)
+ {
+ plugin_register_complex_config ("curl_json", cj_config);
++ plugin_register_init ("curl_json", cj_init);
+ } /* void module_register */
+
+ /* vim: set sw=2 sts=2 et fdm=marker : */
+diff a/src/curl_xml.c b/src/curl_xml.c
+--- a/src/curl_xml.c
++++ b/src/curl_xml.c
+@@ -1033,9 +1033,18 @@ static int cx_config (oconfig_item_t *ci) /* {{{ */
+ return (0);
+ } /* }}} int cx_config */
+
++static int cx_init (void) /* {{{ */
++{
++ /* Call this while collectd is still single-threaded to avoid
++ * initialization issues in libgcrypt. */
++ curl_global_init (CURL_GLOBAL_SSL);
++ return (0);
++} /* }}} int cx_init */
++
+ void module_register (void)
+ {
+ plugin_register_complex_config ("curl_xml", cx_config);
++ plugin_register_init ("curl_xml", cx_init);
+ } /* void module_register */
+
+ /* vim: set sw=2 sts=2 et fdm=marker : */
+diff a/src/write_http.c b/src/write_http.c
+--- a/src/write_http.c
++++ b/src/write_http.c
+@@ -590,9 +590,18 @@ static int wh_config (oconfig_item_t *ci) /* {{{ */
+ return (0);
+ } /* }}} int wh_config */
+
++static int wh_init (void) /* {{{ */
++{
++ /* Call this while collectd is still single-threaded to avoid
++ * initialization issues in libgcrypt. */
++ curl_global_init (CURL_GLOBAL_SSL);
++ return (0);
++} /* }}} int wh_init */
++
+ void module_register (void) /* {{{ */
+ {
+ plugin_register_complex_config ("write_http", wh_config);
++ plugin_register_init ("write_http", wh_init);
+ } /* }}} void module_register */
+
+ /* vim: set fdm=marker sw=8 ts=8 tw=78 et : */
diff --git a/debian/patches/bts770688_snmp_memleak.dpatch b/debian/patches/bts770688_snmp_memleak.dpatch
--- /dev/null
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts770688_snmp_memleak.dpatch by Pierre-Yves Ritschard <pyr@spootnik.org>
+## and Marc Fournier <marc.fournier@camptocamp.com>
+##
+## DP: Let snmp_synch_response deal with PDU freeing
+## DP:
+## DP: When reading from tables, upon errors the PDUs sent are already
+## DP: freed by snmp_synch_response since they are right after
+## DP: snmp_send is called.
+## DP:
+## DP: This commit syncs collectd's approach with other occurences of
+## DP: snmp_synch_response calls.
+## DP:
+## DP: There might be a few corner cases where we leak PDUs, but it
+## DP: is unclear how to check for those since we would need to
+## DP: have an indication that snmp_send was never called, which
+## DP: as far as I can tell is not possible.
+## DP:
+## DP: The potential for failure in snmp_send is rather low and will
+## DP: be easily spotted though, since when crafting invalid PDUs
+## DP: snmp send will constantly fail and since valid configurations
+## DP: can never leak memory.
+## DP:
+## DP: Upstream bug reports:
+## DP: https://github.com/collectd/collectd/issues/610
+## DP: https://github.com/collectd/collectd/issues/804
+
+@DPATCH@
+
+diff --git a/src/snmp.c b/src/snmp.c
+index ad81c89..7d340d1 100644
+--- a/src/snmp.c
++++ b/src/snmp.c
+@@ -1316,6 +1316,8 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
+ snmp_free_pdu (res);
+ res = NULL;
+
++ /* snmp_synch_response already freed our PDU */
++ req = NULL;
+ sfree (errstr);
+ csnmp_host_close_session (host);
+
+@@ -1437,6 +1439,10 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
+ snmp_free_pdu (res);
+ res = NULL;
+
++ if (req != NULL)
++ snmp_free_pdu (req);
++ req = NULL;
++
+ if (status == 0)
+ csnmp_dispatch_table (host, data, instance_list_head, value_list_head);
+
diff --git a/debian/patches/bts770690_java_jni_thread_detach.dpatch b/debian/patches/bts770690_java_jni_thread_detach.dpatch
--- /dev/null
@@ -0,0 +1,205 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts770690_java_jni_thread_detach.dpatch by Florian Forster <octo@google.com>
+##
+## DP: java plugin: Make sure cjni_thread_detach() is called on all paths.
+## DP: Each call to cjni_thread_attach() much be accompanied by a call to
+## DP: cjni_thread_detach(). Some error handling cases were missing the call,
+## DP: potentially locking the plugin up.
+## DP:
+## DP: Also ensure that cjni_thread_detach() does not hide the status of other
+## DP: operations.
+## DP:
+## DP: Upstream commit:
+## DP: https://github.com/collectd/collectd/commit/513a5ca
+
+@DPATCH@
+
+diff a/src/java.c b/src/java.c
+--- a/src/java.c
++++ b/src/java.c
+@@ -2115,7 +2115,7 @@ static int cjni_thread_detach (void) /* {{{ */
+ cjni_env->jvm_env = NULL;
+
+ return (0);
+-} /* }}} JNIEnv *cjni_thread_attach */
++} /* }}} int cjni_thread_detach */
+
+ static int cjni_config_add_jvm_arg (oconfig_item_t *ci) /* {{{ */
+ {
+@@ -2468,7 +2468,6 @@ static int cjni_read (user_data_t *ud) /* {{{ */
+ {
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi;
+- int status;
+ int ret_status;
+
+ if (jvm == NULL)
+@@ -2492,13 +2491,7 @@ static int cjni_read (user_data_t *ud) /* {{{ */
+ ret_status = (*jvm_env)->CallIntMethod (jvm_env, cbi->object,
+ cbi->method);
+
+- status = cjni_thread_detach ();
+- if (status != 0)
+- {
+- ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
+- return (-1);
+- }
+-
++ cjni_thread_detach ();
+ return (ret_status);
+ } /* }}} int cjni_read */
+
+@@ -2509,7 +2502,6 @@ static int cjni_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi;
+ jobject vl_java;
+- int status;
+ int ret_status;
+
+ if (jvm == NULL)
+@@ -2534,6 +2526,7 @@ static int cjni_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+ if (vl_java == NULL)
+ {
+ ERROR ("java plugin: cjni_write: ctoj_value_list failed.");
++ cjni_thread_detach ();
+ return (-1);
+ }
+
+@@ -2542,13 +2535,7 @@ static int cjni_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+
+ (*jvm_env)->DeleteLocalRef (jvm_env, vl_java);
+
+- status = cjni_thread_detach ();
+- if (status != 0)
+- {
+- ERROR ("java plugin: cjni_write: cjni_thread_detach failed.");
+- return (-1);
+- }
+-
++ cjni_thread_detach ();
+ return (ret_status);
+ } /* }}} int cjni_write */
+
+@@ -2560,7 +2547,6 @@ static int cjni_flush (cdtime_t timeout, const char *identifier, /* {{{ */
+ cjni_callback_info_t *cbi;
+ jobject o_timeout;
+ jobject o_identifier;
+- int status;
+ int ret_status;
+
+ if (jvm == NULL)
+@@ -2587,6 +2573,7 @@ static int cjni_flush (cdtime_t timeout, const char *identifier, /* {{{ */
+ {
+ ERROR ("java plugin: cjni_flush: Converting double "
+ "to Number object failed.");
++ cjni_thread_detach ();
+ return (-1);
+ }
+
+@@ -2598,6 +2585,7 @@ static int cjni_flush (cdtime_t timeout, const char *identifier, /* {{{ */
+ {
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_timeout);
+ ERROR ("java plugin: cjni_flush: NewStringUTF failed.");
++ cjni_thread_detach ();
+ return (-1);
+ }
+ }
+@@ -2608,13 +2596,7 @@ static int cjni_flush (cdtime_t timeout, const char *identifier, /* {{{ */
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_identifier);
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_timeout);
+
+- status = cjni_thread_detach ();
+- if (status != 0)
+- {
+- ERROR ("java plugin: cjni_flush: cjni_thread_detach failed.");
+- return (-1);
+- }
+-
++ cjni_thread_detach ();
+ return (ret_status);
+ } /* }}} int cjni_flush */
+
+@@ -2640,7 +2622,10 @@ static void cjni_log (int severity, const char *message, /* {{{ */
+
+ o_message = (*jvm_env)->NewStringUTF (jvm_env, message);
+ if (o_message == NULL)
++ {
++ cjni_thread_detach ();
+ return;
++ }
+
+ (*jvm_env)->CallVoidMethod (jvm_env,
+ cbi->object, cbi->method, (jint) severity, o_message);
+@@ -2658,7 +2643,6 @@ static int cjni_notification (const notification_t *n, /* {{{ */
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi;
+ jobject o_notification;
+- int status;
+ int ret_status;
+
+ if (jvm == NULL)
+@@ -2683,6 +2667,7 @@ static int cjni_notification (const notification_t *n, /* {{{ */
+ if (o_notification == NULL)
+ {
+ ERROR ("java plugin: cjni_notification: ctoj_notification failed.");
++ cjni_thread_detach ();
+ return (-1);
+ }
+
+@@ -2691,13 +2676,7 @@ static int cjni_notification (const notification_t *n, /* {{{ */
+
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_notification);
+
+- status = cjni_thread_detach ();
+- if (status != 0)
+- {
+- ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
+- return (-1);
+- }
+-
++ cjni_thread_detach ();
+ return (ret_status);
+ } /* }}} int cjni_notification */
+
+@@ -2725,24 +2704,20 @@ static int cjni_match_target_create (const oconfig_item_t *ci, /* {{{ */
+ (*jvm_env)->DeleteLocalRef (jvm_env, cbi_ret->object); \
+ } \
+ free (cbi_ret); \
+- if (jvm_env != NULL) { \
+- if (o_ci != NULL) \
+- (*jvm_env)->DeleteLocalRef (jvm_env, o_ci); \
+- cjni_thread_detach (); \
+- } \
++ if (o_ci != NULL) \
++ (*jvm_env)->DeleteLocalRef (jvm_env, o_ci); \
++ cjni_thread_detach (); \
+ return (status)
+
+ if (jvm == NULL)
+ {
+ ERROR ("java plugin: cjni_read: jvm == NULL");
+- BAIL_OUT (-1);
++ return (-1);
+ }
+
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
+- {
+- BAIL_OUT (-1);
+- }
++ return (-1);
+
+ /* Find out whether to create a match or a target. */
+ if (strcasecmp ("Match", ci->key) == 0)
+@@ -2936,10 +2911,7 @@ static int cjni_match_target_invoke (const data_set_t *ds, /* {{{ */
+ }
+ } /* if (cbi->type == CB_TYPE_TARGET) */
+
+- status = cjni_thread_detach ();
+- if (status != 0)
+- ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
+-
++ cjni_thread_detach ();
+ return (ret_status);
+ } /* }}} int cjni_match_target_invoke */
+
diff --git a/debian/patches/bts770693_timestamps.dpatch b/debian/patches/bts770693_timestamps.dpatch
--- /dev/null
@@ -0,0 +1,124 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts770693_timestamps.dpatch
+##
+## DP: Fixed handling of timestamps in notifications.
+## DP:
+## DP: Starting with collectd 5, timestamps use nano-second resolution rather
+## DP: than seconds. Notitications did not handle that correctly, leading to
+## DP: invalid time-stamps and potentially invalid memory access.
+## DP:
+## DP: Upstream commits:
+## DP: https://github.com/collectd/collectd/commit/...
+## DP: d571f4645593c16a26a98aa635b1952286089266 by Justin Burnham <jburnham@mediatemple.net>
+## DP: 43fcfd6a48b506b03114dd9637caf8fc211b47db by Adrian Miron <adrian.miron.v2@gmail.com>
+## DP: ac78faa99d4b34c78a7bca741430c06c56e6f32c by Manuel Luis Sanmartín Rozada <manuel.luis@gmail.com>
+## DP: f5c294b7355cee34df44b1c5b8ac3ef7b85664cd by Manuel Luis Sanmartín Rozada <manuel.luis@gmail.com>
+## DP: 7d1d59fb064f2a9adfba50d3ea5c39ebc6bebd3c by Manuel Luis Sanmartín Rozada <manuel.luis@gmail.com>
+## DP: 07e4683f7f985668641d79137b64d148bc18ba8a by Manuel Luis Sanmartín Rozada <manuel.luis@gmail.com>
+## DP: 524b85687dbbd4cc2bbb650caf300162dcd16e96 by Marc Fournier <marc.fournier@camptocamp.com>
+
+@DPATCH@
+
+diff a/src/exec.c b/src/exec.c
+--- a/src/exec.c
++++ b/src/exec.c
+@@ -744,8 +744,8 @@ static void *exec_notification_one (void *arg) /* {{{ */
+
+ fprintf (fh,
+ "Severity: %s\n"
+- "Time: %.3f\n",
+- severity, CDTIME_T_TO_DOUBLE (n->time));
++ "Time: %u\n",
++ severity, (unsigned int)CDTIME_T_TO_TIME_T(n->time));
+
+ /* Print the optional fields */
+ if (strlen (n->host) > 0)
+diff a/src/java.c b/src/java.c
+--- a/src/java.c
++++ b/src/java.c
+@@ -906,7 +906,7 @@ static jobject ctoj_notification (JNIEnv *jvm_env, /* {{{ */
+ #undef SET_STRING
+
+ /* Set the `time' member. Java stores time in milliseconds. */
+- status = ctoj_long (jvm_env, ((jlong) n->time) * ((jlong) 1000),
++ status = ctoj_long (jvm_env, (jlong) CDTIME_T_TO_MS (n->time),
+ c_notification, o_notification, "setTime");
+ if (status != 0)
+ {
+@@ -1306,7 +1306,7 @@ static int jtoc_notification (JNIEnv *jvm_env, notification_t *n, /* {{{ */
+ return (-1);
+ }
+ /* Java measures time in milliseconds. */
+- n->time = (time_t) (tmp_long / ((jlong) 1000));
++ n->time = MS_TO_CDTIME_T(tmp_long);
+
+ status = jtoc_int (jvm_env, &tmp_int,
+ class_ptr, object_ptr, "getSeverity");
+
+diff a/src/pyvalues.c b/src/pyvalues.c
+--- a/src/pyvalues.c
++++ b/src/pyvalues.c
+@@ -767,7 +771,7 @@ static void Values_dealloc(PyObject *self) {
+ }
+
+ static PyMemberDef Values_members[] = {
+- {"interval", T_INT, offsetof(Values, interval), 0, interval_doc},
++ {"interval", T_DOUBLE, offsetof(Values, interval), 0, interval_doc},
+ {"values", T_OBJECT_EX, offsetof(Values, values), 0, values_doc},
+ {"meta", T_OBJECT_EX, offsetof(Values, meta), 0, meta_doc},
+ {NULL}
+diff a/src/threshold.c b/src/threshold.c
+--- a/src/threshold.c
++++ b/src/threshold.c
+@@ -942,6 +942,7 @@ static int ut_missing (const value_list_t *vl,
+ cdtime_t missing_time;
+ char identifier[6 * DATA_MAX_NAME_LEN];
+ notification_t n;
++ cdtime_t now;
+
+ if (threshold_tree == NULL)
+ return (0);
+@@ -951,13 +952,15 @@ static int ut_missing (const value_list_t *vl,
+ if ((th == NULL) || ((th->flags & UT_FLAG_INTERESTING) == 0))
+ return (0);
+
+- missing_time = cdtime () - vl->time;
++ now = cdtime ();
++ missing_time = now - vl->time;
+ FORMAT_VL (identifier, sizeof (identifier), vl);
+
+ NOTIFICATION_INIT_VL (&n, vl);
+ ssnprintf (n.message, sizeof (n.message),
+ "%s has not been updated for %.3f seconds.",
+ identifier, CDTIME_T_TO_DOUBLE (missing_time));
++ n.time = now;
+
+ plugin_dispatch_notification (&n);
+
+diff a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c
+--- a/src/utils_cmd_putnotif.c
++++ b/src/utils_cmd_putnotif.c
+@@ -49,13 +49,18 @@ static int set_option_severity (notification_t *n, const char *value)
+
+ static int set_option_time (notification_t *n, const char *value)
+ {
+- time_t tmp;
+-
+- tmp = (time_t) atoi (value);
+- if (tmp <= 0)
++ char *endptr = NULL;
++ double tmp;
++
++ errno = 0;
++ tmp = strtod (value, &endptr);
++ if ((errno != 0) /* Overflow */
++ || (endptr == value) /* Invalid string */
++ || (endptr == NULL) /* This should not happen */
++ || (*endptr != 0)) /* Trailing chars */
+ return (-1);
+
+- n->time = tmp;
++ n->time = DOUBLE_TO_CDTIME_T (tmp);
+
+ return (0);
+ } /* int set_option_time */
diff --git a/debian/patches/bts770694_loglevel.dpatch b/debian/patches/bts770694_loglevel.dpatch
--- /dev/null
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts770694_loglevel.dpatch
+##
+## DP: Make sure not to disable logging on invalid log levels.
+## DP:
+## DP: Debug logging is not compiled into the Debian packages. Make sure to
+## DP: fall back to INFO and report and error rather than silently dropping
+## DP: all further log messages.
+## DP:
+## DP: Upstream bug report:
+## DP: https://github.com/collectd/collectd/issues/636
+## DP:
+## DP: Upstream commits:
+## DP: https://github.com/dothebart/collectd/commit/84c3805
+## DP: https://github.com/collectd/collectd/commit/cb4ea71
+
+@DPATCH@
+
+diff a/src/logfile.c b/src/logfile.c
+--- a/src/logfile.c
++++ b/src/logfile.c
+@@ -54,7 +54,11 @@ static int logfile_config (const char *key, const char *value)
+ {
+ if (0 == strcasecmp (key, "LogLevel")) {
+ log_level = parse_log_severity(value);
+- if (log_level == -1) return 1; /* to keep previous behaviour */
++ if (log_level < 0) {
++ log_level = LOG_INFO;
++ ERROR ("logfile: invalid loglevel [%s] defaulting to 'info'", value);
++ return (1);
++ }
+ }
+ else if (0 == strcasecmp (key, "File")) {
+ sfree (log_file);
+diff a/src/syslog.c b/src/syslog.c
+--- a/src/syslog.c
++++ b/src/syslog.c
+@@ -48,7 +48,11 @@ static int sl_config (const char *key, const char *value)
+ {
+ log_level = parse_log_severity (value);
+ if (log_level < 0)
++ {
++ log_level = LOG_INFO;
++ ERROR ("syslog: invalid loglevel [%s] defaulting to 'info'", value);
+ return (1);
++ }
+ }
+ else if (strcasecmp (key, "NotifyLevel") == 0)
+ {
diff --git a/debian/patches/collection.cgi.dpatch b/debian/patches/collection.cgi.dpatch
--- /dev/null
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## collection.cgi.dpatch by Fabiano Pires <fxp@ig.com.br>
+##
+## DP: collection.cgi: Fixed apache data-sources.
+
+@DPATCH@
+
+diff a/contrib/collection.cgi b/contrib/collection.cgi
+--- a/contrib/collection.cgi
++++ b/contrib/collection.cgi
+@@ -957,9 +957,9 @@
+
+ $GraphDefs =
+ {
+- apache_bytes => ['DEF:min_raw={file}:count:MIN',
+- 'DEF:avg_raw={file}:count:AVERAGE',
+- 'DEF:max_raw={file}:count:MAX',
++ apache_bytes => ['DEF:min_raw={file}:value:MIN',
++ 'DEF:avg_raw={file}:value:AVERAGE',
++ 'DEF:max_raw={file}:value:MAX',
+ 'CDEF:min=min_raw,8,*',
+ 'CDEF:avg=avg_raw,8,*',
+ 'CDEF:max=max_raw,8,*',
+@@ -976,9 +976,9 @@
+ 'GPRINT:avg:LAST:%5.1lf%s Last',
+ 'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
+ ],
+- apache_connections => ['DEF:min={file}:count:MIN',
+- 'DEF:avg={file}:count:AVERAGE',
+- 'DEF:max={file}:count:MAX',
++ apache_connections => ['DEF:min={file}:value:MIN',
++ 'DEF:avg={file}:value:AVERAGE',
++ 'DEF:max={file}:value:MAX',
+ "AREA:max#$HalfBlue",
+ "AREA:min#$Canvas",
+ "LINE1:avg#$FullBlue:Connections",
+@@ -987,9 +987,9 @@
+ 'GPRINT:max:MAX:%6.2lf Max,',
+ 'GPRINT:avg:LAST:%6.2lf Last'
+ ],
+- apache_idle_workers => ['DEF:min={file}:count:MIN',
+- 'DEF:avg={file}:count:AVERAGE',
+- 'DEF:max={file}:count:MAX',
++ apache_idle_workers => ['DEF:min={file}:value:MIN',
++ 'DEF:avg={file}:value:AVERAGE',
++ 'DEF:max={file}:value:MAX',
+ "AREA:max#$HalfBlue",
+ "AREA:min#$Canvas",
+ "LINE1:avg#$FullBlue:Idle Workers",
+@@ -998,9 +998,9 @@
+ 'GPRINT:max:MAX:%6.2lf Max,',
+ 'GPRINT:avg:LAST:%6.2lf Last'
+ ],
+- apache_requests => ['DEF:min={file}:count:MIN',
+- 'DEF:avg={file}:count:AVERAGE',
+- 'DEF:max={file}:count:MAX',
++ apache_requests => ['DEF:min={file}:value:MIN',
++ 'DEF:avg={file}:value:AVERAGE',
++ 'DEF:max={file}:value:MAX',
+ "AREA:max#$HalfBlue",
+ "AREA:min#$Canvas",
+ "LINE1:avg#$FullBlue:Requests/s",
+@@ -1009,9 +1009,9 @@
+ 'GPRINT:max:MAX:%6.2lf Max,',
+ 'GPRINT:avg:LAST:%6.2lf Last'
+ ],
+- apache_scoreboard => ['DEF:min={file}:count:MIN',
+- 'DEF:avg={file}:count:AVERAGE',
+- 'DEF:max={file}:count:MAX',
++ apache_scoreboard => ['DEF:min={file}:value:MIN',
++ 'DEF:avg={file}:value:AVERAGE',
++ 'DEF:max={file}:value:MAX',
+ "AREA:max#$HalfBlue",
+ "AREA:min#$Canvas",
+ "LINE1:avg#$FullBlue:Processes",
diff --git a/debian/patches/migrate-4-5-df.dpatch b/debian/patches/migrate-4-5-df.dpatch
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## migrate-4-5-df.dpatch by Florian Forster <octo@collectd.org>
-##
-## DP: contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
-## DP: cf. upstream commit 605dab534eb2f0ee26446c157c9fdd2ad6e9427a
-
-@DPATCH@
-
-diff --git a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
-index d3ff796..c39b51b 100755
---- a/contrib/migrate-4-5.px
-+++ b/contrib/migrate-4-5.px
-@@ -33,6 +33,7 @@ use File::Basename ('dirname');
-
- our $InDir = '/var/lib/collectd';
- our $RRDtool = 'rrdtool';
-+our $RRDFilter = 'rrd_filter.px';
-
- our %TypesCounterToDerive = # {{{
- (
-@@ -184,7 +185,15 @@ sub handle_file # {{{
- {
- my $dir = join ('/', @path);
- print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
-- print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
-+ if (($plugin eq 'df') and ($type eq 'df'))
-+ {
-+ print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-free.rrd\" --map free:value\n";
-+ print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-used.rrd\" --map used:value\n";
-+ }
-+ else
-+ {
-+ print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
-+ }
- }
- } # }}} sub handle_file
-
-@@ -223,10 +232,12 @@ migrate-4-5.px [OPTIONS]
-
- Valid options are:
-
-- --indir <dir> Source directory
-- Default: $InDir
-- --rrdtool <path> Path to the RRDtool binary
-- Default: $RRDtool
-+ --indir <dir> Source directory
-+ Default: $InDir
-+ --rrdtool <path> Path to the RRDtool binary
-+ Default: $RRDtool
-+ --rrdfilter <path> Path to the rrd_filter.px script
-+ Default: $RRDFilter
-
- EOF
- exit (1);
-@@ -234,8 +245,11 @@ EOF
-
- GetOptions ("indir|i=s" => \$InDir,
- "rrdtool=s" => \$RRDtool,
-+ "rrdfilter=s" => \$RRDFilter,
- "help|h" => \&exit_usage) or exit_usage ();
-
-+print "#!/bin/bash\n\n";
-+
- scan_dir ($InDir);
-
- # vim: set sw=2 sts=2 et fdm=marker :
diff --git a/debian/patches/myplugin_api.dpatch b/debian/patches/myplugin_api.dpatch
--- /dev/null
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## myplugin_api.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Update myplugin.c to the latest collectd API.
+
+@DPATCH@
+
+diff a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
+--- a/contrib/examples/myplugin.c
++++ b/contrib/examples/myplugin.c
+@@ -100,14 +100,16 @@
+ vl.time = time (NULL);
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "myplugin", sizeof (vl.plugin));
++
++ /* it is strongly recommended to use a type defined in the types.db file
++ * instead of a custom type */
++ sstrncpy (vl.type, "myplugin", sizeof (vl.plugin));
+ /* optionally set vl.plugin_instance and vl.type_instance to reasonable
+ * values (default: "") */
+
+ /* dispatch the values to collectd which passes them on to all registered
+- * write functions - the first argument is used to lookup the data set
+- * definition (it is strongly recommended to use a type defined in the
+- * types.db file) */
+- plugin_dispatch_values ("myplugin", &vl);
++ * write functions */
++ plugin_dispatch_values (&vl);
+
+ /* A return value != 0 indicates an error and the plugin will be skipped
+ * for an increasing amount of time. */
+@@ -117,7 +119,8 @@
+ /*
+ * This function is called after values have been dispatched to collectd.
+ */
+-static int my_write (const data_set_t *ds, const value_list_t *vl)
++static int my_write (const data_set_t *ds, const value_list_t *vl,
++ user_data_t *ud)
+ {
+ char name[1024] = "";
+ int i = 0;
+@@ -151,7 +154,7 @@
+ /*
+ * This function is called when plugin_log () has been used.
+ */
+-static void my_log (int severity, const char *msg)
++static void my_log (int severity, const char *msg, user_data_t *ud)
+ {
+ printf ("LOG: %i - %s\n", severity, msg);
+ return;
+@@ -160,7 +163,7 @@
+ /*
+ * This function is called when plugin_dispatch_notification () has been used.
+ */
+-static int my_notify (const notification_t *notif)
++static int my_notify (const notification_t *notif, user_data_t *ud)
+ {
+ char time_str[32] = "";
+ struct tm *tm = NULL;
+@@ -210,12 +213,13 @@
+ */
+ void module_register (void)
+ {
+- plugin_register_log ("myplugin", my_log);
+- plugin_register_notification ("myplugin", my_notify);
++ plugin_register_log ("myplugin", my_log, /* user data */ NULL);
++ plugin_register_notification ("myplugin", my_notify,
++ /* user data */ NULL);
+ plugin_register_data_set (&ds);
+ plugin_register_read ("myplugin", my_read);
+ plugin_register_init ("myplugin", my_init);
+- plugin_register_write ("myplugin", my_write);
++ plugin_register_write ("myplugin", my_write, /* user data */ NULL);
+ plugin_register_shutdown ("myplugin", my_shutdown);
+ return;
+ } /* void module_register (void) */
diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
--- /dev/null
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## myplugin_includes.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Let the example plugin include the core headers from
+## DP: /usr/include/collectd/core.
+
+@DPATCH@
+
+diff a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
+--- a/contrib/examples/myplugin.c
++++ b/contrib/examples/myplugin.c
+@@ -38,9 +38,9 @@
+
+ #endif /* ! HAVE_CONFIG */
+
+-#include <collectd/collectd.h>
+-#include <collectd/common.h>
+-#include <collectd/plugin.h>
++#include <collectd/core/collectd.h>
++#include <collectd/core/common.h>
++#include <collectd/core/plugin.h>
+
+ /*
+ * data source definition:
index 2678334692305288238b47394bdd7127fd5cef0d..4580bba4029800ad041f0d77eb1685ce0fec886a 100755 (executable)
}
sub exit_usage
+diff a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
+--- a/contrib/migrate-4-5.px
++++ b/contrib/migrate-4-5.px
+@@ -32,8 +32,8 @@
+ use File::Basename ('dirname');
+
+ our $InDir = '/var/lib/collectd';
+-our $RRDtool = 'rrdtool';
+-our $RRDFilter = 'rrd_filter.px';
++our $RRDtool = '/usr/bin/rrdtool';
++our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px';
+
+ our %TypesCounterToDerive = # {{{
+ (
diff --git a/debian/patches/rtnl_dump_filter.dpatch b/debian/patches/rtnl_dump_filter.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rtnl_dump_filter.dpatch by Gaetan Bisson
-##
-## DP: netlink: Updated the signature of rtnl_dump_filter to recent iproute2.
-
-@DPATCH@
-
-diff -Naur old/src/netlink.c new/src/netlink.c
---- old/src/netlink.c 2012-01-22 22:10:04.000000000 +1100
-+++ new/src/netlink.c 2012-02-01 17:22:54.362752065 +1100
-@@ -570,8 +570,7 @@
- return (-1);
- }
-
-- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
-- NULL, NULL) != 0)
-+ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0)
- {
- ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
- return (-1);
-@@ -608,8 +607,7 @@
- continue;
- }
-
-- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
-- NULL, NULL) != 0)
-+ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0)
- {
- ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
- continue;
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 2c6f901ca35e58049f71ec99f91f3aff339338c4..74ceec00639fc4f3c82cf6280ab01c9d88c0a11b 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Ve struktuře souborů RRD vytvořených collectd počínaje verzí 3.x došlo k "
"výrazné změně. Pro uchování vašich dat je nutná jejich migrace. Tu můžete "
-"provést pomocí /usr/lib/collectd-core/utils/migrate-3-4.px."
+"provést pomocí /usr/lib/collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"Pro více informací se podívejte na /usr/share/doc/collectd-core/NEWS.Debian."
+"Pro více informací se podívejte na /usr/share/doc/collectd-core/NEWS.Debian.gz."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Struktura některých souborů RRD vytvořených collectd počínaje verzí 4.x byla "
"změněna. Pro uchování vašich dat je nutná jejich migrace. Tu můžete provést "
-"pomocí /usr/lib/collectd-core/utils/migrate-4-5.px."
+"pomocí /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Pro více informací se podívejte do souboru /usr/share/doc/collectd-core/NEWS."
-"Debian a na wiki collectd na adrese <http://collectd.org/wiki/index.php/"
+"Debian.gz a na wiki collectd na adrese <http://collectd.org/wiki/index.php/"
"V4_to_v5_migration_guide>."
#. Type: boolean
diff --git a/debian/po/da.po b/debian/po/da.po
index ef92473be17e706fd83713b5346238c53113e5e8..20f1d1b02c4d7ac54749f378a9a87e773e48bb37 100644 (file)
--- a/debian/po/da.po
+++ b/debian/po/da.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Layouttet for RRD-filer oprettet af collectd har ændret sig markant siden "
"version 3.x. For at bevare dine gamle data skal du migrere dem. Dette kan "
-"gøres ved at bruge /usr/lib/collectd-core/utils/migrate-3-4.px."
+"gøres ved at bruge /usr/lib/collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Se /usr/share/doc/collectd-core/NEWS.Debian for detaljer."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Se /usr/share/doc/collectd-core/NEWS.Debian.gz for detaljer."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Layouttet for RRD-filer oprettet af collectd har ændret sig markant siden "
"version 4.x. For at bevare dine gamle data skal du migrere dem. Dette kan "
-"gøres ved at bruge /usr/lib/collectd-core/utils/migrate-4-5.px."
+"gøres ved at bruge /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Se /usr/share/doc/collectd-core/NEWS.Debian og wikien for collectd på "
+"Se /usr/share/doc/collectd-core/NEWS.Debian.gz og wikien for collectd på "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for detaljer."
#. Type: boolean
diff --git a/debian/po/de.po b/debian/po/de.po
index e32994219c9dbf2adf74998b256b0785099b1770..9dc6836a4b1abc65a34904c41c0563ce03a217c7 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Das Layout der von collectd erstellten RRD-Dateien hat sich seit Version 3.x "
"grundlegend geändert. Um Ihre alten Daten beizubehalten, müssen Sie diese "
-"migrieren. Dies kann durch Verwendung von »/usr/lib/collectd-core/utils/"
+"migrieren. Dies kann durch Verwendung von »/usr/lib/collectd/utils/"
"migrate-3-4.px« erreicht werden."
#. Type: note
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Siehe »/usr/share/doc/collectd-core/NEWS.Debian« für Details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Siehe »/usr/share/doc/collectd-core/NEWS.Debian.gz« für Details."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Das Layout einiger von collectd erstellten RRD-Dateien hat sich seit Version 4.x "
"grundlegend geändert. Um Ihre alten Daten beizubehalten, müssen Sie diese "
-"migrieren. Dies kann durch Verwendung von »/usr/lib/collectd-core/utils/"
+"migrieren. Dies kann durch Verwendung von »/usr/lib/collectd/utils/"
"migrate-4-5.px« erreicht werden."
#. Type: note
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Siehe »/usr/share/doc/collectd-core/NEWS.Debian« und das collectd Wiki "
+"Siehe »/usr/share/doc/collectd-core/NEWS.Debian.gz« und das collectd Wiki "
"unter <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
"für Details."
diff --git a/debian/po/es.po b/debian/po/es.po
index c0846451500eef0aa0b593364a7db4aacc6d73c6..fe98a59c620a98d72bdb7b0bea8fa0e247713042 100644 (file)
--- a/debian/po/es.po
+++ b/debian/po/es.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"La distribución de los archivos RRD creados por collectd ha cambiado "
"significativamente desde la versión 3.x. Los datos antiguos se deben migrar "
"para que se puedan seguir utilizando. Puede hacer esto ejecutando el "
-"programa «/usr/lib/collectd-core/utils/migrate-3-4.px»."
+"programa «/usr/lib/collectd/utils/migrate-3-4.px»."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian» para más detalles."
+"Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian.gz» para más detalles."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"La distribución de los archivos RRD creados por collectd ha cambiado "
"desde la versión 4.x. Los datos antiguos se deben migrar "
"para que se puedan seguir utilizando. Puede hacer esto utilizando el "
-"programa «/usr/lib/collectd-core/utils/migrate-4-5.px»."
+"programa «/usr/lib/collectd/utils/migrate-4-5.px»."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Para más detalles consulte «/usr/share/doc/collectd-core/NEWS.Debian» y la "
+"Para más detalles consulte «/usr/share/doc/collectd-core/NEWS.Debian.gz» y la "
"página wiki de collectd en "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d04c161dfb34f5c436ac33291e5ad833e377bd41..404dc9c5de7f517ac073a25d612ef80d10d7ce64 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Le format des fichiers RRD créés par collectd a changé de façon "
"significative depuis la version 3.x. Afin de conserver les données, il est "
"nécessaire de les convertir. Cette opération peut être réalisée avec la "
-"commande « /usr/lib/collectd-core/utils/migrate-3-4.px »."
+"commande « /usr/lib/collectd/utils/migrate-3-4.px »."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"Veuillez lire le fichier « /usr/share/doc/collectd-core/NEWS.Debian » pour "
+"Veuillez lire le fichier « /usr/share/doc/collectd-core/NEWS.Debian.gz » pour "
"plus d'informations."
#. Type: boolean
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Le format des fichiers RRD créés par collectd a changé depuis la version 4."
"x. Afin de conserver les données, il est nécessaire de les convertir. Cette "
-"opération peut être réalisée avec la commande « /usr/lib/collectd-core/utils/"
+"opération peut être réalisée avec la commande « /usr/lib/collectd/utils/"
"migrate-4-5.px »."
#. Type: note
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Voir /usr/share/doc/collectd-core/NEWS.Debian et le wiki de collectd "
+"Voir /usr/share/doc/collectd-core/NEWS.Debian.gz et le wiki de collectd "
"(<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>) pour plus de "
"détails."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index bff08d433b6caa6bc135ab3b1ac16c61e07a3f94..204c68013462922c17707943ddaa408e4952729c 100644 (file)
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"A organización dos ficheiros RRD creados por collectd cambiou "
"significativamente desde a versión 3.x. Para conservar os seus datos antigos "
-"ten que migralos. Pódese facer empregando /usr/lib/collectd-core/utils/"
+"ten que migralos. Pódese facer empregando /usr/lib/collectd/utils/"
"migrate-3-4.px."
#. Type: note
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Consulte /usr/share/doc/collectd-core/NEWS.Debian para máis detalles."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Consulte /usr/share/doc/collectd-core/NEWS.Debian.gz para máis detalles."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"A organización dos ficheiros RRD creados por collectd cambiou desde a "
"versión 4.x. Para conservar os seus datos antigos ten que migralos. Pódese "
-"facer empregando /usr/lib/collectd-core/utils/migrate-4-5.px."
+"facer empregando /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Consulte o ficheiro /usr/share/doc/collectd-core/NEWS.Debian e a wiki de "
+"Consulte o ficheiro /usr/share/doc/collectd-core/NEWS.Debian.gz e a wiki de "
"collectd en <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
"para obter máis detalles."
diff --git a/debian/po/it.po b/debian/po/it.po
index 889abe500ac89816ce5cf3e6106e599881b4e5a3..d0d354f083bf6594c560e959df83e73a9dc74b23 100644 (file)
--- a/debian/po/it.po
+++ b/debian/po/it.po
# Italian translation of collectd debconf messages.
# Copyright (C) 2012, collectd package copyright holder.
# This file is distributed under the same license as the collectd package.
-# Beatrice Torracca <beatricet@libero.it>, 2012.
+# Beatrice Torracca <beatricet@libero.it>, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: collectd\n"
"Report-Msgid-Bugs-To: collectd@packages.debian.org\n"
"POT-Creation-Date: 2012-05-19 17:59+0200\n"
-"PO-Revision-Date: 2012-05-21 19:00+0200\n"
+"PO-Revision-Date: 2013-04-21 14:16+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
"Language: it\n"
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Il formato dei file RRD creati da collectd è cambiato in modo significativo "
"rispetto alla versione 3.x. Per poter mantenere i propri vecchi dati è "
-"necessario fare una migrazione. Ciò può essere fatto usando /usr/lib/"
-"collectd-core/utils/migrate-3-4.px."
+"necessario fare una migrazione. Ciò può essere fatto usando /usr/lib"
+"/collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.Debian."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.Debian.gz."
#. Type: boolean
#. Description
#. Type: note
#. Description
#: ../collectd-core.templates:3001
-#, fuzzy
-#| msgid "Layout of RRD files has changed"
msgid "Layout of RRD files has changed in version 5.0"
-msgstr "Il formato dei file RRD è cambiato"
+msgstr "Il formato dei file RRD è cambiato nella versione 5.0"
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
-#, fuzzy
-#| msgid ""
-#| "The layout of the RRD files created by collectd has changed significantly "
-#| "since version 3.x. In order to keep your old data you have to migrate it. "
-#| "This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
-"Il formato dei file RRD creati da collectd è cambiato in modo significativo "
-"rispetto alla versione 3.x. Per poter mantenere i propri vecchi dati è "
-"necessario fare una migrazione. Ciò può essere fatto usando /usr/lib/"
-"collectd-core/utils/migrate-3-4.px."
+"Il formato di alcuni file RRD creati da collectd è cambiato rispetto alla "
+"versione 4.x. Per poter mantenere i propri vecchi dati è necessario fare una "
+"migrazione. Ciò può essere fatto usando /usr/lib/collectd"
+"/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
+"Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.Debian.gz e il wiki di "
+"collectd all'indirizzo "
+"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
#. Type: boolean
#. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 57fab40c5d2db581c3a30030a9f8c586f79aed92..86e2fbe9aded148014437a1b80e58c0cb9efe626 100644 (file)
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: collectd 4.7.2-1\n"
+"Project-Id-Version: collectd 5.1.0-3.1\n"
"Report-Msgid-Bugs-To: collectd@packages.debian.org\n"
"POT-Creation-Date: 2012-05-19 17:59+0200\n"
-"PO-Revision-Date: 2009-10-06 17:32+0900\n"
+"PO-Revision-Date: 2012-05-20 00:59+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
"Language: ja\n"
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"collectd によって作成された RRD ファイルの配置位置はバージョン 3.x から大きく"
"変わりました。移行を行うために古いデータを保存します。これは /usr/lib/"
-"collectd-core/utils/migrate-3-4.px を使って行われます。"
+"collectd/utils/migrate-3-4.px を使って行われます。"
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"詳細については /usr/share/doc/collectd-core/NEWS.Debian を参照してください。"
+"詳細については /usr/share/doc/collectd-core/NEWS.Debian.gz を参照してください。"
#. Type: boolean
#. Description
#. Type: note
#. Description
#: ../collectd-core.templates:3001
-#, fuzzy
-#| msgid "Layout of RRD files has changed"
msgid "Layout of RRD files has changed in version 5.0"
-msgstr "RRD ファイルの配置位置が変更されました"
+msgstr "バージョン 5.0 で RRD ファイルの配置位置が変更されました"
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
-#, fuzzy
-#| msgid ""
-#| "The layout of the RRD files created by collectd has changed significantly "
-#| "since version 3.x. In order to keep your old data you have to migrate it. "
-#| "This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
-"collectd ã\81«ã\82\88ã\81£ã\81¦ä½\9cæ\88\90ã\81\95ã\82\8cã\81\9f RRD ã\83\95ã\82¡ã\82¤ã\83«ã\81®é\85\8dç½®ä½\8dç½®ã\81¯ã\83\90ã\83¼ã\82¸ã\83§ã\83³ 3.x ã\81\8bã\82\89大ã\81\8dã\81\8f"
+"collectd ã\81«ã\82\88ã\81£ã\81¦ä½\9cæ\88\90ã\81\95ã\82\8cã\82\8bã\81\84ã\81\8fã\81¤ã\81\8bã\81® RRD ã\83\95ã\82¡ã\82¤ã\83«ã\81®é\85\8dç½®ã\81\8cã\83\90ã\83¼ã\82¸ã\83§ã\83³ 4.x ã\81\8bã\82\89"
"変わりました。移行を行うために古いデータを保存します。これは /usr/lib/"
-"collectd-core/utils/migrate-3-4.px を使って行われます。"
+"collectd/utils/migrate-4-5.px を使って行うことができます。"
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
+"詳細については /usr/share/doc/collectd-core/NEWS.Debian.gz 及び collectd wiki "
+"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> を見てください。"
#. Type: boolean
#. Description
#: ../collectd-core.templates:5001
msgid "Remove all collected data (e.g. RRD files)?"
-msgstr ""
+msgstr "収集したデータ (例えば RRD ファイル) を全て削除しますか?"
#. Type: boolean
#. Description
"the collected statistics is about to be removed. For example, this directory "
"includes (in the default configuration) all RRD files."
msgstr ""
+"収集した統計の含まれるデータファイルが置かれている /var/lib/collectd/ ディレク"
+"トリが削除されます。このディレクトリには (デフォルト設定では) 例えば RRD ファ"
+"イルが全て置かれています。"
#. Type: boolean
#. Description
"recent or custom version or if you want to keep the data for further "
"analysis, the data should be kept."
msgstr ""
+"もっと新しいまたは独自のバージョンに置き換える目的で collectd パッケージを完全"
+"削除する場合やデータを残しておいて詳細な分析を行いたい場合にはこのデータを残す"
+"ようにしてください。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 64ac65d825274294c332e570e3a53af97692bab2..b6875f9353db397b1e40a75df5d6b70e092bad29 100644 (file)
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"De lay-out van de RRD-bestanden, die zijn gemaakt door collectd, is sterk "
"gewijzigd sinds versie 3.x. Om uw oude gegevens te behouden zult u deze "
-"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/"
+"moeten migreren. Dit kunt u doen door /usr/lib/collectd/utils/"
"migrate-3-4.px te gebruiken."
#. Type: note
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Zie /usr/share/doc/collectd-core/NEWS.Debian voor meer informatie."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Zie /usr/share/doc/collectd-core/NEWS.Debian.gz voor meer informatie."
#. Type: boolean
#. Description
#| msgid ""
#| "The layout of the RRD files created by collectd has changed significantly "
#| "since version 3.x. In order to keep your old data you have to migrate it. "
-#| "This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+#| "This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"De lay-out van de RRD-bestanden, die zijn gemaakt door collectd, is sterk "
"gewijzigd sinds versie 3.x. Om uw oude gegevens te behouden zult u deze "
-"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/"
+"moeten migreren. Dit kunt u doen door /usr/lib/collectd/utils/"
"migrate-3-4.px te gebruiken."
#. Type: note
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
diff --git a/debian/po/pl.po b/debian/po/pl.po
index a10b8aa327552fed74f30dc3a209b27df19ff23d..11401d9827bbc7bceb23c3d684336ad4a82d1db4 100644 (file)
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Układ plików RRD tworzonych przez collectd znacznie się zmienił od wersji 3."
"x. Aby zatrzymać stare dane, należy je przekształcić np. za pomocą /usr/lib/"
-"collectd-core/utils/migrate-3-4.px."
+"collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"Plik /usr/share/doc/collectd-core/NEWS.Debian zawiera więcej szczegółów."
+"Plik /usr/share/doc/collectd-core/NEWS.Debian.gz zawiera więcej szczegółów."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Układ plików RRD tworzonych przez collectd znacznie się zmienił od wersji 4."
"x. Aby zatrzymać stare dane, należy je przekształcić np. za pomocą /usr/lib/"
-"collectd-core/utils/migrate-4-5.px."
+"collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Plik /usr/share/doc/collectd-core/NEWS.Debian oraz wiki collectd <http://"
+"Plik /usr/share/doc/collectd-core/NEWS.Debian.gz oraz wiki collectd <http://"
"collectd.org/wiki/index.php/V4_to_v5_migration_guide> zawiera więcej "
"informacji na ten temat."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 9bcf2d373510751445618d3dbfd0f9d765d7c00f..810768cf30dd568e6cdc56ee24c60fb22ab33e03 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"A disposição dos ficheiros RRD criada pelo collectd foi alterada "
"significativamente desde a versão 3.x. De forma a manter os seus dados "
"antigos você terá que migrá-los. Isto pode ser feito usando /usr/lib/"
-"collectd-core/utils/migrate-3-4.px."
+"collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian para mais detalhes."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian.gz para mais detalhes."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"A disposição de alguns ficheiros RRD criada pelo collectd foi alterada desde "
"a versão 4.x. De modo a manter os seus dados antigos você terá que migrá-"
-"los. Isto pode ser feito usando /usr/lib/collectd-core/utils/migrate-4-5.px."
+"los. Isto pode ser feito usando /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"Veja /usr/share/doc/collectd-core/NEWS.Debian e o wiki do collectd em "
+"Veja /usr/share/doc/collectd-core/NEWS.Debian.gz e o wiki do collectd em "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para mais "
"detalhes."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 2009998b899587463e56e358a16b98f634c82fb8..bb762e61400eb16857cffc4872fafa4980463d6b 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
#
msgid ""
msgstr ""
-"Project-Id-Version: collectd 4.10.7-1\n"
+"Project-Id-Version: collectd 5.1.0-3\n"
"Report-Msgid-Bugs-To: collectd@packages.debian.org\n"
"POT-Creation-Date: 2012-05-19 17:59+0200\n"
-"PO-Revision-Date: 2012-05-20 21:50-0300\n"
+"PO-Revision-Date: 2012-08-19 10:32-0300\n"
"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
"org>\n"
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"O layout dos arquivos RRD criados pelo collectd foi alterado "
"significativamente desde a versão 3.x. Para manter seus dados antigos você "
-"deve migrá-los. Isso pode ser feito usando /usr/lib/collectd-core/utils/"
+"deve migrá-los. Isso pode ser feito usando /usr/lib/collectd/utils/"
"migrate-3-4.px."
#. Type: note
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian para detalhes."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian.gz para detalhes."
#. Type: boolean
#. Description
#. Type: note
#. Description
#: ../collectd-core.templates:3001
-#, fuzzy
-#| msgid "Layout of RRD files has changed"
msgid "Layout of RRD files has changed in version 5.0"
-msgstr "O layout dos arquivos RRD foi alterado"
+msgstr "O layout dos arquivos RRD foi alterado na versão 5.0"
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
-#, fuzzy
-#| msgid ""
-#| "The layout of the RRD files created by collectd has changed significantly "
-#| "since version 3.x. In order to keep your old data you have to migrate it. "
-#| "This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
-"O layout dos arquivos RRD criados pelo collectd foi alterado "
-"significativamente desde a versão 3.x. Para manter seus dados antigos você "
-"deve migrá-los. Isso pode ser feito usando /usr/lib/collectd-core/utils/"
-"migrate-3-4.px."
+"O layout dos arquivos RRD criados pelo collectd foi alterado desde a versão "
+"4.x. Para manter seus dados antigos você deve migrá-los. Isso pode ser feito "
+"usando /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
+"Veja /usr/share/doc/collectd-core/NEWS.Debian.gz e o wiki do collectd em "
+"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para detalhes."
#. Type: boolean
#. Description
"recent or custom version or if you want to keep the data for further "
"analysis, the data should be kept."
msgstr ""
-"Se você está expurgando o pacote collectd para substitui-lo por uma versão "
+"Se você está expurgando o pacote collectd para substituí-lo por uma versão "
"mais recente ou personalizada, ou se você quer manter os dados para uma "
"análise mais aprofundada, os dados deveriam ser mantidos."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 54d581a514e37e92885145865955d1c085ad1c42..4907def9f8884ff72f7d55be60b638d6eab3ae5a 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Начиная с версий 3.x изменилось расположение файлов RRD, создаваемых "
"collectd. Чтобы сохранить старые данные, вы должны их переместить. Это можно "
-"сделать с помощью /usr/lib/collectd-core/utils/migrate-3-4.px."
+"сделать с помощью /usr/lib/collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Подробности см. в /usr/share/doc/collectd-core/NEWS.Debian."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Подробности см. в /usr/share/doc/collectd-core/NEWS.Debian.gz."
#. Type: boolean
#. Description
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Начиная с версий 4.x изменилось расположение файлов RRD, создаваемых "
"collectd. Чтобы сохранить старые данные, вы должны их переместить. Это можно "
-"сделать с помощью /usr/lib/collectd-core/utils/migrate-4-5.px."
+"сделать с помощью /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Дополнительную информацию можно найти в файле /usr/share/doc/collectd-core/"
-"NEWS.Debian и вики collectd wiki по адресу <http://collectd.org/wiki/index."
+"NEWS.Debian.gz и вики collectd wiki по адресу <http://collectd.org/wiki/index."
"php/V4_to_v5_migration_guide>."
#. Type: boolean
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 8b47ace4192a57357a5af32f6fe2186aa763185e..eef93acad7a7b0ec4ce4c65cfa0b651a585797d2 100644 (file)
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
#. Description
#: ../collectd-core.templates:1001
#: ../collectd-core.templates:2001
-msgid "The layout of the RRD files created by collectd has changed significantly since version 3.x. In order to keep your old data you have to migrate it. This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
-msgstr "Rozloženie súborov RRD, ktoré vytvára collectd sa výrazne zmenilo od verzie 3.x. Ak si chcete zachovať vaše staré dára, musíte ich migrovať. To je možné pomocou /usr/lib/collectd-core/utils/migrate-3-4.px."
+msgid "The layout of the RRD files created by collectd has changed significantly since version 3.x. In order to keep your old data you have to migrate it. This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
+msgstr "Rozloženie súborov RRD, ktoré vytvára collectd sa výrazne zmenilo od verzie 3.x. Ak si chcete zachovať vaše staré dára, musíte ich migrovať. To je možné pomocou /usr/lib/collectd/utils/migrate-3-4.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:1001
#: ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian"
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
+msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian.gz"
#. Type: boolean
#. Description
#. Description
#: ../collectd-core.templates:3001
#: ../collectd-core.templates:4001
-msgid "The layout of some RRD files created by collectd has changed since version 4.x. In order to keep your old data you have to migrate it. This can be done by using /usr/lib/collectd-core/utils/migrate-4-5.px."
-msgstr "Rozloženie súborov RRD, ktoré vytvára collectd sa výrazne zmenilo od verzie 4.x. Ak si chcete zachovať vaše staré dára, musíte ich migrovať. To je možné pomocou /usr/lib/collectd-core/utils/migrate-4-5.px."
+msgid "The layout of some RRD files created by collectd has changed since version 4.x. In order to keep your old data you have to migrate it. This can be done by using /usr/lib/collectd/utils/migrate-4-5.px."
+msgstr "Rozloženie súborov RRD, ktoré vytvára collectd sa výrazne zmenilo od verzie 4.x. Ak si chcete zachovať vaše staré dára, musíte ich migrovať. To je možné pomocou /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001
#: ../collectd-core.templates:4001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
-msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian a na wiki collectd na adrese <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>"
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian.gz a na wiki collectd na adrese <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>"
#. Type: boolean
#. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 986f93e956793cde5d93517fbcc0249c9d5b7b5f..6756339ef1f24de0402d7a722f6e3a1ed4051172 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Strukturen för RRD-filen som collectd skapar har ändrats mycket sedan "
"version 3.x. För att behålla dina gamla data måste dessa migreras, detta kan "
-"göras genom att köra '/usr/lib/collectd-core/utils/migrate-3-4.px'."
+"göras genom att köra '/usr/lib/collectd/utils/migrate-3-4.px'."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"Läs även /usr/share/doc/collectd-core/NEWS.Debian för ytterligare "
+"Läs även /usr/share/doc/collectd-core/NEWS.Debian.gz för ytterligare "
"information."
#. Type: boolean
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Strukturen för RRD-filerna som collectd skapar har ändrats sedan version 4."
"x. För att behålla dina gamla data måste dessa migreras, detta kan göras "
-"genom att köra /usr/lib/collectd-core/utils/migrate-4-5.px."
+"genom att köra /usr/lib/collectd/utils/migrate-4-5.px."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
-"För mer information läs /usr/share/doc/collectd-core/NEWS.Debian och "
+"För mer information läs /usr/share/doc/collectd-core/NEWS.Debian.gz och "
"collectd-wikin på <http://collectd.org/wiki/index.php/"
"V4_to_v5_migration_guide>."
index 11fbd8de9b2c514f47a5c81663ef750032cf3719..54b0821b0d3fe9aaf2584ac00470cde5ecac0454 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
#. Type: note
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
#. Type: boolean
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
#. Type: note
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 02f1761ef586ce772cc8eb7deda771e5fb0d7c96..4e4439216c09d84c30b0cc75c9db11ae5a4a5a11 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
msgid ""
"The layout of the RRD files created by collectd has changed significantly "
"since version 3.x. In order to keep your old data you have to migrate it. "
-"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgstr ""
"Bố trí của tập tin RRD được collectd thu thập đã thay đổi nhiều kể từ phiên "
"bản 3.x. Muốn giữ lại dữ liệu cũ thì bạn cần phải nâng cấp, dùng « /usr/lib/"
-"collectd-core/utils/migrate-3-4.px »."
+"collectd/utils/migrate-3-4.px »."
#. Type: note
#. Description
#. Type: boolean
#. Description
#: ../collectd-core.templates:1001 ../collectd-core.templates:2001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details."
msgstr ""
-"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian » để tìm chi "
+"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian.gz » để tìm chi "
"tiết."
#. Type: boolean
#| msgid ""
#| "The layout of the RRD files created by collectd has changed significantly "
#| "since version 3.x. In order to keep your old data you have to migrate it. "
-#| "This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
+#| "This can be done by using /usr/lib/collectd/utils/migrate-3-4.px."
msgid ""
"The layout of some RRD files created by collectd has changed since version 4."
"x. In order to keep your old data you have to migrate it. This can be done "
-"by using /usr/lib/collectd-core/utils/migrate-4-5.px."
+"by using /usr/lib/collectd/utils/migrate-4-5.px."
msgstr ""
"Bố trí của tập tin RRD được collectd thu thập đã thay đổi nhiều kể từ phiên "
"bản 3.x. Muốn giữ lại dữ liệu cũ thì bạn cần phải nâng cấp, dùng « /usr/lib/"
-"collectd-core/utils/migrate-3-4.px »."
+"collectd/utils/migrate-3-4.px »."
#. Type: note
#. Description
#. Description
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
-"See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
+"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
diff --git a/debian/rules b/debian/rules
index 8e186fca503f58161e68ce7b29f782fb6c85366e..b0dd9fde0334b8b2b35933d8db76d97e226482c2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
CPPFLAGS += -I$(CURDIR)/debian/include
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
-CFLAGS += -Wall
+CFLAGS += -Wall -Wno-error=deprecated-declarations
# There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is
# however required by the perl plugin (which would otherwise be unable to find
CPPFLAGS += -UCONFIGFILE
CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"'
+# A PostgreSQL header redefines CACHE_LINE_SIZE on FreeBSD.
+# Cf. https://bugs.debian.org/760719 and https://bugs.debian.org/763098
+ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+ CPPFLAGS += -Wp,-w
+endif
+
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
# The archdir map has been copied from openjdk-6's debian/rules.
ifeq (,$(JAVA_ARCHDIR))
JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
endif
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
+JAVA_HOME = /usr/lib/jvm/default-java
JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
JAVAC = $(JAVA_HOME)/bin/javac
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man \
--localstatedir=/var --sysconfdir=/etc \
- --with-perl-bindings="INSTALLDIRS=vendor" \
+ --with-perl-bindings="INSTALLDIRS=vendor INSTALL_BASE=" \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
# Solaris only (requires devinfo and kstat)
confflags += --disable-tape
+# libaquaero5 is required for the aquaero plugin
+confflags += --disable-aquaero
+
+# libmic is required for the mic plugin
+confflags += --disable-mic
+
# libnetapp is required for the netapp plugin.
confflags += --disable-netapp
-# libowcapi is required for the onewire plugin.
-confflags += --disable-onewire
-
# libclntsh is required for the oracle plugin.
confflags += --disable-oracle
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
+# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
+confflags += --disable-sigrok
+
+# varnish does not currently work with varnish4
+# (c.f. https://bugs.debian.org/745902)
+confflags += --disable-varnish
+
# libmongoc is required for the write_mongodb plugin.
confflags += --disable-write_mongodb
# libkstat is required for the xfs_arc plugin.
confflags += --disable-zfs-arc
-# The static library netstat cannot be linked into shared objects on some
-# architectures (see bugs #358637, #419684 and #524593 for more details).
-ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH)))
- confflags += --disable-netlink
-endif
-
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
+ --disable-cgroups \
--disable-ethstat \
--disable-iptables \
--disable-ipvs \
+ --disable-lvm \
--disable-madwifi \
--disable-md \
--disable-netlink \
--disable-vserver
endif
+# This plugin is FreeBSD-specific.
+ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+ confflags += \
+ --disable-pf
+endif
+
# These plugins have not been ported to FreeBSD yet.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
# Work-around an incomplete check for kvm functionality
endif
# The hppa buildds currently do not keep up with Java related stuff, thus
-# prevending testing transitions.
-ifneq (,$(filter hppa, $(DEB_BUILD_ARCH)))
+# prevending testing transitions. sparc is also having trouble building the
+# java plugin.
+ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH)))
confflags += --disable-java
endif
dh_clean -k
dh_installdirs -i
dh_install -i
+
+ # update include path for collectd header files
+ sed -r -i -e 's/include "(.*)"/include "collectd\/core\/\1"/' \
+ $(CURDIR)/debian/collectd-dev/usr/include/collectd/core/*
+ sed -r -i -e 's/"collectd\/core\/(liboconfig\/.*)"/"collectd\/\1"/' \
+ $(CURDIR)/debian/collectd-dev/usr/include/collectd/core/*
install-arch: build
dh_testdir
contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
contrib/collectd_network.py contrib/collectd_unixsock.py \
contrib/snmp-probe-host.px contrib/GenericJMX.conf \
+ contrib/postgresql \
debian/collectd.conf debian/filters.conf debian/thresholds.conf
# some upstream tarballs have been built inside a dirty working dir
( cd debian/collectd-core/ \
diff --git a/debian/thresholds.conf b/debian/thresholds.conf
index 53c62beebcc97c8103272212aff533e4e5c742ce..2bd4f2c0452d90a77c33c1c44875147048d1293e 100644 (file)
--- a/debian/thresholds.conf
+++ b/debian/thresholds.conf
# Threshold configuration for collectd(1).
#
-# See the section "THRESHOLD CONFIGURATION" in collectd.conf(5) for details.
+# See the collectd-threshold(5) manual page for details.
#LoadPlugin "threshold"
#<Plugin "threshold">