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

[Florian Forster]

 configure.in                                       |   28 ++-
 contrib/collection3/bin/graph.cgi                  |   43 +++-
 contrib/collection3/bin/index.cgi                  |   57 ++++-
 contrib/collection3/bin/json.cgi                   |    5 +-
 contrib/collection3/etc/collection.conf            |  286 +++++++++++++++++++
 contrib/collection3/etc/collection3.conf           |  255 -----------------
 contrib/collection3/lib/Collectd/Config.pm         |  144 ++++++++++
 contrib/collection3/lib/Collectd/Graph/Type.pm     |   15 +
 .../lib/Collectd/Graph/Type/GenericStacked.pm      |   18 +-
 .../collection3/lib/Collectd/Graph/TypeLoader.pm   |   53 +---
 contrib/collection3/share/navigate.js              |  300 ++++++++++++++++++++
 contrib/collection3/share/style.css                |   70 +++++
 src/Makefile.am                                    |    1 +
 src/memory.c                                       |    2 +-
 src/utils_threshold.c                              |    1 +
 15 files changed, 952 insertions(+), 326 deletions(-)

New commits:
commit 5e700757575fa6606cf201947cb0efb57ce12e6d
Merge: f782b37840e50f3e21af5c6b8b200fa640730ee7 7a36927e0c5411c701d9e1bfd3f02a9c2f254d0f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Aug 12 11:31:40 2008 +0200

    Merge branch 'collectd-4.4'

commit 7a36927e0c5411c701d9e1bfd3f02a9c2f254d0f
Merge: 9bf39535ce55d5ff736c2ab3ee8ffdd8d8d8d62f 111a5eb7b68da0478b16de31dff422a213a03799
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Aug 12 11:31:26 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4

commit 111a5eb7b68da0478b16de31dff422a213a03799
Author: Peter Holik <holik at it-technology.at>
Date:   Tue Aug 12 11:04:27 2008 +0200

    src/utils_threshold.c: Free allocated memory before returning..
    
    ..in an error condition.

commit 59f405559485a04c30b88c2f68fa9e112bdab6a6
Author: Michael Stapelberg <michael+git at stapelberg.de>
Date:   Sat Aug 9 14:42:24 2008 +0200

    memory plugin: The variable is named cache, not cached, at least on libstatgrab >= 0.16
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 9bf39535ce55d5ff736c2ab3ee8ffdd8d8d8d62f
Author: Boian Berberov <bberberov at gmail.com>
Date:   Mon Aug 11 16:57:57 2008 +0200

    configure.in: Look for ip_vs.h in the kernel sources.
    
    Developers,
    
    I am writing an updated ebuild for gentoo and I made this patch that allows
    ip_vs.h to be located and the ipvs module to build. Normally I would include
    this with the ebuild, but I thought it may be beneficial to send it to you.
    Please review it and let me know what you think. I am still inexperienced with
    autotools so the patch may not be well put together. If you would consider
    applying it or a similar patch, please let me know so I can adjust the ebuild
    accordingly.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 63e7c4e8ef41d64caaf8e91cf04c3cb8b5b9ef6e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jul 28 11:06:51 2008 +0200

    contrib/collection3: Add JavaScript code to unify the timespan of all graphs.
    
    Using the new ``Set all images to this timespan'' button one can now easily
    show the same timespan in all graphs. This allows to compare different graphs
    much more easily.

commit e19c2219d3cb1ac725a4b372c5002e7fba7e63f7
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jul 28 11:05:39 2008 +0200

    contrib/collection3: Update `json.cgi' to use the new config parsing function.

commit 2d4345a4b11394f263fc6d3378122c0e17c9378f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 27 17:23:03 2008 +0200

    controb/collection3: Implement zooming using the mouse wheel.
    
    Also you can now re-center the graph with a double click.

commit 354fa3a2dac79b239d7a29d2979a2fbfdd54b0a7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 27 17:22:26 2008 +0200

    contrib/collection3: Add a generic `instance' placeholder.
    
    It will be replaced by either the type or plugin instance, depending on
    which is defined.. This is handy for temperatures and stuff like that,
    where sometimes the type instance doesn't exist.

commit d7f5e3407af897014251a13646c48bddc40427d2
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 27 17:21:04 2008 +0200

    contrib/collection3: Move configuration logic into Collectd::Graph::Config.

commit 813917648686533b4878d7a8920785f618e15e2e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Jul 27 13:08:28 2008 +0200

    contrib/collection3: Updated the `collection3' stuff in contrib/.