[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Fri Feb 26 00:17:22 CET 2010
ChangeLog | 22 ++++
TODO | 3 -
bindings/java/Makefile.am | 15 ++-
configure.in | 31 +++++
contrib/collection.cgi | 6 +
contrib/exec-munin.px | 21 +++
contrib/redhat/collectd.spec | 281 +++++++++++++++++++++---------------------
debian/README.Debian | 41 ------
debian/changelog | 93 --------------
debian/collectd.conf | 89 -------------
debian/collectd.init.d | 115 -----------------
debian/collectd.postrm | 43 -------
debian/compat | 1 -
debian/control | 149 ----------------------
debian/copyright | 148 ----------------------
debian/examples/myplugin.c | 107 ----------------
debian/rules | 111 -----------------
src/apache.c | 3 +-
src/collectd-perl.pod | 2 +-
src/collectd-python.pod | 8 +-
src/collectd.conf.in | 2 +-
src/collectd.conf.pod | 28 ++--
src/collectd.h | 6 +
src/contextswitch.c | 6 +-
src/exec.c | 11 +-
src/filter_chain.c | 11 ++-
src/mysql.c | 2 +-
src/ping.c | 17 ++-
src/plugin.c | 18 +++-
src/postgresql.c | 4 +-
src/processes.c | 42 ++++---
src/types.db.pod | 3 +-
src/utils_cmd_listval.c | 29 +++--
src/utils_format_json.c | 7 +-
src/write_http.c | 2 +-
35 files changed, 356 insertions(+), 1121 deletions(-)
New commits:
commit 67e4e517f58dac2a7b0e63b80256231480bfa59d
Merge: ced2f3438fb1c333cd582a7d944d524b56ba0ef3 3bd6fcdfd20002eee1f1803460728449c0c98f86
Author: Florian Forster <octo at huhu.verplant.org>
Date: Fri Feb 26 00:17:18 2010 +0100
Merge branch 'collectd-4.9'
commit 3bd6fcdfd20002eee1f1803460728449c0c98f86
Merge: c253952ba26a4123aade567d590ff206f84ec82f d3dbc7f5429ff928ed616beb8574f081235ef85b
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Feb 25 23:55:25 2010 +0100
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/ping.c
commit c253952ba26a4123aade567d590ff206f84ec82f
Author: Stu Hood <stu.hood at rackspace.com>
Date: Thu Feb 25 22:40:53 2010 +0100
contrib/redhat/collectd.spec: Updated for version 4.9.
I've attached a patch for the RPM specfile to allow it to build collectd 4.9.0,
including Java support.
commit d3dbc7f5429ff928ed616beb8574f081235ef85b
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Feb 11 14:03:38 2010 +0100
debian/: Removed ancient Debian package files.
You might want to look at git://git.tokkee.org/pkg-collectd.git instead.
commit f181a333d5c244f55971af27b0a68361e9926e53
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Feb 10 15:24:23 2010 +0100
configure.in: Fix three small typos.
commit c983405b9f18cce28d6301124a5426e53adc63b2
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date: Wed Feb 10 14:37:36 2010 +0100
Build system: Put Java class files into a .jar file.
Hi,
I was wondering why the java plugin api class files are published under
share/collectd/java. Ideally, a java-plugin.jar file containing all the class
files should get published rather than the individual class files.
Additionally, the jar files IMO should get published to the lib directory where
the so files are sitting rather than the share directory.
Same holds true for jmx class files as well (probably jmx.jar?).
I could work on this if everyone is okay with it.
Regards
Amit
commit 93c2cad7632046ca9fb23b23056e01db57f874ee
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Feb 10 14:01:37 2010 +0100
src/utils_cmd_listval.c: Fix a memory leak.
Thanks to Peter Warasin for figuring this out. His "garbage collector" patch
may replace this solution in future versions of collectd.
commit dbe1a7d29fe1758380c50644e8b9cba3e618a25f
Author: Michael Stapelberg <michael at stapelberg.de>
Date: Sat Feb 6 16:10:33 2010 +0100
Bugfix: correctly handle spurious wakeups in pthread_cond_timedwait
This fixes problems storing data in rrd files on NetBSD 5.0 with more
than one CPU.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit 5233d6b54dbae48b7604a3dedaee493a64d31cbf
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Feb 4 13:07:43 2010 +0100
src/utils_format_json.c: Use "isfinite" rather than "isinf".
Makes it a bit easier to read.
commit e0b3aa9ba8254ab29d86b294553a5413b7efa59a
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Feb 4 13:07:06 2010 +0100
src/collectd.h: Add fallback implementations of "isfinite" and "isinf".
commit fdb6736cf312cd91bb7fcfc71393e6525c09cec8
Author: Chris Buben <cbuben at eventlogic.com>
Date: Thu Feb 4 00:52:30 2010 -0800
utils_format_json: serialize nan and inf as null, as per JSON spec
I'm deserializing JSON output from the write_http plugin using ruby-yajl.
yajl was puking on the literal value nan encoded in the output.
[
{
"plugin": "memcached",
"interval": 10,
"host": "myhost",
"values": [
nan,
5
],
"time": 1265239180,
"plugin_instance": "",
"type_instance": "",
"type": "ps_count"
}
]
After some research, ECMA-262 15.12.3 says nan and infinite numbers
aren't representable in JSON and should be serialized as the string
null. I figure any strictly-compliant JSON parser will fail on parsing
JSON data containing nans as emitted by collectd's utils_format_json
routines.
This patch makes collectd's JSON output compliant in the case of
infinite or nan gauge values.
Signed-off-by: Florian Forster <octo at huhu.verplant.org>
commit a1a04f130d16c8a0aacfeb2734af51f94734176b
Author: Sebastian Harl <sh at tokkee.org>
Date: Thu Jan 28 23:29:25 2010 +0100
ping plugin: Improved some error messages.
commit 5cf068c08da44590fb42f5c42507ce5be8a02c45
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 27 00:07:50 2010 +0100
contextswitch plugin: Handle large counter/derive values correctly.
Using "strtoul" for derive_t values fails for large counter values.
Thanks to Martin Merkel for reporting this :)
commit 6e3c5c491b4a9c78c92352031bb480216d88622f
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Jan 24 15:32:25 2010 +0100
collectd{-python,.conf}(5): Fixed some typos.
Thanks to lintian(1) for catching those!
commit fb16e34624c30a30330031f1662a847442c41a69
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Jan 24 13:20:43 2010 +0100
collectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos.
Thanks to lintian(1) for catching (some of) those! :-)
commit a62bc47e3bea0733c354976c17885e3f579a38c5
Author: Florian Forster <octo at huhu.verplant.org>
Date: Sat Jan 23 13:19:49 2010 +0100
apache plugin: Fix collection of the "apache_connections" value with Apache 2.*.
Thanks to Gary (bug tracker) for pointing this out :)
commit c9cdeb81ab8fd71dbe642b6569c2a1b98fd11901
Author: Pavel Piatruk <piatruk.p at gmail.com>
Date: Fri Jan 22 09:13:29 2010 +0100
contrib/collection.cgi: Added ability to hide specified types.
It is useful when you don't want to see many graphs. How to use the patch:
apply it to collection.cgi and add lines with keyword ,,dontshowtype'' to
/etc/collectd/collection.conf:
dontshowtype: "if_errors"
dontshowtype: "if_packets"
Then you will see only if_octets types in "interface" plugin page.
Via Debian bug #566199.
commit 92ead4466044c821353d136005452f07bb9464f6
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Jan 21 11:36:30 2010 +0100
src/filter_chain.c: Make info-message more verbose.
commit 710744a459be601bf557ea61de62b66922c3723b
Author: Paul Sadauskas <psadauskas at gmail.com>
Date: Sun Jan 17 12:54:06 2010 -0700
Use Curl AnyAuth (digest+basic) instead of just digest
commit 3dc81b33ff9f8ac56f4150b18cd6cd520d01a905
Merge: d785e7983cefc75069d4de503f381d7558bcb0a6 6bed4b118be72ff649a4d7547bcc4dfffcd887f0
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 20 10:32:01 2010 +0100
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
commit 6bed4b118be72ff649a4d7547bcc4dfffcd887f0
Author: Sebastian Harl <sh at tokkee.org>
Date: Fri Jan 15 10:07:39 2010 +0100
exec plugin: Improved some error messages.
commit d785e7983cefc75069d4de503f381d7558bcb0a6
Author: Florian Forster <octo at huhu.verplant.org>
Date: Fri Jan 15 10:16:18 2010 +0100
contrib/exec-munin.px: Add GPLv2 header.
commit 7e504c50768c77d78003e1e27afe6f9f81a85b85
Merge: 652bf01441baf806cc0e5aed34e0e58746dc73ea 4ed1a6084d08463f09ccecd50be1fb245d49231e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Jan 14 15:19:39 2010 +0100
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
commit 652bf01441baf806cc0e5aed34e0e58746dc73ea
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Jan 14 15:03:43 2010 +0100
ChangeLog: Added fix in the processes plugin.
commit 751edecd4ee81803c1331d2044ad9332f1570210
Author: Florian Forster <octo at huhu.verplant.org>
Date: Thu Jan 14 10:54:53 2010 +0100
processes plugin: Fix handling of the ps_disk_{octets,ops} types.
There values were stored in a `long', then `counter_t', then interpreted as
`derive_t'. Changed that to `derive_t' only. Hopefully this fixes a bug
reported by Mark Moseley.
commit 39cfe7375d7368f56bd6630903a44f6a3e04520a
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 13 18:04:24 2010 +0100
ChangeLog: Updated for version 4.9.1.
commit 4ed1a6084d08463f09ccecd50be1fb245d49231e
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 13 17:55:02 2010 +0100
ChangeLog: Updated for version 4.8.3.
commit 6732ba07293bd05b9c2b0202f9307e50565c0f6b
Merge: 33aeecfc2507da2619a5d6fbae18813b4bb42b25 75aa62d1e4fa19731f2a9182d6132d6d6feb90bc
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 13 15:52:12 2010 +0100
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
commit 33aeecfc2507da2619a5d6fbae18813b4bb42b25
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 13 15:51:41 2010 +0100
collectd.conf(5): Rephrase a weird sentence in the cURL-JSON documentation.
commit 4f22a78cb9808fbda2d7c7280378319d59d4614e
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Jan 13 15:51:02 2010 +0100
collectd.conf(5): Remove trailing whitespace.
commit 75aa62d1e4fa19731f2a9182d6132d6d6feb90bc
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Jan 13 13:21:47 2010 +0100
types.db(5): Mention the types "ABSOLUTE" and "DERIVE" as well.
More information about the collectd-changes
mailing list