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

[Florian Forster]

 contrib/migrate-4-5.px |    2 --
 src/apache.c           |    2 +-
 src/collectd.conf.in   |    1 +
 src/collectd.conf.pod  |    6 ++++++
 src/curl_json.c        |   10 ++++++++--
 src/write_graphite.c   |   32 +++++++++++++++++++++++++-------
 src/write_http.c       |    7 ++-----
 7 files changed, 43 insertions(+), 17 deletions(-)

New commits:
commit cc9019ab5b8065c03524a5fd393afbe38125aaee
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 28 20:58:04 2016 +0200

    Revert "write_graphite: remove #ifndefs"
    
    This reverts commit de80d27fe7023c2e377674b4cc341e539388b98e.
    
    Fixes: #1953

commit 64d7901606e27ab6de67164534494ca7b0055622
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 28 17:53:34 2016 +0200

    write_http plugin: Don't register a flush callback unconditionally.
    
    Fixes: #1955

commit 02f8dbc0985310574ea2837cd5e3c06cccda203d
Merge: 7e3059b ba52f94
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 13 22:26:31 2016 +0200

    Merge branch 'collectd-5.5' into collectd-5.6

commit ba52f94929822b1968f05cfbb37985af2e0b83a4
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 13 10:44:46 2016 +0200

    curl_json plugin: Skip unexpected non-map values.
    
    Assume, for example, the config `Key "*/foo"`. This config expects JSON
    in the form:
    
        {
          "bar": {
            "foo": 1337
          }
        }
    
    If the available JSON is instead:
    
        {
          "error_code": 0,
          "bar": {
            "foo": 1337
          }
        }
    
    the code will take a look at the zero associated with "error_code" and
    determine that a map (with key "foo") is expected instead. Previously
    the code would continue, eventually calling `cj_get_type()` which
    expects that `key->type` is a valid pointer, resulting in a segmentation
    fault.
    
    This patch does three things to ensure that this segmentation fault does
    not happen again:
    
    1.  `cj_get_type()` checks its argument to make sure it is valid before
        dereferencing any pointers.
    2.  In case a non-map is found when a map is expected, the code will
        return instead of limping on.
    3.  After calling `cj_cb_inc_array_index()`, which may update the key,
        make sure that it actually did and that key is valid now.
    
    Fixes: #1896

commit 276d1e1bdfc3e02431bb05c06da7a16f80fa7e47
Author: Florian Forster <octo at collectd.org>
Date:   Mon Sep 12 14:16:00 2016 +0200

    collectd.conf(5): Document the semantics of the "TypesDB" option in more detail.
    
    Fixed: #1241

commit e935e855188de7475fcc76c88e4a709894363ad5
Author: Florian Forster <octo at collectd.org>
Date:   Mon Sep 12 11:49:52 2016 +0200

    contrib/migrate-4-5.px: Don't convert "ps_code" and "ps_data" to derive.
    
    Fixes: #1687

commit 8d78a2b27ddcc2e0dbca30be9c888479a4757c1f
Author: Michael Leinartas <mleinartas at twitter.com>
Date:   Thu Sep 8 14:00:35 2016 -0500

    Add missing option to write_graphite example
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 60ec28dd104bdeef4c5ed6882fb2b663ca9da2eb
Author: Florian Forster <octo at collectd.org>
Date:   Sun Sep 11 20:31:31 2016 +0200

    apache plugin: End statements with semi-colons.
    
    If only I knew why this wasn't considered a syntax error …