[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Sat Nov 6 12:11:25 CET 2010
README | 3 +
configure.in | 4 +
contrib/collection3/etc/collection.conf | 10 +++
contrib/collection3/lib/Collectd/Graph/Common.pm | 4 +-
src/collectd-python.pod | 18 +++--
src/collectd.h | 4 -
src/curl_json.c | 1 +
src/match_value.c | 9 ++
src/netapp.c | 92 +++++++++++----------
src/network.c | 8 ++-
src/notify_email.c | 45 +++++++++--
src/python.c | 4 +
src/types.db | 1 -
src/utils_cache.c | 2 +-
src/utils_match.c | 2 +-
src/utils_tail.c | 9 ++
16 files changed, 149 insertions(+), 67 deletions(-)
New commits:
commit a898c17330d9a2039bcdb8f7e6dbedba516a6cd8
Merge: 2bd3d909fc730c69cfce902ea5bf3fbb18352f1a 171d6a4bd5e05b56be83860701d35bfe1373d6a7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sat Nov 6 12:11:23 2010 +0100
Merge branch 'collectd-4.10'
commit 171d6a4bd5e05b56be83860701d35bfe1373d6a7
Merge: 72c467f5e8be1a24976d0808a8bdcaa85c6ef9d9 b86dd62eef146a35d43b60efa20d30756ce78d00
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sat Nov 6 12:08:20 2010 +0100
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/collectd.conf.in
src/python.c
commit b86dd62eef146a35d43b60efa20d30756ce78d00
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sat Nov 6 09:58:57 2010 +0100
README: Add libperfstat as an optional dependency.
commit a81756879d5872e75cdf4f25dbd69e4bdedd8634
Author: Sven Trenkel <collectd at semidefinite.de>
Date: Mon Oct 11 13:35:39 2010 +0200
netapp plugin: Fixed a bug that prevented the configured interval to be passed on to the dispatch function.
commit 72c467f5e8be1a24976d0808a8bdcaa85c6ef9d9
Merge: 2e4b4e1aaea45c4e1df80c23a549ca7af8871f35 df7ef4fa703e56bd33459c2099d2f43391ab36a0
Author: Florian Forster <octo at noris.net>
Date: Wed Oct 6 10:11:10 2010 +0200
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
commit df7ef4fa703e56bd33459c2099d2f43391ab36a0
Author: Sven Trenkel <collectd at semidefinite.de>
Date: Tue Oct 5 01:26:22 2010 +0200
Fixed epic documentation fail. Python3 and meta-data support was added with 4.10 but is still listed as missing.
commit b26f349d681c60cdad4c4dbde0ea6adfbe7d741a
Author: Sven Trenkel <collectd at semidefinite.de>
Date: Fri Oct 1 02:41:38 2010 +0200
Add sys.argv. Not too many programs consider the possibility that it might not exist resulting in unhandled exceptions.
commit bdc070621a45ebe7274a8125b32240abadaca9a0
Author: Sven Trenkel <collectd at semidefinite.de>
Date: Thu Sep 30 12:59:21 2010 +0200
Fixed possible memory leak in case of broken match_value configs.
commit 2e4b4e1aaea45c4e1df80c23a549ca7af8871f35
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Sep 30 09:23:22 2010 +0200
src/types.db: Remove unused type "pinba_view".
commit d7ca6a64067a4e01a5e47044a6a80323d0138bee
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Sep 29 17:56:58 2010 +0200
src/utils_cache.c: Replace a left-over hard-coded default of "2" with "timeout_g".
commit 95c65d827f3d75657bac91755e1bdbaeb8b4b91a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Fri Sep 24 11:52:52 2010 +0200
curl_json plugin: Restore struct when handling error.
commit 5c8d44f831b549cfd6e47db39181fd5a1d9cd5b2
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Sep 15 17:21:40 2010 +0200
src/collectd.h: Do not include <sensors/sensors.h> here.
commit 13cbf9d48f26083e29e07c1b59ad1d67b6efa147
Author: Aurelien Reynaud <collectd at wattapower.net>
Date: Sat Jun 19 20:03:52 2010 +0200
Fix errno thread-safety under AIX
Unlike Linux or Solaris, errno under AIX is not thread-safe by
default.
This patch sets _THREAD_SAFE_ERRNO when AIX is detected in order to
force the thread-safe implementation of errno. Without this, calls
like stat() in the rrdtool plugin fail with errno incorrectly set,
leading to the inability to create previously absent rrd files.
Maybe _THREAD_SAFE should be set instead, to prevent other possible
threads-related problems, but this is enough to scratch my current
itch...
Here is the relevant part of /usr/include/errno.h on AIX:
#if defined(_THREAD_SAFE) || defined(_THREAD_SAFE_ERRNO)
/*
* Per thread errno is provided by the threads provider. Both the extern
* int
* and the per thread value must be maintained by the threads library.
*/
extern int *_Errno( void );
#define errno (*_Errno())
#else
extern int errno;
#endif /* _THREAD_SAFE || _THREAD_SAFE_ERRNO */
Signed-off-by: Aurelien Reynaud <collectd at wattapower.net>
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit abca4ca8259e09e4a195d1741e8aec32fa800b62
Author: Florian Forster <octo at huhu.verplant.org>
Date: Sun Sep 5 10:12:02 2010 +0200
collection3: Add graph for "ps_disk_octets".
commit 9ff8f5da48f2602881d64ab6a1c3e38f929bc418
Author: Florian Forster <octo at huhu.verplant.org>
Date: Sun Sep 5 09:42:40 2010 +0200
notify_email plugin: Check for "session == NULL" and return gracefully.
I don't know how libesmtp handles NULL pointers and I don't want to take
my chances.
commit a12cb627513a24de25401d3e0e29763db724bf5c
Author: Florian Forster <octo at huhu.verplant.org>
Date: Sun Sep 5 09:36:55 2010 +0200
notify_email plugin: Serialize all accesses to libesmtp using a mutex.
commit c111c711510ee3903a01df61db0fdf74ad27297f
Author: Jerome Oufella <jerome.oufella at savoirfairelinux.com>
Date: Wed Sep 1 14:35:58 2010 -0400
collection3: fix multiple hosts selection issue
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella at savoirfairelinux.com>
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit e8de3553e10b89417e93af7f0929c08eced84dd4
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Sep 1 20:36:40 2010 +0200
network plugin: Use the complain mechanism to inform the user about ignored signatures.
commit 7a58a2fc82acfec330a6dd1f8f051b60120039c3
Author: Sebastian Harl <sh at tokkee.org>
Date: Mon Aug 23 19:02:06 2010 +0200
src/utils_tail: Remove newline characters at the end of a line.
The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.
Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.
commit a0f552b023917a5b5dac834a5b8d1ef5b82f27f5
Author: Sebastian Harl <sh at tokkee.org>
Date: Mon Aug 23 18:56:02 2010 +0200
utils_match: Let '^' and '$' affect lines rather than the full string.
The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.
commit bb3db398b2d67b169a24d942a82d708478507fb2
Author: Florian Forster <octo at huhu.verplant.org>
Date: Fri Aug 20 08:22:00 2010 +0200
src/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.
Thanks to Renaud Chaput for pointing this out!
More information about the collectd-changes
mailing list