[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Sun Aug 21 16:53:41 CEST 2011
configure.in | 2 +
contrib/migrate-4-5.px | 5 ----
src/apache.c | 1 +
src/ascent.c | 1 +
src/bind.c | 1 +
src/collectd.h | 6 +++++
src/csv.c | 2 +-
src/curl.c | 1 +
src/curl_json.c | 51 +++++++++++++++++++++++++++++++++++++--------
src/curl_xml.c | 1 +
src/df.c | 5 +++-
src/disk.c | 2 -
src/java.c | 6 +---
src/libvirt.c | 4 ---
src/match_empty_counter.c | 2 -
src/meta_data.c | 1 +
src/mysql.c | 2 -
src/network.c | 6 +---
src/nginx.c | 1 +
src/notify_desktop.c | 11 ++++++++-
src/notify_email.c | 7 +++--
src/processes.c | 2 -
src/rrdtool.c | 6 +---
src/teamspeak2.c | 7 ++++++
src/utils_dns.c | 2 -
src/utils_format_json.c | 2 +-
src/utils_rrdcreate.c | 8 ++----
src/utils_rrdcreate.h | 2 +-
src/write_http.c | 1 +
29 files changed, 95 insertions(+), 53 deletions(-)
New commits:
commit 9b967a770f38099336c3652986d93c8b4d610a36
Merge: 514a9fe 4b962d3
Author: Florian Forster <octo at collectd.org>
Date: Sun Aug 21 16:51:36 2011 +0200
Merge branch 'collectd-5.0'
Conflicts:
configure.in
src/owniptc/libiptc.c
Change-Id: I0ab8fc1accd476f5d1a243b1a155eac4b751cd8c
commit 4b962d32365228d8984759d36269904527927cf3
Author: Florian Forster <octo at collectd.org>
Date: Sun Aug 21 16:50:29 2011 +0200
rrdtool plugin: Fix warning about unused variable "stepsize".
Change-Id: Ibd4dd3f17db62b10b96c59f37b66941ddc5ea7b0
commit ba2ee9aec4c0454eed8f29b4c6ce96c6fc372346
Merge: cf9ac77 b96e6dd
Author: Florian Forster <octo at collectd.org>
Date: Sun Aug 21 16:43:22 2011 +0200
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/curl_json.c
src/libvirt.c
Change-Id: I0852495b416435fa3cfd36068d967e0cd5ff689f
commit b96e6dd0fe5583ca809b66b2519e74081c79e4f3
Author: Florian Forster <octo at collectd.org>
Date: Sun Aug 21 16:40:23 2011 +0200
configure: Link with ip4tc and ip6tc, too.
This solves this problem:
octo at leeloo:/tmp $ gcc -o conftest -g -O2 conftest.c -liptc -ldl
/usr/bin/ld: /tmp/ccuJEDqP.o: undefined reference to symbol 'iptc_init'
/usr/bin/ld: note: 'iptc_init' is defined in DSO /lib64/libip4tc.so.0 so try adding it to the linker command line
/lib64/libip4tc.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
Why the iptables plugin compiles without this is beyond me.
Change-Id: If615bee0c9524d907ca1834d5c337ed50c625c5b
commit e82cc54af25806a47ba17a9002f1d536408bdfaa
Author: Florian Forster <octo at collectd.org>
Date: Tue Aug 16 08:51:59 2011 +0200
configure.in: Add AC_CONFIG_AUX_DIR for libltdl.
commit ba9b76d4be49c6a45b32a508c48e828a583b6dfc
Author: Florian Forster <octo at collectd.org>
Date: Tue Aug 16 08:51:21 2011 +0200
mysql plugin: Remove sideeffect-free function call.
commit 6c4ad411cc83a68086bebc24e814c3aea1cb8096
Author: Florian Forster <octo at collectd.org>
Date: Tue Aug 16 08:50:40 2011 +0200
notify_email plugin: Remove useless function and fix indentation.
commit 61a1fa91ba73e4fe3a34949f77c5f017056f2b7a
Author: Peter Green <plugwash at p10link.net>
Date: Tue Aug 16 08:48:52 2011 +0200
Many build fixes that turned up with GCC 4.6.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 7274cb052668eab0cd7dcb5d48d4dec75ae707b3
Author: Colin Patrick McCabe <cmccabe at alumni.cmu.edu>
Date: Wed Jul 27 10:00:30 2011 -0700
src/csv.c: use a bigger buffer
The CSV plugin formerly used a relatively small output buffer. If you
had a large dataset, you would always get error -1 because the line
length was be too long. This patch extends the buffer.
Signed-off-by: Colin McCabe <colin.mccabe at dreamhost.com>
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit cf9ac771ade7c5ba75ab13d2b4f2482983994840
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Jul 7 16:59:13 2011 +0200
src/utils_format_json.c: Correctly format the time of value lists.
Users should get epoch, not our internal format.
commit 5ec7a37c81d6f64f35b1f35e2f0e3157e83f2718
Author: Florian Forster <octo at collectd.org>
Date: Tue Jul 5 16:28:10 2011 +0200
curl_json plugin: Add compatibility code for libyajl v2.
Thanks to "spupykin" of the Arch Linux project on whose patch this commit is
loosely based.
commit e35f3c5c634216860f14586a7d17232022d8b588
Author: Mike Flisher <mike.flisher at gmail.com>
Date: Sun May 22 17:39:29 2011 +0200
Various plugins: Set the cURL option "CURLOPT_NOSIGNAL".
This fixes problems with version 7.21.2 (and later) of libcurl that are due to
collectd being a multi-threaded program.
Signed-off-by: Florian Forster <octo at collectd.org>
commit e7a699dcfa222133a6a0cfac1132702852a6f3bd
Author: Rafal Lesniak <lesniak at sra.uni-hannover.de>
Date: Fri May 13 17:15:54 2011 +0200
src/meta_data.c: Free a leaking mutex.
This problem primarily manifested on FreeBSD but may well effect other
systems as well.
Thanks to Tomas Krasnican for reporting this problem.
Signed-off-by: Florian Forster <octo at collectd.org>
commit cd88e32b08f73bb8aba6f9b1ff0f3928a137f372
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon May 9 23:36:17 2011 +0200
df plugin: Improve error message.
commit e61872d4b1325cb8d54f4cdb16f185fcfe2710a7
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Apr 27 17:29:33 2011 +0200
contrib/migrate-4-5.px: "df" does not have COUNTER DSTs.
commit 57b6a7ec7693cf8f111d9d4ab486eb5509c99836
Author: Florian Forster <octo at collectd.org>
Date: Sat Apr 23 08:31:08 2011 -0700
contrib/migrate-4-5.px: Remove useless "OutDir" option.
commit e6bfb0e87a4751459ff1920bb57acfcfd5661454
Author: Samuli Suominen <ssuominen at gentoo.org>
Date: Mon Mar 28 02:16:33 2011 +0200
notify_desktop plugin: Add compatibility code for libnotify 0.7.
The current code in src/notify_desktop.c is not compatible with the new
libnotify 0.7 API
This:
notification = notify_notification_new (summary, n->message, NULL, NULL);
Should now be:
notification = notify_notification_new (summary, n->message, NULL;
As in, one argument less for notify_notification_new.
But we can't just remove it or it'll break compability with libnotify
0.4.x and 0.5.x.
This piece of code sets dummy NOTIFY_CHECK_VERSION for libnotify-0.4.x,
because NOTIFY_CHECK_VERSION was added only in 0.5.x:
#ifndef NOTIFY_CHECK_VERSION
#define NOTIFY_CHECK_VERSION(x,y,z) 0
#endif
Then we can freely use NOTIFY_CHECK_VERSION, and it will work with all
of 0.4, 0.5 and 0.7 series:
#if NOTIFY_CHECK_VERSION (0, 7, 0)
do something cool
#endif
I'm attaching the working patch. It's been tested with all of the
mentioned versions, as well as it's in active use at Gentoo Linux.
Thanks, Samuli
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 5f2db377613d8f9d586fcadad706345af1afdc37
Author: Florian Forster <octo at collectd.org>
Date: Sun Mar 27 11:58:40 2011 -0700
src/collectd.h: Define "_Bool" to "int" if the C compiler doesn't know the type.
More information about the collectd-changes
mailing list