[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Mon Aug 17 10:48:21 CEST 2009
ChangeLog | 2 +-
contrib/collection3/bin/graph.cgi | 1 +
contrib/collection3/etc/collection.conf | 8 +-
contrib/fedora/init.d-collectd | 2 +-
src/collectd.conf.in | 2 +-
src/collectd.conf.pod | 4 +-
src/java.c | 72 ++++++++++++++++-
src/libvirt.c | 35 ++++++---
src/meta_data.c | 2 +-
src/plugin.c | 132 +++++++++++++++++++++++++------
src/utils_cache.c | 26 +++++--
11 files changed, 232 insertions(+), 54 deletions(-)
New commits:
commit 1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c
Merge: dc0a112ba2a77dc61ab99dcbbda2e0bbf133d6ed de38c1a6e44cadfc88fc6e1d0919663f0c08bbdc
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Aug 17 10:46:05 2009 +0200
Merge branch 'collectd-4.7'
Conflicts:
src/network.c
commit de38c1a6e44cadfc88fc6e1d0919663f0c08bbdc
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Aug 17 10:39:55 2009 +0200
java plugin: Wait with the configuration until the daemon has forked.
Passing the configuration to Java-based plugins requires the JVM to be
active and running. However, the JVM starts some threads that are lost
when the daemon forks to the background.
This patch changes the behavior of the Java plugin to copy the
configuration blocks found to a local variable and run the configuration
of the Java-based plugins from the `init' callback, because it is
invoked after the daemon has forked to the background.
commit 8f40e8dacad2bfcb9d659e12740aa3ebc15ada65
Merge: b6c75ecde000fd1377338a1ceb40f567ff60fbb6 94f2ff236902035a1d549bbe393402ec30ee245f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Aug 17 09:48:43 2009 +0200
Merge branch 'collectd-4.6' into collectd-4.7
commit 94f2ff236902035a1d549bbe393402ec30ee245f
Author: Alan Pevec <apevec at redhat.com>
Date: Wed Aug 12 00:52:47 2009 +0200
contrib/fedora/init.d-collectd: Fix condrestart.
on upgrade collectd is not restarted
https://bugzilla.redhat.com/show_bug.cgi?id=516273
Signed-off-by: Alan Pevec <apevec at redhat.com>
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 08f5dee4cf337eb0cac72b87c24092e4ea2089cf
Author: Andrés J. DÃaz <ajdiaz at connectical.com>
Date: Tue Aug 11 21:57:34 2009 +0200
src/utils_cache.c: Update GETVAL output when missing state.
Hi
I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.
I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.
BTW a GETSTATE command will be an useful feature too :P
Regards,
Andres
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit b6c75ecde000fd1377338a1ceb40f567ff60fbb6
Author: Andrés J. DÃaz <ajdiaz at connectical.com>
Date: Tue Aug 11 21:57:34 2009 +0200
src/utils_cache.c: Update GETVAL output when missing state.
Hi
I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.
I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.
BTW a GETSTATE command will be an useful feature too :P
Regards,
Andres
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 2c4802dbdf90c721202fd87f8141ab079b085c56
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 13 12:37:20 2009 +0200
src/plugin.c: Make `plugin_unregister_read' functional again.
commit 633b8c6bbac1c6de6c675f28e428b7415e283d64
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 12 15:08:40 2009 +0200
libvirt plugin: Further improve the connection handling.
Use the complaint mechanism for failed connection attempts and handle multiple
`Connection' configuration options like other options in other plugins (i. e.
later options overwrite earlier settings of the same name).
commit 3602864950048219eb2981be13d902cc60117da2
Author: Alan Pevec <apevec at redhat.com>
Date: Wed Aug 12 00:53:00 2009 +0200
libvirt plugin: Re-connect to libvirtd if connecting fails.
https://bugzilla.redhat.com/show_bug.cgi?id=480997
Signed-off-by: Alan Pevec <apevec at redhat.com>
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit deafbed6154307233c5e7846d13c130f414ea508
Author: Florian Forster <octo at noris.net>
Date: Wed Jul 22 10:20:59 2009 +0200
src/meta_data.c: Fix a typo.
commit 5313ade6a32041b9312e7fe38bb6a212a85f9a0b
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date: Tue Aug 4 17:37:25 2009 +0200
collectd.conf(5): Fix two minor typos.
commit 515a4e0625d35c791daf283c91461416e6be65ed
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 4 12:13:41 2009 +0200
network plugin: Fix an incorrectly used configuration variable.
The `CacheFlush' option was assigned to the `TTL' variable. Ouch.
Version 4.6 and earlier are not effected.
commit 38469fd7bce3b64857c711169c6289f16d8f0114
Merge: 5e22694c513a35135c9155e410a49d83ad73302b ff607e9d1abc8f738b15626b5d30145d9a9f3f0d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Aug 2 12:22:20 2009 +0200
Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
commit 5e22694c513a35135c9155e410a49d83ad73302b
Author: Anthony Dewhurst <dewhurst at gmail.com>
Date: Thu Jul 30 21:42:07 2009 +0100
contrib/collection3: Don't use SI prefix for number of processes
I, at least, don't normally measure processes in "milliprocesses".
Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>
commit ff607e9d1abc8f738b15626b5d30145d9a9f3f0d
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Jul 26 15:01:53 2009 +0200
collection3/etc/collection.conf: Reencoded in UTF-8.
Depending on the locale settings, RRDtool might fail to handle "special
characters" correctly. Using UTF-8 is a way to work around that issue.
Thanks to Daniel Danner for reporting and testing this.
commit c2593281c3ed2919f67514381be2b5137308f3af
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Jul 8 13:19:57 2009 +0200
src/utils_cache.c: Make really sure to free the right cache entry.
Make sure we do not try to free a (possibly some random) cache entry after
removing it from the AVL tree. Potentially, this might have caused invalid
free()s in some rare situations.
commit a77086739afba579bee2a4a216b9e1018ef8a442
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Jul 21 08:46:49 2009 +0200
src/collectd.conf.in: Fix a typo.
commit 22d070094908358bccc1f1ff9189ebaf98fe8bc6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sun Jul 19 17:38:55 2009 +0200
ChangeLog: Fix a typo.
More information about the collectd-changes
mailing list