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

[Florian Forster]

 README                |    5 +
 src/collectd.conf.pod |   45 ++++++---
 src/curl_json.c       |  248 ++++++++++++++++++++++++++++++++++---------------
 3 files changed, 212 insertions(+), 86 deletions(-)

New commits:
commit 8df4f1b9b3a47e75673b410b968aa4e35144cb14
Merge: 2d8e923 f61af68
Author: Florian Forster <octo at collectd.org>
Date:   Sun Aug 18 10:03:52 2013 +0200

    Merge branch 'jr/json'

commit f61af68a909e45271ac8d7fc43326f1da1407c83
Author: Florian Forster <octo at collectd.org>
Date:   Sun Aug 18 10:02:37 2013 +0200

    collectd.conf(5): Markup improvements for the curl_json plugin.

commit f1759933ceb880f2ba59f09e1016389b73e57369
Author: Florian Forster <octo at collectd.org>
Date:   Sun Aug 18 09:58:13 2013 +0200

    curl_json plugin: Random minor improvements.
    
    I did these changes while wrapping my head around the new array code.
    
    * Added a comment to explain the cj_cb_map_key() function.
    * Renamed some variabled and the arguments of the cj_cb_map_key() function.
    * Renamed the "ignore" argument to "update_key" (inversing its meaning).

commit 2d8e92397564d6664b4558b538e53511eb7be17d
Author: Bert Vermeulen <bert at biot.com>
Date:   Sat Aug 17 14:46:27 2013 +0200

    Mention libsigrok dependency

commit bf0eb89656060958f09942052536f7414ee6c582
Merge: 912afef 793bec1 a552042
Author: Florian Forster <octo at collectd.org>
Date:   Sun Aug 18 09:04:45 2013 +0200

    Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json

commit a5520423233b4ead083030661a256058db562564
Author: Jim Radford <radford at galvanix.com>
Date:   Tue Aug 13 17:57:58 2013 -0700

    curl_json plugin: warn when config expects a map and a number is provided
    
    Moves the warning for strings in the number callback which was being called anyway.
    
    This also serves to fix parsing numbers represented as JSON strings which was inadvertantly broken when adding array support.

commit 793bec1c1dc3e6bb9479ed5be3c37d58119778dd
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 12:13:09 2013 -0700

    curl_json plugin: add an example of array access to the documented uWSGI example

commit 5444a566682f35349b0c89643ba09f549e5b764b
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 12:11:29 2013 -0700

    curl_json plugin: document the new Sock option

commit 38cf53ab5d2cc47f01e65520e6c26d32a6d90207
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 09:06:44 2013 -0700

    curl_json plugin: free the socket name

commit a6024883c9737881283159bcaf034199eec6a4e6
Author: Jim Radford <radford at galvanix.com>
Date:   Thu Aug 8 09:33:36 2013 -0700

    curl_json plugin: style cleanups

commit b622ba07c48d81d44c6a8828b44eb7989b50477e
Author: Jim Radford <radford at galvanix.com>
Date:   Thu Aug 8 09:31:46 2013 -0700

    curl_json plugin: use sstrerr for thread safety

commit 71db775614fa14ade6b6c77d007033ce2bb80195
Author: Jim Radford <radford at galvanix.com>
Date:   Wed Aug 7 13:05:02 2013 -0700

    curl_json plugin: support getting json from a Unix socket as well as a URL

commit baffcb22b7a697f589b7e9f1d1ab00391e4b189e
Author: Jim Radford <radford at galvanix.com>
Date:   Wed Aug 7 12:39:51 2013 -0700

    curl_json plugin: separate the cj_curl_perform in to the curl and yajl parts

commit 5e8ef5f45ef2fcd6f8ffbf67b8bf2250f1753923
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 12:23:29 2013 -0700

    curl_json plugin: document being able to access arrays

commit f1e1e37ead10d17dd30ca1992d64335f9c53c838
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 10:25:02 2013 -0700

    curl_json plugin: support arrays
    
    Allow access to data in JSON arrays.  For example
    
        { workers: [ { requests: 10 }, { requests: 10 } ] }
    
    can all be accessed with
    
        workers/*/requests
    
    or just one by using the index.
    
        workers/1/requests