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

[Florian Forster]

 configure.in |    1 -
 src/apache.c |  142 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 129 insertions(+), 14 deletions(-)

New commits:
commit 9e9d1133de2ccff0267fec43170efdc9fd1ff587
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri May 1 15:40:02 2009 +0200

    configure: Fixed the check for broken Perl_load_module().
    
    Do not initialize AC_CACHE_CHECK cache-id's - that'd be the same as having the
    initial value in the cache. This was introduced in commit 61c19cc1.

commit 5f2da192c3eb9318d516a25654b7f1d94c55fdb3
Merge: 7e13312699a59f246ddb90078ccf8bb46963cb6a 27db9bf0f4f8ab81c2827cbe113c44ecf0fc7c02
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 15:07:04 2009 +0200

    Merge branch 'ag/apache'

commit 27db9bf0f4f8ab81c2827cbe113c44ecf0fc7c02
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 14:59:32 2009 +0200

    apache plugin: Be more verbose when automatically determine the server software.

commit 8c8a933cc5ef1337ac5f3d99d090f30cc31936f2
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 14:43:08 2009 +0200

    apache plugin: Replace C++-style comments.

commit b046582ac6fd2392a8971c95d71d85ee229277e0
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Fri May 1 14:38:50 2009 +0200

    apache plugin: Use the HTTP header to determine the server software.
    
    On Wed, Apr 22, 2009 at 1:53 PM, Florian Forster <octo at verplant.org> wrote:
    > I think we have two options left:
    >
    >  - Set a header callback using the CURLOPT_HEADERFUNCTION option and
    >   look for the <91>Server<92> header field. If it contains <93>lighttpd<94>, assume
    >   lighttpd, Apache otherwise.
    >
    >  - Let the user configure which server software he's using.
    >
    > The two could be combined, of course: Use the user's setting if he has
    > given one, (try to) determine the server software automatically if not.
    >
    > What do you think?
    yeah this sounds good. While I thought about parsing the headers
    initially but then the server headers can easily be changed, so I
    wasn't sure about this approach earlier. Combing this with the user
    specified server configuration value seems like the best solution.
    
    Do find the patch attached. I am using st->server_type variable which
    will be set to APACHE or LIGHTTPD based on the following logic:
    - If the user has specified Server element in the conf file and it is
    "apache" or "lighttpd", then set  st->server_type variable
    appropriately, otherwise ignore the Server value
    - Parse the headers (only if the Server element is NULL or invalid) to
    determine the type and set the st->server_type variable accordingly
    - if  st->server_type is not set as yet, then default it to apache
    
    Regards
    Amit
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit a3da854628383819439f0680acd2786fd00744fe
Merge: 95d4cb4c0867e886fbe9e6e39596e84b5cb8dbd4 0d65234eb26bfe84b6457fd3b744f25ac8b947d6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 20 20:41:55 2009 +0200

    Merge branch 'master' into ag/apache
    
    Conflicts:
    	src/apache.c

commit 95d4cb4c0867e886fbe9e6e39596e84b5cb8dbd4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 20 20:39:27 2009 +0200

    apache plugin: Remove the `connect' variable: It wasn't really being used.

commit 21be3c2d29404182561bab416700267c16f2a90d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 20 20:26:44 2009 +0200

    apache plugin: Replace C++-style comments.

commit fb6b9500d6de3bba575771c6c2516b4867e3b89b
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Mon Apr 20 22:10:49 2009 +0530

    apache plugin: Add support for lighttpd's scoreboard metrics.
    
    Hi,
    
    Do find the patch for lighttpd scoreboard attached. Let me know if
    this patch looks okay.
    
    Regards
    Amit
    
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>