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

[Florian Forster]

 configure.in                                       |   35 ++++++++++++--------
 contrib/collection3/etc/collection.conf            |   23 ++++++++++++-
 contrib/collection3/lib/Collectd/Graph/Common.pm   |    1 +
 contrib/collection3/lib/Collectd/Graph/Type.pm     |    6 +++-
 .../lib/Collectd/Graph/Type/JavaMemory.pm          |    4 ++
 src/Makefile.am                                    |    3 +-
 6 files changed, 55 insertions(+), 17 deletions(-)

New commits:
commit 11697a97e184c5c2648db0afbc78ad1a55bccede
Merge: 91743fc0c8785f84f3976d5f5d430b1b3a7d4918 e21d0408e4e4001b8c66bb1ea7d41b890100d0f5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 17 08:53:05 2009 +0200

    Merge branch 'collectd-4.8'

commit e21d0408e4e4001b8c66bb1ea7d41b890100d0f5
Merge: beb06e98c5aea9272c5972eee372b42c6abdd2b0 a690e4ac74e05f7294c22df8e0574e5e6f52f510
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 17 08:52:56 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8

commit a690e4ac74e05f7294c22df8e0574e5e6f52f510
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 17 08:44:07 2009 +0200

    Build system: Improve detection of the iptc library.
    
    When checking for the iptc headers and data types, the configure script
    added the kernel directory to the CFLAGS. Later, when actually building
    the iptables plugin, the CFLAGS were left untouched.
    
    At least on Debian, the “real” kernel headers are not required – the
    libc versions in /usr/include/linux are sufficient. The usage of
    KERNEL_DIR has therefore been removed from the iptc checks.
    
    In addition, an directory specified by “--with-libiptc=/path” is no
    longer added to the global CFLAGS but rather to the iptables specific
    CPPFLAGS.
    
    Hopefully this resolved build problems on various platforms.

commit 81207a4725755b4df70c2d329225f118475f0253
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Sep 16 12:17:28 2009 +0200

    contrib/collection3: skip host dirs without read access.
    
    This patch prevents get_files_from_directory() from
    failing when DataDir contains directories which we
    don't have access to.
    
    An example would be "lost+found" directories, on
    ext2/ext3 filesystems, which belong to root and have
    0700 filemode.
    
    Signed-off-by: Marc Fournier <marc.fournier at camptocamp.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit d9babca1cad1b4fc8148b65c05d11f704ac639d7
Author: Florian Forster <octo at noris.net>
Date:   Wed Sep 16 13:02:40 2009 +0200

    contrib/collection3: “Invokations” → “Invocations”.
    
    D'oh!

commit 017f645dd65e7f288035f806de0ee2fb09286263
Author: Florian Forster <octo at noris.net>
Date:   Wed Sep 16 13:00:41 2009 +0200

    contrib/collection3: Add a vertical label to the “java_memory” type.

commit 0b378cb543b24450f89f86d511621a1d8dfe57e5
Author: Florian Forster <octo at noris.net>
Date:   Wed Sep 16 13:00:19 2009 +0200

    contrib/collection3: Added the “invokations” type.

commit 93209bd0f5c32575b4a731ecdbd79e5ede0476a1
Author: Florian Forster <octo at noris.net>
Date:   Wed Sep 16 11:47:42 2009 +0200

    contrib/collection3: Use “{plugin_inst}/{type_inst}” for “{instance}”
    
    … if both are present. Otherwise, use just the one that is available.

commit b041fa0aa000887b631dab3826e4549aefd660a5
Author: Florian Forster <octo at noris.net>
Date:   Wed Sep 16 11:43:57 2009 +0200

    contrib/collection3: Add support for the “threads” and “total_requests” types.