[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Tue Sep 15 22:18:54 CEST 2009
ChangeLog | 64 +-
README | 3 +-
bindings/java/Makefile.am | 12 +-
configure.in | 76 +-
contrib/collectd_unix_sock.rb | 135 +
contrib/collection.cgi | 6 +-
contrib/collection3/bin/index.cgi | 4 +-
contrib/collection3/etc/collection.conf | 68 +
contrib/collection3/lib/Collectd/Graph/Common.pm | 11 +-
contrib/collection3/lib/Collectd/Graph/Type.pm | 22 +-
.../lib/Collectd/Graph/Type/GenericStacked.pm | 66 +-
.../lib/Collectd/Graph/Type/JavaMemory.pm | 158 ++
.../collection3/lib/Collectd/Graph/TypeLoader.pm | 8 +-
contrib/cussh.pl | 50 +-
src/Makefile.am | 6 +-
src/apache.c | 1 +
src/ascent.c | 1 +
src/bind.c | 1 +
src/collectd-exec.pod | 17 +
src/collectd-java.pod | 132 +
src/collectd.conf.in | 5 +-
src/collectd.conf.pod | 5 +
src/curl.c | 1 +
src/df.c | 20 +-
src/dns.c | 2 +
src/exec.c | 16 +-
src/filter_chain.c | 2 +-
src/iptables.c | 49 +-
src/libiptc/Makefile.am | 15 -
src/libiptc/README.collectd | 25 -
src/libiptc/ipt_kernel_headers.h | 45 -
src/libiptc/libip4tc.c | 516 ----
src/libiptc/libip6tc.c | 455 ----
src/libiptc/libip6tc.h | 175 --
src/libiptc/libiptc.c | 2708 --------------------
src/libiptc/libiptc.h | 187 --
src/libiptc/libxtc.h | 53 -
src/libiptc/linux_list.h | 741 ------
src/libiptc/xtables.h | 239 --
src/mysql.c | 6 +-
src/network.c | 9 +
src/nginx.c | 2 +
src/owniptc/Makefile.am | 15 +
src/owniptc/README.collectd | 25 +
src/owniptc/ipt_kernel_headers.h | 45 +
src/owniptc/libip4tc.c | 516 ++++
src/owniptc/libip6tc.c | 455 ++++
src/owniptc/libip6tc.h | 175 ++
src/owniptc/libiptc.c | 2708 ++++++++++++++++++++
src/owniptc/libiptc.h | 187 ++
src/owniptc/libxtc.h | 53 +
src/owniptc/linux_list.h | 741 ++++++
src/owniptc/xtables.h | 239 ++
src/plugin.c | 8 +
src/powerdns.c | 35 +-
src/rrdtool.c | 4 +
src/swap.c | 1 +
src/utils_cache.c | 3 +
src/utils_threshold.c | 5 +
59 files changed, 6064 insertions(+), 5268 deletions(-)
New commits:
commit 91743fc0c8785f84f3976d5f5d430b1b3a7d4918
Merge: 6f42db1a14f449f99963191f372c61d418bc8a08 beb06e98c5aea9272c5972eee372b42c6abdd2b0
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Sep 15 22:18:24 2009 +0200
Merge branch 'collectd-4.8'
Conflicts:
src/exec.c
commit beb06e98c5aea9272c5972eee372b42c6abdd2b0
Merge: 4d4d8b01e00c45a647ad592ea8159088b950ec40 f6f13c914fe9ec2849dd360d96ff44571b37ab81
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Sep 15 22:17:49 2009 +0200
Merge branch 'collectd-4.7' into collectd-4.8
commit 6f42db1a14f449f99963191f372c61d418bc8a08
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Sep 15 21:28:07 2009 +0200
collectd-exec(5): Document the environment variables.
commit f6f13c914fe9ec2849dd360d96ff44571b37ab81
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Sep 15 15:40:47 2009 +0200
exec plugin: Clear the signal block mask before calling exec(2).
commit 7f71f1b7a38d7b50af44f403b79aa034b3882f2a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Sep 14 16:01:48 2009 +0200
exec plugin: Avoid a warning when freeing meta data.
commit a0e87023585f040b85877b05a21d8453f8f8850c
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Sep 14 15:41:07 2009 +0200
contrib/collection3: Suppress warnings about non-existent classes.
commit 4d4d8b01e00c45a647ad592ea8159088b950ec40
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Sep 14 15:40:08 2009 +0200
ChangeLog: Remove an excess newline.
commit fae3fa6c0b21c3c333b2fe9f00fbf0a21d0b6ba5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Sep 14 10:06:49 2009 +0200
src/collectd.conf.in: Fix entries of renamed plugins.
commit 755022b7fcbae59450800dfde492808e546d682f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 22:20:48 2009 +0200
configure.in: Make it possible to force the shipped version of libiptc.
You can force the shipped version of libiptc using:
--with-libiptc=shipped
Apparently enough systems include broken versions of that library :/
commit 4519a3ef8a9ab10324aab5ea55a149a85463c6c4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 22:05:21 2009 +0200
configure.in: Quote $CFLAGS when assigning to another variable.
commit 77bc3eaabd62b4e931ba0a18e1a75d1f8c8b3c8a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 16:32:52 2009 +0200
ChangeLog: Document the “GETTHRESHOLD†command.
commit 38c054b41b069e970dc0af98a1be51f95b046b47
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 16:23:04 2009 +0200
src/utils_threshold.c: Update copyright information.
commit 5938d9330e119bade09aa27384b2213e93ee1360
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 16:20:23 2009 +0200
dns, network, rrdtool plugins: Updated copyright information.
commit 5bcdd49ccd9eb9c817c3f66d1d1eb4eb275981d5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 16:09:27 2009 +0200
swap plugin: Add copyright information for Stefan Völkel.
commit 5be7e28ae5397f0074eb7b395006211f60406a4f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 15:49:29 2009 +0200
bindings/java: Compile and install the “GenericJMX†plugin.
commit bde49ea399fe5867ffce005e790439d2eb5796f7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 15:49:01 2009 +0200
collectd-java(5): Document the “GenericJMX†plugin.
commit 79c87aeda9172e219a842e393c6499c8bf37662a
Merge: e6a052ab22a285b1c6e91fb8678168fd1ffdca92 a9d3d970d5add3798d46c81b35ffe4ed17dea320
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 14:32:34 2009 +0200
Merge branch 'collectd-4.7' into collectd-4.8
Conflicts:
ChangeLog
contrib/collection3/etc/collection.conf
src/df.c
version-gen.sh
commit a9d3d970d5add3798d46c81b35ffe4ed17dea320
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 12:36:33 2009 +0200
Bumped version to 4.7.3; Updated ChangeLog.
commit 3ddd3791fefa478d770aba82303ec6a1913874fc
Merge: 658c85755ef1f4284228d1e5edbc4452a31bd944 50aeefda1c2fab3be57d26e1ca221c1e3774e5c3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 13 12:24:20 2009 +0200
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
ChangeLog
version-gen.sh
commit 50aeefda1c2fab3be57d26e1ca221c1e3774e5c3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Sep 10 20:19:24 2009 +0200
Bump version to 4.6.5.
commit 4091649df24f72bce130564021dcec09c774f1f1
Author: Florian Forster <octo at noris.net>
Date: Wed Aug 26 15:09:47 2009 +0200
collection3: Added some more metrics.
commit 29ae99e71a8f10fd867392aaa944a58a6242e221
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Sep 9 18:37:25 2009 +0200
Fixed the year of the first three entries.
They say it was 2004, but in fact they were released in 2005.
commit 3055aefb6344cbc85770ceb3ee41edb84aa1f639
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Sep 9 18:36:45 2009 +0200
ChangeLog: Add entries for release 4.6.5.
commit c449824f7575cb1f674264c6a21c0ce34206557d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Sep 8 17:45:56 2009 +0200
powerdns plugin: Use the “ipt_packets†type rather than “io_packetsâ€.
“io_packetsâ€, as the name suggests, requires incoming *and* outgoing
packets. The infrastructure of the powerdns plugin uses only value lists
with one data source though.
Thanks to Luke for noticing!
commit e6a052ab22a285b1c6e91fb8678168fd1ffdca92
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Sep 8 17:37:59 2009 +0200
ChangeLog: Fix a typo.
commit e5cb67059718bb37c55831b9c7d62c05bd7dafee
Author: Duncan Mac-Vicar P <dmacvicar at suse.de>
Date: Sun Sep 6 17:22:37 2009 +0200
contrib/collectd_unix_sock.rb: Ruby class which abstracts the plain text protocol.
Used to talk to the unixsock plugin.
Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>
commit 4b357298a23cfb0583851e7cd5cc937470949623
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 6 17:06:56 2009 +0200
src/utils_cache.c: Fix a very rare deadlock situation.
Only happened in an out-of-memory situation. Still, not nice ;)
commit 658c85755ef1f4284228d1e5edbc4452a31bd944
Merge: 9d15d1058b93acb7be041934acfe76548539041a b3315d59fb67edf77cfd90519c750ae1ce7e4146
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Sep 6 12:52:15 2009 +0000
Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.
Conflicts:
src/iptables.c
To resolve the conflict, the changes to the iptables plugin have been updated
to support ip6tc as well.
commit b3315d59fb67edf77cfd90519c750ae1ce7e4146
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Sep 6 12:14:55 2009 +0000
iptables plugin: Support the new libiptc API.
When libiptc has been officially made available as a shared library, the API
and ABI have been changed slightly. By checking for the existance of a type
that has been removed in that course, configure now checks which version is
available. This is quite error prone (the type might be re-introduced any
time), so this should be improved some time - currently, I do not have an idea
how to do so, though :-/
commit cba0f3fc0e50b9aa9c24e355926b290efa35e8a6
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Sep 6 10:36:10 2009 +0000
configure: Replaced src/libiptc/ with src/owniptc/.
commit 9d15d1058b93acb7be041934acfe76548539041a
Merge: cce535f9fbb96dce74e94c5077bae08b1be8b2c4 2438b95b7f7930902d021aa749308ea8ae5652ca
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 6 12:15:06 2009 +0200
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
configure.in
src/iptables.c
commit 2438b95b7f7930902d021aa749308ea8ae5652ca
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Sep 6 12:06:12 2009 +0200
src/owniptc: Moved the “src/libiptc†directory to “src/owniptc†to avoid build issues.
If there is a system-wide version of this library available, the “-I.â€
argument (added automatically by automake :() will lead to the shipped
header files being used. Later, the binary is linked with the
system-wide library, which leads to severe problems when API/ABI
incompatibilities have been introduced in other versions.
commit cce535f9fbb96dce74e94c5077bae08b1be8b2c4
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Sep 1 22:49:47 2009 +0200
mysql plugin: Improve the `mysql_ping' warning.
commit 9b6e4d828a52bd8c11eeead1a39e7b9375abe4eb
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Aug 31 20:30:23 2009 +0200
network plugin: Move the gcrypt initialization into “network_initâ€.
commit 5899493b4434ba40638f8a5ffe4cb2e58bead3d4
Author: Luke Heberling <collectd at c-ware.com>
Date: Mon Aug 31 10:31:30 2009 -0700
network plugin: Fix initialization of the gcrypt library.
Subject: Ohhhh jeeee, libgcrypt 1.4.1 + collectd 4.7.2
On Monday 31 August 2009 09:03:37 Sebastian Harl wrote:
> Hrm … from a quick look at the libcrypt documentation I suppose we need
> to call gcry_control() using the 'GCRYCTL_INIT_SECMEM' command to
> explicitly initialize the secure memory. Sounds like this was required
> in libgcrypt 1.4.1 but is handled automatically in later versions.
>
also looks like there's some special initialization necessary for threads. I
doubt that this is handled by the new default behavior in 1.4.4. Don't know
that it's truly necessary if the network plugin is the only plugin using
gcrypt.
Here's a patch that works for me with 1.4.1.
I followed an example for pthread initialization and initialized gcry to 32k,
only since that's apparently the default that's used in 1.4.3. I did it in
network.c's module_register function. Kind of an abuse, I know.
Luke Heberling
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit eb1d4382c6c29ce598052daaf13ef6ff6672430f
Author: Anthony Dewhurst <dewhurst at gmail.com>
Date: Sun Aug 30 22:32:55 2009 +0100
contrib/collection3: Allow numbers in type names.
When converting the on-disk type name to the displayed name,
do not strip numbers out.
Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>
commit 6cd3f6a3bcec1298eeb79ce531858919388a05e5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Aug 31 17:16:40 2009 +0200
contrib/collection3: GenericStacked: Use stacking by default.
commit 03f24261247baff4ecf72373f6173ae82395f199
Author: Anthony Dewhurst <dewhurst at gmail.com>
Date: Sun Aug 2 23:25:45 2009 +0100
contrib/collection3: Option to turn stacking off in GenericStacking
CDEFs are not stacked and AREAs are not added when "Stacking" is set to off.
Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>
commit 2f23f605cb74588854b67b6a50850dbaa4d8d93d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sat Aug 29 13:58:56 2009 +0200
src/plugin.c: unregister_read: llist_search may return NULL.
Handle these cases gracefully.
commit a61283c0682513a849cdb57ca5346188785a2a28
Author: Brad Fritz <brad at fewerhassles.com>
Date: Mon Aug 24 13:25:37 2009 -0400
contrib/collection.cgi: Fix spam_check graph for email plugin.
Corrects DS name to fix email plugin's spam_check graph.
Signed-off-by: Brad Fritz <brad at fewerhassles.com>
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 66d122095cac47cf22199fadc0b49ee4087e4169
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 26 13:47:47 2009 +0200
collection3: Add a module for the “java_memory†type.
commit 571806f201f21a10f6f700a4adf57480fafe5d54
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 26 13:46:36 2009 +0200
collection3: Add the possibility to scale generic graphs.
commit e391ecd14e8c0f153d46e11213e0effc662ff3b8
Author: Florian Forster <octo at noris.net>
Date: Wed Aug 26 11:31:24 2009 +0200
contrib/cussh.pl: Add synopsis for specific commands.
You can now do
HELP FLUSH
to get information about the FLUSH command.
commit 522aa06512b8c20dfda353ef3a74defe5ec66e4a
Author: Florian Forster <octo at noris.net>
Date: Wed Aug 26 10:34:08 2009 +0200
contrib/cussh.pl: Fix a typo in the `FLUSH' command.
commit 2344c63c0e2cabb30bfe3178532223dc38309aea
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Aug 23 10:54:22 2009 +0200
README: liboping is no longer shipped.
commit 1b0c4dd4a9426da7d0c8eecffc55c42551ba3080
Author: Aman Gupta <aman at tmm1.net>
Date: Sat Aug 22 14:07:26 2009 +0200
contrib/collection3: Common.pm: Sort identifiers by filename.
commit 98ee1a638880f794c89ca9f9aaf9aa31a68ce100
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Aug 20 14:10:37 2009 +0200
df plugin: Check ignorelists before stat'ing the filesystem.
→ See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542859
commit 23cbc33ec79a98119b284c2db6f5a228a97cac3b
Author: Luke Heberling <collectd at c-ware.com>
Date: Thu Aug 20 14:10:37 2009 +0200
powerdns plugin: Fix handling of the “LocalSocket†config option.
→ See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535787
commit 7595db879edf643aff84a77791bf50d757554125
Author: Luke Heberling <collectd at c-ware.com>
Date: Thu Aug 20 14:08:53 2009 +0200
powerdns plugin: Set a timeout for the datagram socket.
→ See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535787
commit 03aa21f08fede809f37a7443d3124fb9314f4dc8
Merge: dbbdb25542df6d9afbfddf78a3b1a8fee9029a80 17a04c7afcf44707f6bc45697212c1f8fc6aa761
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 20 13:52:34 2009 +0200
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
src/apache.c
commit 17a04c7afcf44707f6bc45697212c1f8fc6aa761
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 20 13:48:23 2009 +0200
Plugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option.
This hopefully fixes Debian#541953.
commit b4346f93d26c0f4f2afe39539f7812b0720a70ff
Author: Sebastian Harl <sh at tokkee.org>
Date: Tue Aug 18 09:55:42 2009 +0200
Removed remaining traces of the "main" chain.
The chains are called "PreCache" and "PostCache" now.
More information about the collectd-changes
mailing list