[collectd-changes] collectd, the system statistics collection daemon: Changes to 'ff/routeros'

Florian Forster octo at verplant.org
Tue Jan 5 13:11:06 CET 2010


 README                                          |    9 +
 bindings/Makefile.am                            |    1 +
 bindings/perl/lib/Collectd/Plugins/Monitorus.pm |    2 +-
 src/apache.c                                    |    2 +-
 src/battery.c                                   |    3 +-
 src/collectd-python.pod                         |   26 ++-
 src/collectd-snmp.pod                           |    5 +-
 src/collectd.conf.in                            |   92 ++++++++-
 src/collectd.conf.pod                           |   33 +++
 src/common.c                                    |   17 +-
 src/common.h                                    |    2 +-
 src/cpython.h                                   |   83 +++++++
 src/filecount.c                                 |   23 ++-
 src/pyconfig.c                                  |   37 +++-
 src/python.c                                    |  147 ++++++++-----
 src/pyvalues.c                                  |  267 ++++++++++++++++-------
 src/rrdtool.c                                   |    1 +
 src/thermal.c                                   |    4 +-
 18 files changed, 595 insertions(+), 159 deletions(-)

New commits:
commit 2b65d2425663197e4cf071823ca17d7add82aa16
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 13:10:50 2010 +0100

    src/collectd.conf.in: Add the new options of the routeros plugin.

commit 647f9fed7269077e98e5d813b22b5ca53984f16a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 13:10:29 2010 +0100

    collectd.conf(5): Document the new config options of the routeros plugin.

commit b317e0c149e5ea17fda320b02002920fe887a67c
Merge: fd89cd48430cb6edf752f73a3952dd42b1fce7ab 649197d3ed512b81472de0e8a1f310520c234b20
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 12:48:34 2010 +0100

    Merge branch 'master' into ff/routeros

commit 649197d3ed512b81472de0e8a1f310520c234b20
Merge: 13da81f864686e51b41a088edb63fd47d57806bd dedba5c8fb05a1b00b66a8bbc9eab9e0affe551f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 11:55:28 2010 +0100

    Merge commit 'trenkel/st/python'
    
    Conflicts:
    
    	src/python.c

commit 13da81f864686e51b41a088edb63fd47d57806bd
Merge: f150642cf243a18f80be1ccdb9bb2ec2bbe4a284 3ae8778a363fc4383f1135ae99b389fad96978f3
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 11:54:52 2010 +0100

    Merge branch 'collectd-4.9'

commit 3ae8778a363fc4383f1135ae99b389fad96978f3
Merge: 9622e4d30f90e9eefca1d43fefc6bf85785074d3 317653bcab477e3a2c3c42eeda9b7d0ab7b99bf1
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 11:50:22 2010 +0100

    Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9

commit f150642cf243a18f80be1ccdb9bb2ec2bbe4a284
Merge: 8a8f0e97f786efa0d0b0539e1358e92d55c13659 9622e4d30f90e9eefca1d43fefc6bf85785074d3
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 11:48:07 2010 +0100

    Merge branch 'collectd-4.9'

commit 9622e4d30f90e9eefca1d43fefc6bf85785074d3
Merge: 6254a763a3103ee0d3a09726da53dfc8b3bc8dbc 0b4f63782617b308abf908fbb2fc7ec9afe039db
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 11:47:44 2010 +0100

    Merge branch 'collectd-4.8' into collectd-4.9

commit dedba5c8fb05a1b00b66a8bbc9eab9e0affe551f
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Sun Jan 3 04:11:45 2010 +0100

    python: Documenting python3 changes.

commit bed062ac7102c63e194293bb8234a615a3e250a5
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Sat Jan 2 20:51:22 2010 +0100

    python: Restored python2 compatibility.

commit abe4a7e6480e0d2860f10930d563e4577d2d801a
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Fri Jan 1 22:16:51 2010 +0100

    python: Added notification repr. Python3 support completed.

commit df120b31490a47da1fa5fe9237fdfd6f499c4b63
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Fri Jan 1 17:03:04 2010 +0100

    python: Fixed more unicode related problems.

commit 32ebff6d6df70390e568cd3b6c783594b69d1472
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Fri Jan 1 03:43:50 2010 +0100

    python: repr works for Values again.

commit 112e161c8cfab6e3edb3a4cff25c13379fed5534
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Sun Dec 27 01:13:47 2009 +0100

    python: Made the plugin unicode save.

commit 4f1a8b5cab1feba96da5138ae26a97572cf8e6ca
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Fri Dec 25 20:33:49 2009 +0100

    Better and unicode compatible repr for PluginData.

commit 2fe76bf09327b107359072cd5002d3661adf2670
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Tue Dec 22 02:30:40 2009 +0100

    Fixed string repr for config nodes.

