[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 ChangeLog                    |    9 +
 README                       |   44 +++--
 configure.in                 |   23 ++
 contrib/examples/MyPlugin.pm |  125 +++++++++++++++
 contrib/examples/myplugin.c  |  171 +++++++++++++++++++++
 src/Makefile.am              |    8 
 src/collectd.conf.in         |   12 -
 src/collectd.conf.pod        |    4 
 src/ipvs.c                   |  346 +++++++++++++++++++++++++++++++++++++++++++
 src/network.c                |   17 --
 src/processes.c              |    4 
 src/rrdtool.c                |   21 +-
 src/types.db                 |    1 
 src/unixsock.c               |    2 
 src/utils_ignorelist.c       |    2 
 src/utils_mount.c            |   26 +--
 src/xmms.c                   |    2 
 17 files changed, 755 insertions(+), 62 deletions(-)

New commits:
commit 83149d73b8a3bd4889517a2e4d0adca0a52e7a06
Merge: 302d7eef72758ec38f28e926480df115ea38f72a 6ba1a320cc3ee1c133eaf733ab8fd67b5b247115
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:59:29 2007 +0200

    Merge branch 'collectd-4.1'
    
    Conflicts:
    
    	ChangeLog

commit 302d7eef72758ec38f28e926480df115ea38f72a
Merge: a3493034a18071ca822570a8fab474cac017e330 20426b751ddb9c7dcf2eab8e47474248373aa111
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:57:51 2007 +0200

    Merge branch 'ff/tcpconns'

commit 20426b751ddb9c7dcf2eab8e47474248373aa111
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:57:04 2007 +0200

    collectd.conf.in: Added sample configuration for the tcpconns plugin.

commit a3493034a18071ca822570a8fab474cac017e330
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:48:21 2007 +0200

    ipvs plugin: Assurd that `sockfd >= 0'.
    
    The init-function should return non-zero in that case and the plugin should be
    disabled, but I'd rather not rely on such conventions too much..

commit 4413d76636eebce92759d7ab9b4f6f6b3e7d4af8
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Oct 12 16:51:04 2007 +0200

    Added documentation about ipvs to README, ChangeLog and collectd.conf.in.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit b291c13a18214834bb32aadca1535ce84a26e8bd
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Oct 12 16:14:25 2007 +0200

    ipvs plugin: Check for correct IPVS version in cipvs_init().
    
    I took over the required minimum version (1.1.4) as used in ipvsadm 1.24
    for Linux kernels >= 2.6.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 4f5787fb7afb14dc1643a94bb2e894af66067bb5
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Oct 12 14:32:20 2007 +0200

    ipvs plugin: Replaced ipvs_strerror() with sstrerror().
    
    ipvs_strerror() handles a few special cases in libipvs which are not
    relevant in this plugin.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit b8d58bd1f1fe3b329c5a97152ae05a1779a1fb27
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Oct 12 14:31:29 2007 +0200

    ipvs plugin: Get IP_VS_SO_GET_INFO in ip_vs_get_services().
    
    IP_VS_SO_GET_INFO also provides the number of services which might change after
    initializing the plugin. Also, the globale variable ipvs_info could be removed
    as ip_vs_get_services() is the only function using these information.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit d41d41e31cab4e974132bb4c9d28561e87663e90
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 10 20:37:26 2007 +0200

    ipvs plugin: Fixed a memory leak in cipvs_submit_services().
    
    The ip_vs_get_dests pointer has not been freed... :-/
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit dcfa1b18ba29a8c340498528a4bb56f030c1c7af
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 10 20:36:53 2007 +0200

    ipvs plugin: Use sstrerror() instead of strerror().
    
    D'oh...
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit fb3a07dc9289ecc2b2752a6b4fa50a32bda89e68
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 10 20:36:17 2007 +0200

    configure, ipvs plugin: Check for ip_vs.h.
    
    Disable the ipvs module, if neither net/ip_vs.h nor ip_vs.h could be
    found. Added HAVE_*_H checks for each included system header in ipvs.c.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 6d431b703af830a1561f622e0fa0f9c457fc8681
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 10 20:34:37 2007 +0200

    ipvs: Added plugin to collect IPVS connection statistics.
    
    This plugin collects detailed statistics for each IPVS service and it's
    destinations. It is based on ipvsadm and libipvs by Wensong Zhang and
    Peter Kese. The plugin requires a Linux (>= 2.6) kernel.
    
    See http://www.linuxvirtualserver.org/software/index.html for more details
    about IPVS.
    
    A new DS type "connections" (value:COUNTER:0:U) has been added to
    types.db.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 6ba1a320cc3ee1c133eaf733ab8fd67b5b247115
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:35:10 2007 +0200

    Beautifying some more debug messages..

commit 09c6d16ffba1b1b15e50579bbcf663f05f630932
Merge: 5e73df5f8ec52055e5f79be5d898e5baec4c9967 8a384e732834fb5d42d9ff4ebec40482fb07372e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:33:59 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1
    
    Conflicts:
    
    	src/rrdtool.c

commit 8a384e732834fb5d42d9ff4ebec40482fb07372e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:32:53 2007 +0200

    Beautifying many debug messages..

commit 5e73df5f8ec52055e5f79be5d898e5baec4c9967
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:22:51 2007 +0200

    rrdtool plugin: Wait for the `queue thread' to exit..
    
    ..before returning from the shutdown function.

commit 900fd12ec3d7588448455fc3cd2f7887ab0fd488
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:20:25 2007 +0200

    network plugin: Flush the buffer in the `shutdown' function..

commit 9896b57523e7f64619660abadb4422ac96c5f8c8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 18:09:29 2007 +0200

    xmms plugin: Return `-1' when values could be read but are weird.

commit 6973e40350f57e3502d6fc3c9caa80301cfe424f
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Oct 7 15:02:36 2007 +0200

    README: Improved formatting.
    
    Indent all paragraphs by two spaces and break lines after 79 characters.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 1c9b59fa7f59cc027d09494102977063c6330d88
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Oct 7 15:01:50 2007 +0200

    README: Added a note about collectd and chkrootkit.
    
    chkrootkit reports collectd as a packet sniffer, which most probably is a
    false positive if using the "dns" plugin.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 3d812cd89d6379f9e1873b002fba1482e5ea1e75
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Oct 9 18:00:35 2007 +0200

    ChangeLog: Added the change to the rrdtool build stuff..

commit bce222f979c4e5ca2e72e3e8043888e38c3e3633
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sat Oct 6 11:10:19 2007 +0200

    collectd.conf.in: Removed advanced and possibly harmfull settings..
    
    Users were simply un-commenting everything without knowing what the settings
    did, so removing possibly harmful settings seems reasonable.

commit a5322d6c70e8e7775413f2b03e3ced2637f974b6
Author: Matt Peterson <matt at peterson.org>
Date:   Sat Sep 29 10:01:34 2007 +0200

    collectd.conf(5): Fix some typos and mis-formulations.

commit ebf2e171eb457394e498cada2be85bcef24d6221
Merge: ad52e3aa2f9fcc61bb3e999af11d162bc790921c ccb9071b7964b99ae616c9b324ca7413c08f8809
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Sep 28 16:42:13 2007 +0200

    Merge branch 'pull/collectd-4.0' into collectd-4.0

commit ad52e3aa2f9fcc61bb3e999af11d162bc790921c
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Sep 27 18:25:25 2007 +0200

    Added myplugin.c to contrib/examples/.
    
    This is a sample/template C plugin.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 1ff419f97e259936d93474a0e50551f4e05911a1
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Sep 27 18:24:40 2007 +0200

    Added MyPlugin.pm to contrib/examples/.
    
    This is a sample/template Perl plugin.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>