[collectd-changes] collectd,
the system statistics collection daemon: Changes to 'master'
Florian Forster
octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>verplant.org
Sun Dec 3 19:30:17 CET 2006
ChangeLog | 24 +
configure.in | 76 ++--
src/Makefile.am | 36 +-
src/collectd.conf.in | 6
src/collectd.h | 4
src/dns.c | 353 +++++++-------------
src/email.c | 846 +++++++++++++++++++++++++++++++++++++++++++++++++
src/processes.c | 135 +++++++
src/utils_dns.c | 96 +++--
src/utils_dns.h | 11
src/utils_ignorelist.c | 3
11 files changed, 1277 insertions(+), 313 deletions(-)
New commits:
commit a56d4f179a9ce762b0a60656c66bb6c30f3ad5bc
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sun Dec 3 19:29:58 2006 +0100
ChangeLog: Collected the changes so far.
The new version needs to be released soon!
commit e58c29f5f4bddb1f169935c6e131a311c81911e6
Merge: 5b9630d76f7a899633037045e753ebf0542ebbef 0a220a2693ec2125d8560bb5162890c0931d465b
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sun Dec 3 19:05:15 2006 +0100
Merge branch 'ff/processes'
commit 5b9630d76f7a899633037045e753ebf0542ebbef
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sun Dec 3 18:43:53 2006 +0100
email plugin: Limit the `MaxConns' option by a hardcoded value.
Because typos (and ``typos'', i. e. dumb users) happen, it's better to not
allow INT_MAX connections. The problem is that on 32bit machines this would
a) create 2147483648 threads
b) allocate (at least) 512 GBytes of memory
which would result in certain death of either the daemon or the system.
This patch limits the number of connections (and thus threads and allocated
memory) to 16384, which ought to be enough for most people. Those, who need
more connections (and can accomplish this, even though there are quite narrow
OS limits) will need to recompile themselves.
commit 7d7947e8e1125b0d9e27549882f158887cb095ca
Author: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
Date: Sun Dec 3 14:11:21 2006 +0100
email plugin: Made socket settings configurable.
Added config file support to the email plugin.
The following options are available:
* "SocketGroup <group name>"
Set the group the UNIX socket belongs to to <group name>.
* "SocketPerms <perms>"
Set the permissions of the UNIX socket to <perms>. No validation is done.
The user has to make sure reasonable values are given.
* "MaxConns <conns>"
The maximum number of concurrent connections is set to <conns>.
<perms> and <conns> may be given as decimal (no prefix), octal (prefix "0") or
sedecimal (a.k.a. hexadecimal, prefix "0x") values.
Signed-off-by: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
commit 892b93369877df7996b1dd04b0bed8ecf65ee9b4
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sun Dec 3 10:38:52 2006 +0100
email plugin: Make it possible to build the plugin write-only.
So far the plugin simply imported `pthread.h'. If this headerfile (or the
library for that case) was not present, building the plugin would fail. This
patch makes `libpthread' a soft dependency, i. e. it's only necessary if you
want to read from the socket. Without `libpthread' being available the plugin
can still be used in server processes.
commit 845b2d2577461a4bc2bf4385cb521b4ad575651d
Merge: 0b5b7d3f65c22163a1bf1a9f2ba55e3965e47151 c4377c1e3d97ae0641bf740dc90a59633b319fd1 578f62451f20db8771ada96759918b53a5a025c4
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sat Dec 2 19:17:50 2006 +0100
Merge branches 'ff/dns' and 'sh/email' into next
Conflicts:
configure.in
src/Makefile.am
commit c4377c1e3d97ae0641bf740dc90a59633b319fd1
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sat Dec 2 19:11:22 2006 +0100
dns plugin: Improved config checks for the pthread library.
The checks for the pthread-library have been extended to match the other
libraries being used. The dns plugin (in particular `utils_dns.c') has been
verified to build without `libpcap' being present.
commit 890c1eb517a4c442f9d967b8766e3908ebe5ba92
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sat Dec 2 19:09:32 2006 +0100
dns plugin: Added the dns plugin to the sample `collectd.conf'.
commit 578f62451f20db8771ada96759918b53a5a025c4
Author: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
Date: Thu Nov 30 12:02:46 2006 +0100
email plugin: Use strtok_r() instead of strtok().
strtok() internally uses a static buffer and thus is not thread-safe.
Signed-off-by: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
commit 8389947b881b59af994a9b6c8af706446edb25f2
Author: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
Date: Thu Nov 30 12:02:10 2006 +0100
email plugin: Change owner and mode of the UNIX socket if possible.
Set the owner and mode to COLLECTD_GRP_NAME (defaulting to "collectd") and 0770
respectively. A couple of different daemons running as different users might
want to connect to it.
Signed-off-by: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
commit bd119c69bf481afbda804cdd422e9ba8e855bccf
Author: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
Date: Thu Nov 30 12:01:32 2006 +0100
email plugin: Minor code cleanup.
Removed debugging output and whitespaces at end of lines.
Signed-off-by: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
commit 0b5b7d3f65c22163a1bf1a9f2ba55e3965e47151
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sat Dec 2 17:51:58 2006 +0100
src/utils_ignorelist.c: Fix build-problems when building without regex support.
commit 9e137cdbc77ab58680fcf674c7968281eea12492
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sat Dec 2 17:51:16 2006 +0100
dns plugin: Check for `libpthread' and link the plugin against it.
commit 085e0ec955713a12d2abf9bd181ffc2a360cba78
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date: Sat Dec 2 17:50:37 2006 +0100
dns plugin: Use `pthread_sigmask' rather than `signal'.
commit ea30b35a3697a7f8c126c35b62653593c08de63c
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>crystal.wlan.home.verplant.org>
Date: Sat Dec 2 16:30:38 2006 +0100
dns plugin: Use threads rather than two processes and a pipe.
This is not only much simpler, code wise, but also more elegant and hopefully
faster. This code is alpha quality at best.
commit fc257d86996117d80b35909c16fe628a209faf12
Author: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
Date: Tue Nov 28 13:39:51 2006 +0100
New plugin "email" to collectd ham, spam, ... statistics
This plugin collects email count and size for each type (e.g. ham, spam,
virus, ...) of emails, spam score values and the count of successful spam
checks (e.g. BAYES_99, SUBJECT_DRUG_GAP_C, ...).
These information are provided by external programs which communicate with the
plugin thru a UNIX socket and a simple line-based protocol:
/* e-mail type (e.g. ham, spam, virus, ...) and size */
e:<type>:<bytes>
/* spam score */
s:<value>
/* successful spam checks */
c:<type1>[,<type2>,...]
At most MAX_CONNS (currently set to 5) clients can connect to the plugin
simultaneously. Each connection is handled by a separate thread. Any input
line is limited to 256 characters (including the newline character) which
ought to be enough for anybody[tm] by definition. "c"-lines have to be split
up if they grow longer.
Signed-off-by: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
commit 0a220a2693ec2125d8560bb5162890c0931d465b
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>crystal.wlan.home.verplant.org>
Date: Tue Nov 21 11:03:57 2006 +0100
processes plugin: Implemented detailed process statistics for Darwin/Mac OS X
More information about the collectd-changes
mailing list