[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Mon Mar 9 18:48:45 CET 2009
README | 22 +-
configure.in | 78 ++
contrib/collection3/bin/.htaccess | 2 +
contrib/collection3/etc/collection.conf | 1 +
contrib/collection3/lib/Collectd/Graph/Common.pm | 25 +-
contrib/collection3/lib/Collectd/Graph/Config.pm | 3 +-
contrib/collection3/lib/Collectd/Graph/Type/Df.pm | 17 +-
.../lib/Collectd/Graph/Type/GenericIO.pm | 43 +-
.../lib/Collectd/Graph/Type/GenericStacked.pm | 49 +-
.../collection3/lib/Collectd/Graph/TypeLoader.pm | 11 +-
contrib/exec-nagios.px | 16 +-
contrib/php-collection/browser.js | 115 ++-
contrib/php-collection/definitions.php | 56 +-
contrib/php-collection/functions.php | 49 +-
contrib/php-collection/graph.php | 7 +
contrib/php-collection/index.php | 17 +-
src/Makefile.am | 10 +
src/collectd.conf.in | 15 +
src/collectd.conf.pod | 87 ++-
src/gmond.c | 1100 ++++++++++++++++++++
src/libcollectdclient/client.c | 16 +-
src/postgresql.c | 27 +-
src/postgresql_default.conf | 27 +-
src/rrdtool.c | 39 +-
src/snmp.c | 1 +
src/utils_avltree.c | 2 +
26 files changed, 1720 insertions(+), 115 deletions(-)
New commits:
commit cc5ee53dfba55d6fe7c26513618a582adf80b7fa
Merge: 6a69db4d304118e11fd4bae9c761fc14674e4942 0af81ad699d88660e5efd0da377cc439a9335f4c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 9 18:48:20 2009 +0100
Merge branch 'ff/gmond'
commit 6a69db4d304118e11fd4bae9c761fc14674e4942
Merge: 1882e314836ae55faedbacaf8f9d8383528c5900 6d86a97190a193863aadc252f20f6b9dba61c263
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 9 18:48:12 2009 +0100
Merge branch 'collectd-4.6'
commit 1882e314836ae55faedbacaf8f9d8383528c5900
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 9 18:45:46 2009 +0100
rrdtool plugin: Beatify a debugging message.
commit 0af81ad699d88660e5efd0da377cc439a9335f4c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 9 18:45:06 2009 +0100
gmond plugin: Add a configuration.
commit 2f0bd3ba78bdbfb6a1a5a1252573e5815ce3fb0b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 9 16:39:09 2009 +0100
gmond plugin: Add a plugin to receive Ganglia multicast traffic.
commit 6d86a97190a193863aadc252f20f6b9dba61c263
Merge: 49cf50f058fc3a7322899b4eca4223dd71bc605a 54fb57fbc5658fc3d150219d07d840178d64d087
Author: Sebastian Harl <sh at tokkee.org>
Date: Sat Mar 7 18:03:42 2009 +0100
Merge branch 'sh/collectd-4.5' into sh/collectd-4.6
Conflicts:
contrib/collection3/lib/Collectd/Graph/Common.pm
src/postgresql_default.conf
commit 54fb57fbc5658fc3d150219d07d840178d64d087
Author: Sebastian Harl <sh at tokkee.org>
Date: Sat Mar 7 17:43:54 2009 +0100
postgresql_default.conf: Make sure the "disk_io" query does not return NULLs.
Starting with some version between 8.3.3 and 8.3.6, pg_statio_*_tables returns
NULL instead of 0 for statistics if no instance of the appropriate relation
exists. PQgetvalue() returns an empty string in that case which would then
result in error messages when udb_result_submit() tries to convert that to a
number.
Now, the "disk_io" query uses PostgreSQL's coalesce() function to make sure 0
is returned instead of NULL.
commit a025295971e7f8d88764c7d54fb29379b9f29b8d
Author: Tom Throckmorton <throck at gmail.com>
Date: Fri Mar 6 19:28:26 2009 +0100
contrib/exec-nagios.px: Make it possible to run the same script multiple times.
commit 4e57613ae19a71a0f180f0648223a139f48c932c
Author: Florian Forster <octo at noris.net>
Date: Fri Mar 6 16:53:28 2009 +0100
rrdtool plugin: Fix a possible race condition at startup.
On a very busy system, if the network plugin was initialized before the
rrdtool plugin, `rrd_cache_insert' may be called before the RRDtool
plugin is initialized. It would then pass `cache == NULL' to
`c_avl_get', resulting in a segmentation fault.
commit 49cf50f058fc3a7322899b4eca4223dd71bc605a
Author: Sebastian Harl <sh at tokkee.org>
Date: Thu Mar 5 11:49:17 2009 +0100
collectd.conf(5): Don't mix spaces and tabs in configuration examples.
commit 1cf13b782cb290af46afdc5fc7f8eae59b0b1188
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Mar 5 09:41:35 2009 +0100
contrib/collection3: Fix stacking with NAN values.
Stacked values above NAN values were not drawn previously..
commit b4e97de7262ed89388ab7aa2cd236d7e6476d0fc
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Mar 5 09:35:50 2009 +0100
contrib/collection3: Minor cleanups.
commit 22bb251996a1b114197ad47b85d818a2962ddf0e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Mar 5 09:35:28 2009 +0100
contrib/collection3: Add the "IgnoreUnknown" config option.
Used by the "GenericStacked" graphs.
commit 5fd83d4edf600262af05cf7dbed9f246aa0053df
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Mar 5 09:33:02 2009 +0100
contrib/collection3: Add "Total" to "GenericIO" graphs.
Using the RRDtool 1.2 VDEF syntax.
commit 7a6c603a26cfdf85365d1d9cf8e269763af7d7bb
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Mar 5 09:30:06 2009 +0100
contrib/collection3: Add the "DataDir" config option.
commit 93047219a647dee014441d36adf42c200c62cb7e
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Mar 5 08:57:29 2009 +0100
contrib/collection3/bin/.htaccess: s/SetHandler/AddHandler/
SetHandler doesn't accept a file extension.
commit 7531f4e3b2f99ed2bf2aa027632c04791e7454df
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Mar 5 08:51:51 2009 +0100
contrib/collection3/bin/.htaccess: Add file.
This has been missing. Wonder why nobody complained..?
commit ea0586c3217489adadea83f6932fc3af52552049
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Mar 4 16:50:06 2009 +0100
postgresql_default.conf: Added a short usage and copyright header.
commit 88a282c56a0727239bf4028262ee2d8aee88de6e
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Mar 4 16:00:53 2009 +0100
postgresql plugin: Made variable names more self-explanatory.
Also, while I was at it, improved some error messages.
commit 6a66234ad7998be96dd5d152a12c75fd6cd39c75
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Mar 4 13:39:16 2009 +0100
postgresql_default.conf: Don't use the deprecated {Min,Max}PgVersion options.
commit 306fd73c8c5a936211e2a7dd4e43d2451fb3b245
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 2 15:30:11 2009 +0100
collectd.conf(5): Mention that `Oracle' doesn't like semicolons..
.. at the end of the SQL statement.
commit 4c295efaa4044d56f6222186557d35aa165ef6db
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 2 15:27:12 2009 +0100
libcollectdclient: Check if the file handle is valid before writing to it.
And free allocated memory when connecting fails. Only assign anything to
the user-provided pointer if `lcc_connect' succeeds. This should make
error-handling much more straight-forward.
commit b74101a33fad432014a840a8242afe268b4ce3d4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Mar 2 09:49:22 2009 +0100
snmp plugin: Added a note about a potential bug that needs fixing.
Negative absolute (gauge) values may be casted to an unsigned integer
variable on their way throught he daemon, producing VERY HIGH tempera-
tures in winter..
commit ee9183741485112c084467779cf0b05e23eeed05
Merge: 40e1a7b6e94b65320842ba0239f1d10757e1a571 62dc5ac622197408ca4f020a6f83ee1a9e6ced4a
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Mar 2 09:31:37 2009 +0100
Merge branch 'bp/php-collection' into collectd-4.5
commit 62dc5ac622197408ca4f020a6f83ee1a9e6ced4a
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sun Mar 1 22:20:10 2009 +0100
php-collection: Add support for named graph lists as favorites
php-collection: Add support for named graph lists as favorites
php-collection allowed saving and loading a list of graphs from a
cookie.
This patch changes loading/saving to provide support for naming
of favorite graph lists.
When saving a name has to be provided (up to 30 alphanumerical
characters includeing underscore and hyphen.
For loading a named list can be selected from a dropdown list (this list
is refreshed when it gets focus) of available favorites.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit d224ff4d51d564910eba4fe88516cd604ea00620
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sun Mar 1 22:20:06 2009 +0100
php-collection/functions.php: Escape/avoid problematic characters in RRD commandline
php-collection/functions.php: Escape/avoid problematic characters in RRD commandline
rrdtool does not like '!' in variable names so replace them with '_'.
(bind plugin has them in a few type-instances and type-instance is used
as variable name by MetaGraphs)
Also escape rrdtool field seperators that might appear in file names.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 77ee96acaa60fce37451037c1781b19921836026
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sun Mar 1 22:19:59 2009 +0100
php-collection/definitions.php: Add MetaGraph definitions for bind plugin
php-collection/definitions.php: Add MetaGraph definitions for bind plugin
Add metagraph definition and matching function for the various
types used by bind plugin.
Adjust the memory MetaGraph function to support bind memory statistics.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 177f4357d29d8a488686fd92da3acd5ef2d9b10b
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sun Mar 1 22:19:49 2009 +0100
php-collection/graph.php: Add missing error500() function
php-collection/graph.php: Add missing error500() function
When a call to rrdtool fails or some other internal error occurs
a HTTP error with code 500 and matching error image should be
returned, added the missing error500() function which does this
the same way as error404() and error400() functions.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 26f1a6f7ca9b20cb917ec8b3df7affde2da8eac1
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sun Mar 1 22:19:43 2009 +0100
php-collection: Fixes and multiple saved graph lists
php-collection/functions.php: Fix collectd_flush()
Some obsolete code in collectd_flush() caused PHP Notice errors
and prevented caused the function to return before attempting
to ask collectd to flush cache.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 3f99de804e830ce2a8870fdab4686a24f73bb160
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sun Mar 1 22:19:37 2009 +0100
php-collection/definitions.php: Add missing MetaGraph for tcp_connections
php-collection/definitions.php: Add missing MetaGraph for tcp_connections
Add missing MetaGraph reference for tcp_connections and fix DS name
for the MetaGraph
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 40e1a7b6e94b65320842ba0239f1d10757e1a571
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Mon Mar 2 09:24:39 2009 +0100
contrib/php-collection: A few more bug-fixes to the graphing scripts.
This removes some obsolete code which prevents flush from working and adds
missing wrapper error500().
commit 2f884d925bd7e84ecd302e795ccf4e3077a70f2a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Sat Feb 28 15:40:45 2009 +0100
README: Documented the `--with-fp-layout' configure option.
More information about the collectd-changes
mailing list