commit 50b21162a21571facd6bbd8a8f9e694dbd7d02e1
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Tue Dec 22 02:20:42 2009 +0100

    Added macro CPY_SUBSTITUTE.

commit 0b030d276a8c0246e9a582d0d4041048044ac025
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Fri Dec 18 02:02:47 2009 +0100

    Config object repr string is back.

commit 1f17cc084351bd1170385927d22fc9bd10ecd8d7
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Mon Dec 14 19:40:26 2009 +0100

    Somewhat workable python3 support. This breaks python2 support and the __repr__ functions.

commit 0b4f63782617b308abf908fbb2fc7ec9afe039db
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 4 23:52:54 2010 +0100

    rrdtool plugin: Correctly initialize the ->random_variation member.
    
    This lead to huge negative values in that member, causing values to be only
    written to upon exit. D'oh!

commit 6254a763a3103ee0d3a09726da53dfc8b3bc8dbc
Author: plazmus <pseudo at egg6.net>
Date:   Thu Dec 31 10:00:25 2009 +0100

    apache plugin: Fix a segmentation fault in the config handling of VerifyPeer / VerifyHost.
    
    Hello,
    
    Today I upgraded a machine from 4.5.2 to 4.9.0. Everything went fine, but
    the new version segfaults immediately at startup. With some help from gdb
    I tracked down the problem to the apache module. It will occur if one
    tries to use the VerifyPeer/VerifyHost options (I guess few people use
    these as I don't see complaints?)
    
    When the plugin attempts to read the value of a boolean option, instead of
    using the pre-parsed int value, it misdetects the type of the option
    (seems a mechanical mistake) and tries to use the string pointer, which is
    actually NULL.
    I'm sending a patch, it's actually shorter than the description ;)
    
    Thanks to all developers and maintainers of collectd for working on it.
    Have a nice holidays.

commit 317653bcab477e3a2c3c42eeda9b7d0ab7b99bf1
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 27 02:34:56 2009 +0100

    Monitorus.pm: Put the plugin into the "Collectd::Plugins" namespace.
    
    … rather than "Collectd::Plugin".

commit 52d50363e3cda4c0d0a3942f8d2ffe7e07f0a712
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 27 02:34:10 2009 +0100

    bindings/Makefile: Added Monitorus.pm to EXTRA_DIST.

commit d86f194b902781efbc5b9b80bca7a6a3254a2dc4
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 27 02:00:44 2009 +0100

    src/collectd.conf: Added missing plugins and config options.

commit aeab464e59f1be0d43265c1ea2ed1cc926832a94
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 27 01:14:29 2009 +0100

    collectd.conf: Added "LoadPlugin Monitorus/OpenVZ" in the "perl" config.

commit a5ec1dd6e4c102dee7ead87609c58a896ca68d3a
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 27 00:59:26 2009 +0100

    README: Added missing plugins.

commit 78a1662567c2fce42a50cdce39f85217b9fbe0ea
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 25 23:53:11 2009 +0100

    src/collectd.conf.in: Added an example config for the python plugin.

commit 5faa320a1632fe2f5a03fa0373eb3ebcf7aa26b9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 25 23:52:56 2009 +0100

    src/collectd.conf.in: Added an example config for the netapp plugin.

commit 793e58da28422e7f5fdc1113ddd1da3c84ea16ce
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 25 23:47:20 2009 +0100

    src/collectd.conf.in: Add example config for the routeros plugin.

commit 8a8f0e97f786efa0d0b0539e1358e92d55c13659
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 25 23:20:39 2009 +0100

    collectd.conf(5): Document the “IncludeHidden” option of the filecount plugin.

commit 7b28c721b73652f36f95e2f402a594aca4e2dd15
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Dec 25 11:13:55 2009 +0100

    filecount plugin: Use the ?:-operator for the hidden argument.

commit 856a68d51bae3f76f54b7b056e83ca8801223d90
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Dec 25 11:13:19 2009 +0100

    filecount plugin: Simplify config handling.

commit 5b1f0319aec6b6bfe3f710badfd449dcdeecb82d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Dec 25 11:11:49 2009 +0100

    filecount plugin: Fix bitfield and default behavior.

commit 0d99b31e19b1442f51b04dc8636587f1fc9135eb
Author: Vaclav Malek <scippio at berounet.cz>
Date:   Fri Dec 25 11:06:54 2009 +0100

    filecount plugin: Make it possible to include hidden files and directories.

commit f7a6c5e8ec8912d750b2c666a6bcb8581091f90f
Author: Vaclav Malek <scippio at berounet.cz>
Date:   Fri Dec 25 10:50:37 2009 +0100

    src/common.[ch]: walk_directory: Add "include hidden" argument.

commit cde03c15d084dbc8a7a89d041da1e3067e5642a9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Dec 22 00:09:04 2009 +0100

    collectd-snmp(5): Comma fixes.




More information about the collectd-changes mailing list