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

Florian Forster octo at verplant.org
Wed Jan 13 16:16:29 CET 2010


 AUTHORS               |    1 +
 README                |    4 +
 configure.in          |    8 +
 src/Makefile.am       |   11 +
 src/collectd.conf.pod |  104 ++++++
 src/curl_xml.c        |  930 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 1058 insertions(+), 0 deletions(-)

New commits:
commit 74525016b183d71f0a5685fa54507078f3f82640
Merge: fb10ba66ee1c7d79cca5fb5281b71a146dad3474 c55add3992c9cb48b79e893235fbc8385e272f9a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 16:16:28 2010 +0100

    Merge branch 'ag/curl_xml'

commit c55add3992c9cb48b79e893235fbc8385e272f9a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 15:50:23 2010 +0100

    collectd.conf(5): Document the cURL-XML plugin.

commit 64792094d9af02686d64752553c1d285128bc10e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 14:05:30 2010 +0100

    README: Add the curl_xml plugin.

commit cbd0b829d2817c7ad68b2e4b40a97c4a6b5532bc
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Wed Jan 13 13:52:56 2010 +0100

    curl_xml plugin: Replace the AVL-tree with a linked list.
    
    This makes iterating over all elements more efficient. The CX_KEY_MAGIC hack is
    also removed. Last but not least, “plugin_get_ds” is now called only once.

commit b12c526a93a6b98c72595b708729ab44192b8073
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Wed Jan 13 12:50:04 2010 +0100

    curl_xml plugin: Rename "Instance" and "Values" to "*From" for consistency.

commit 383f8c0de0e2704a9d03df99b99a9ae7e81e044e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 16:52:48 2010 +0100

    curl_xml plugin: Don't use a hyphen to separate instance prefix and value.
    
    This way the plugin behaves more like the SNMP plugin.

commit d409a21b762853976ff2371f90fc043877723498
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 16:52:25 2010 +0100

    curl_xml plugin: Documented the type-instance behavior a bit better.

commit 1047e1d48dafde9bf49daad528b430456d970559
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 16:39:46 2010 +0100

    curl_xml plugin: Break up “cx_submit_xpath_values” into smaller functions.

commit f7dd4ee93c0722da5f0bf5f5ae27bbea908abc1c
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 16:12:52 2010 +0100

    curl_xml plugin: Move the setting of type_instance to a separate function.

commit e7c4bd42a615b65882e26064081734d4c0e9f988
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:46:30 2010 +0100

    curl_xml plugin: Make absolutely certain “instance_node_obj” is freed.

commit 74dc5ede8695cf7030d4053a483abd78c1572d77
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:46:07 2010 +0100

    curl_xml plugin: Check the return value of “cx_evaluate_xpath”.

commit 8cf51f2a35178cabf7bdfdd23309bb8109380116
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:45:09 2010 +0100

    curl_xml plugin: Change C++-style comments into C-style comments.

commit d53e74a8c99cc042dd1021e4327d22a762871630
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:44:14 2010 +0100

    curl_xml plugin: Clear type_instance if it is not set.

commit 9c9ac11a41e1f101f5c0e4afd4c196373a85a0d4
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:21:59 2010 +0100

    curl_xml plugin: Adapted copyright for 2010.

commit 762902fabdca3e61ef4278e2a54c42c9508a65cb
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:21:28 2010 +0100

    AUTHORS: Added curl_xml plugin to Amit.

commit 578689f28c069b1746e9633cb85707f54d5dcab4
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:14:02 2010 +0100

    curl_xml plugin: Replace cx_config_add_string and cx_config_set_boolean by their global versions.

commit b837027de342ad9b3e62eda47885c472f7a7ed8a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 11 15:06:57 2010 +0100

    curl_xml plugin: Reorder functions and remove forward declarations.

commit 1d333244875057dc44f91f0eb28a36a49e239fa7
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Mon Jan 11 14:58:17 2010 +0100

    curl_xml plugin: New plugin to fetch and parse XML files.
    
    Do find the curl_xml.c source file attached. The implementation is done as I
    suggested in my previous mail.
    The supported configuration is as follows:
    <xpath "/path/to/node(s)">
       InstancePrefix "test" # optional
       Instance "path/to/textnode"  # optional if base xpath expression returns
    single result i.e one matching node
       Values "path/to/textnode1"  "path/to/textnode2"
       Type "magic_level"
     </xpath>
    
    I have done some level of testing to make sure plugin is working. If someone
    is interested in testing/trying the plugin, do the following:
    - apply the attached patch on the 4.9.0 branch
    - copy the attached curl_xml.c to the collectd-4.9.0/src
    - run autconf to generate new configure script containing changes to build
    curl_xml plugin
    - build and install collectd (make && make install)
    
    Do let me know if anyone has problem building/running the plugin.
    
    Any comments/suggestions are welcome.
    
    Regards
    Amit




More information about the collectd-changes mailing list