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

Florian Forster octo at verplant.org
Sun Aug 28 21:24:11 CEST 2016


 ChangeLog                    |  120 ++++++++++++++++-
 README                       |    5 +
 TODO                         |   21 ---
 configure.ac                 |    4 +
 contrib/redhat/collectd.spec |   25 +++-
 src/Makefile.am              |    6 +
 src/collectd.conf.in         |    6 +
 src/collectd.conf.pod        |   26 ++++
 src/disk.c                   |    2 +-
 src/hugepages.c              |  290 ++++++++++++++++++++++++++++++++++++++++++
 src/types.db                 |    1 +
 src/utils_format_json_test.c |    2 +
 12 files changed, 479 insertions(+), 29 deletions(-)

New commits:
commit 7b7903a58bfb3765ff196e81d7a088676b795157
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Aug 23 11:03:48 2016 +0200

    collectd.spec: add hugepages plugin

commit 3b4237483aaae73659076b74f5231595fea6b2bc
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Aug 23 11:03:26 2016 +0200

    collectd.spec: adjust version & changelog entries for master branch

commit f876292e5ce4be40ab5b031b2bcfb347f00da1f8
Merge: 8313250 51b24f4
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Mon Aug 22 22:35:17 2016 +0200

    Merge branch 'hugepages'

commit 8313250e5fdc28c9f01b5bc94211fe0e7a8f023e
Merge: 42a9adc 7a43e0b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Mon Aug 22 22:13:13 2016 +0200

    Merge branch 'collectd-5.6'

commit 7a43e0b7b46589add8b7a3e7a870dc6485e04cdf
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Mon Aug 22 21:43:15 2016 +0200

    Really fix tests on Solaris
    
    3b264ee checked for KERNEL_SOLARIS, but this is only defined if config.h is included.

commit 3d74a63ae43c1786eb9b966e2209c24c5643dae8
Merge: 115d242 356901a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Thu Aug 18 22:58:39 2016 +0200

    Merge branch 'collectd-5.5' into collectd-5.6

commit 356901a4a8df5d6f40f9d03d2276d66fe9e13d17
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Thu Aug 18 22:53:43 2016 +0200

    Changelog: fix unresolved merge conflict introduced in dc2eb04
    
    Removed the conflict markers left over, and copy-pasted the changes
    added in c0f5748.

commit 115d242a7027c86a9ad5c2e9ba9fd9f08eccae26
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Thu Aug 18 22:21:47 2016 +0200

    collectd.spec: mention new cpusleep plugin in changelog

commit 42a9adc68340fcdb4dd1eade9790f1cb27120d4a
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Wed Aug 17 15:56:18 2016 +0200

    Remove empty NEWS file (#1893)
    
    Not needed since we use Automake in foreign mode.

commit dcb4470c37cb8da1fccc9aa32e3671548b16f17b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Wed Aug 17 15:55:48 2016 +0200

    Remove TODO, it's way out of date (#1892)

commit 51b24f4c2a15f3f97c2989a36be82e18843b449c
Author: Kim Jones <kim-marie.jones at intel.com>
Date:   Wed Aug 17 10:08:27 2016 +0100

    hugepages: check for error if readdir returns NULL
    
    Change-Id: Ib361b648407c7052218c1f6b9b624cb7aa799634
    Signed-off-by: Kim Jones <kim-marie.jones at intel.com>

commit c4413ca9cec4a16b12c2dbdfde5b821a35de5e0e
Author: Kim Jones <kim-marie.jones at intel.com>
Date:   Tue Aug 16 17:43:45 2016 +0100

    hugepages: typo fix in 2nd pathconf() check
    
    Change-Id: Ie4ceb0ec4b55e60fcffb1d59d33a5711366eb2f7
    Signed-off-by: Kim Jones <kim-marie.jones at intel.com>

commit 26c9dd08034c325d8a20ab80e9fba3d2c164f933
Author: Kim Jones <kim-marie.jones at intel.com>
Date:   Tue Aug 16 16:00:27 2016 +0100

    hugepages: rework 2
    
    Fix typo in .pod file.
    Change char * strings to static const char [].
    Change INFO() to DEBUG() in 1 place.
    Removed unnecessary initialisations & casts.
    Fixed ignored error returns from some funcs.
    Actually use result returned from pathconf().
    
    Change-Id: I0b59af4eb8afd29141abfa9233ca1d4a8d19d0d1
    Signed-off-by: Kim Jones <kim-marie.jones at intel.com>

commit b379a32264ba973ea52f30bff399c9c9d7c612bc
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Aug 16 15:34:59 2016 +0200

    disk plugin: fix typo in comment

commit f91506bb8f91ca3725fd3081deba4e1829186aaa
Author: Kim Jones <kim-marie.jones at intel.com>
Date:   Wed Aug 3 17:33:29 2016 +0100

    hugepages: rework
    
    Changed hugepage metric type and type instances.
    Made a single entry in types.db for "free" and
        "used" hugepages.
    Calculate the used hugepages.
    Removed read_syshugepage_dir; replaced with
        walk_directory.
    Cleared up descriptions in .pod.
    Made the .conf plugin option names less cryptic.
    Linux-only plugin; changed configure.ac accordingly.
    Stripped function declarations and header includes
        that are not used.
    Tidied up globals and made some globals local.
    Removed some hardcoded values and fixed spacing.
    Other general tidy-ups.
    
    Change-Id: Id0243397d3fd4ac1be90266b266341318c05c903
    Signed-off-by: Kim Jones <kim-marie.jones at intel.com>

commit 5236399c4c5483b1a9c21233e34b2b4357800d58
Merge: cc8def2 bc5073c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Aug 16 15:00:59 2016 +0200

    Merge branch 'collectd-5.5' into collectd-5.6

commit cc8def209dbdf1c26648d176b16e065f0962f0fa
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Aug 16 14:58:38 2016 +0200

    collectd.spec: increment version number in changelog

commit bc5073cf25c5cea3a322f70a3a9ba50c67460638
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Aug 16 14:50:50 2016 +0200

    collectd.spec: remove misleading items from changelog

commit af16be6104a2d56ca930762a200ff2379e1f20ce
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon Aug 15 20:59:05 2016 +0200

    write_kafka: Fix misleading indentation
    
    Reported by GCC-6 with the `-Werror=misleading-indentation` option.
    
    Thanks for Lucas Nussbaum for reporting this issue!
    
    Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831194

commit fa49565fa7ef682ce61bc446fb0d2469eedddc66
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date:   Tue Jul 19 13:14:19 2016 +0100

    hugpages: fix compilation error
    
    Fix error: format '%lu' expects type 'long unsigned int', but
    argument 6 has type 'derive_t'. For line 93.
    
    Change-Id: I4f164d238cd4fa6f8a69d78b2906042aa3c5da72
    Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>

commit 178402a00aec25297de1fdfd640d519401e4df18
Author: Jaroslav Safka <jaroslavx.safka at intel.com>
Date:   Thu Jun 23 05:53:12 2016 +0100

    hugepages plugin: a stats plugin for hugepages
    
    Plugin that allows stats for hugepages to be collected.
    
    Change-Id: Ide5ff31c54206cf5ee3d6155899bd53e8edae7bd
    Signed-off-by: Jaroslav Safka <jaroslavx.safka at intel.com>
    Signed-off-by: Kim Jones <kim-marie.jones at intel.com>
    Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>




More information about the collectd-changes mailing list