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

[Florian Forster]

 configure.in                                       |   85 ++--
 contrib/collection3/README                         |   42 ++
 contrib/collection3/bin/graph.cgi                  |  148 +++++
 contrib/collection3/bin/index.cgi                  |  335 +++++++++++
 contrib/collection3/bin/json.cgi                   |  120 ++++
 contrib/collection3/etc/.htaccess                  |    1 +
 contrib/collection3/etc/collection3.conf           |  255 +++++++++
 contrib/collection3/lib/.htaccess                  |    1 +
 contrib/collection3/lib/Collectd/Graph/Common.pm   |  585 ++++++++++++++++++++
 contrib/collection3/lib/Collectd/Graph/Type.pm     |  480 ++++++++++++++++
 contrib/collection3/lib/Collectd/Graph/Type/Df.pm  |   68 +++
 .../lib/Collectd/Graph/Type/GenericIO.pm           |  113 ++++
 .../lib/Collectd/Graph/Type/GenericStacked.pm      |  145 +++++
 .../collection3/lib/Collectd/Graph/Type/Load.pm    |   71 +++
 .../collection3/lib/Collectd/Graph/TypeLoader.pm   |  301 ++++++++++
 contrib/collection3/share/.htaccess                |    2 +
 contrib/collection3/share/shortcut-icon.png        |  Bin 0 -> 279 bytes
 contrib/collection3/share/style.css                |    9 +
 src/ntpd.c                                         |    8 +-
 19 files changed, 2717 insertions(+), 52 deletions(-)

New commits:
commit 654783aed1fab02766a9cc036e859799e01f6f9e
Merge: 752e52bc98874f891ae0756b6ab8ccb9a2442650 4e51eefd95e80f90eae602958713c9c630659ce7
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 09:46:27 2008 +0200

    Merge branch 'collectd-4.4'
    
    Conflicts:
    
    	configure.in

commit 4e51eefd95e80f90eae602958713c9c630659ce7
Merge: 41f141639046a261063cf346fe7f89cd4cb9cc59 bcb24183992bccb89769b92077fcdeade83689e1
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 09:44:29 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4
    
    Conflicts:
    
    	src/ntpd.c

commit bcb24183992bccb89769b92077fcdeade83689e1
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 09:41:55 2008 +0200

    configure.in: Use pkg-config to detect the upsclient library.
    
    The libupsclient-config script is gone in newer versions, so we use pkg-config
    instead.

commit 9861c52f3ff659035062f0927ca8442341eff4ce
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 09:39:47 2008 +0200

    ntpd plugin: Fix two format strings.

commit 41f141639046a261063cf346fe7f89cd4cb9cc59
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jul 8 13:08:13 2008 +0200

    contrib/collection3: Add an basic, extensible, modular graphing front-end.