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

[Florian Forster]

 AUTHORS       |    3 +
 src/apache.c  |  449 +++++++++++++++++++++++++++++++++++++++++++--------------
 src/network.c |  184 +++++++++++++++++-------
 3 files changed, 477 insertions(+), 159 deletions(-)

New commits:
commit 1fa4ef58ca639545122a457cd829ed41c1b26a5b
Merge: 995411def34803cbe8839f7ae22b27ac0e8a6d3c 75ad3e4020afddd145e63d2c8c2cf2f7fc80a54e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 16 12:45:28 2009 +0200

    Merge branch 'ag/apache'

commit 75ad3e4020afddd145e63d2c8c2cf2f7fc80a54e
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Thu Apr 16 12:39:12 2009 +0200

    apache plugin: Prepare for parallel reading of instances.
    
    Do find the patch attached. I have moved apache_buffer and friends to the
    apache_t structure and set the plugin_instance if there. There are other
    changes as well like freeing up  the lci->values etc. Have a look at the patch
    and let me know if this looks okay to you.
    
    Regards
    Amit

commit 995411def34803cbe8839f7ae22b27ac0e8a6d3c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 16 10:26:31 2009 +0200

    network plugin: Updated signature handling.
    
    This is a preparation for being able to handle mixed signed/unsigned
    data in one packet. The signature verifying code uses a recursive
    structure now, just like the decryption code.

commit e867166d58d13e41f55da0dd7afff0d038d85328
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Apr 15 11:12:53 2009 +0200

    apache plugin: Replace C++-style comments.

commit b3bab87254bf30f846657fd4ff4e771df7e52849
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Apr 15 10:58:37 2009 +0200

    apache plugin: Remove unused variables.

commit 7c028a4a47f8f4b341cca30a193265f4f0d7ff98
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Apr 15 10:46:23 2009 +0200

    apache plugin: Fix whitespace: Indent using tab, remove trailing.

commit 33e94d2e944ddb76d5c936c2a809e5b1f5747161
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Apr 15 10:42:52 2009 +0200

    apache plugin: Added Amit to list of copyright holders.

commit ddb04607819e0026bb61e7af80f87d39c10dae91
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Wed Apr 15 10:40:26 2009 +0200

    apache plugin: Add support for multiple servers.
    
    Hi,
    Based on Bruno/Florian input, I have changed the apache code to support
    the following configuration structure:
    <Plugin apache>
      <Instance "instance_name">
         URL ....
         Host ... # optional and defaults to hostname_g
      </Instance>
       URL ...
    </Plugin>
    
    I have defined Instance as a block and not Host because the idea here is to
    monitor multiple apache instances on the same machine. For apache instances on
    remote machines, one could specify Host within the Instance block (which is
    optional and default is hostname_g). For legacy configuration, I am converting
    the legacy block to <Instance ""> which defaults to apache.
    
    Do find the patch attached. I am not very familiar with git format-patch
    and send-email functionalities as yet, so I am attaching a diff -ur
    output as mentioned in the submitting-patches.shtml page.
    
    The things which haven't been done as yet:
    - I haven't used plugin_register_complex_read as yet. The main reason
      being I am working on 4.6.1 version and I can't seem to find the
      function plugin_register_complex_read in the code base. I believe it
      is being added only in 4.6.2
    - lighttpd scoreboard is not yet handled. This would probably be my next
      task.
    
    Question:
    Given that this plugin can be used by both apache and lighttpd, how do
    we find out if the server is lighttpd or apache?. It will be good to
    have different rrd file names for apache and lighttpd which could only
    be done if we set different vl.type for both the servers. One way I can
    think of is to rely on the differences of the mod_status output of the
    two servers or perhaps we could have a generic type as "httpd". (which
    can be done only in the next major release if you folks are planning to
    change the plugin name to httpd in the next major release)
    
    Regards
    Amit