[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Fri Sep 7 11:31:54 CEST 2012
configure.in | 3 +
contrib/collectd_network.py | 62 ++++++++++++--------
contrib/collection3/bin/index.cgi | 48 ++++++++++++++++
contrib/collection3/lib/Collectd/Graph/Type/Df.pm | 4 +-
contrib/migrate-4-5.px | 24 ++++++--
src/Makefile.am | 5 +-
src/amqp.c | 1 +
src/collectd.c | 63 +++++++++++----------
src/collectd.conf.pod | 44 ++++++++------
src/collectdctl.c | 2 +-
src/common.c | 2 +-
src/df.c | 2 +
src/email.c | 5 +-
src/memcachec.c | 2 +-
src/mysql.c | 4 +-
src/netapp.c | 44 +++++++++++---
src/nfs.c | 4 +-
src/oracle.c | 57 ++++++++++++-------
src/redis.c | 4 ++
src/rrdtool.c | 2 +-
src/snmp.c | 12 ++--
src/utils_avltree.c | 2 +
src/utils_dns.c | 23 +++++---
src/utils_rrdcreate.c | 4 +-
src/varnish.c | 5 ++
src/write_mongodb.c | 9 ++-
src/zfs_arc.c | 6 +-
27 files changed, 308 insertions(+), 135 deletions(-)
New commits:
commit 59dded4cc1a2077ad11c6e9b507e15ad19e0e38c
Merge: 0abfaa6 fda68e2
Author: Florian Forster <octo at collectd.org>
Date: Fri Sep 7 11:19:52 2012 +0200
Merge branch 'collectd-5.1'
commit fda68e239798cea197a225ed5325f5bb3c2e70de
Merge: 180f2ba b4c8f3f
Author: Florian Forster <octo at collectd.org>
Date: Fri Sep 7 11:15:24 2012 +0200
Merge branch 'collectd-5.0' into collectd-5.1
Conflicts:
src/swap.c
commit b4c8f3f762d666742c774ab3b45815e5a416e5da
Merge: c882e8a 77f03c9
Author: Florian Forster <octo at collectd.org>
Date: Fri Sep 7 11:05:48 2012 +0200
Merge branch 'collectd-4.10' into collectd-5.0
commit c882e8a855a6803a498be2235560f8d0359edcb6
Author: m4rienf <frank at apsu.be>
Date: Thu Sep 6 21:25:22 2012 +0200
corrected high-resolution time conversions after code review
Signed-off-by: Florian Forster <octo at collectd.org>
commit bc053db36028690e589607d5711724fe13bb170d
Author: m4rienf <frank at apsu.be>
Date: Tue Sep 4 20:23:43 2012 +0200
Updated Adrian Perez' 2009 Python network proto classes
Signed-off-by: Florian Forster <octo at collectd.org>
commit 77f03c91b3074b5abd3e602002b7fc7ce28ea612
Author: Dan Thomson <dan at astutehosting.com>
Date: Thu Sep 6 19:00:11 2012 -0700
snmp plugin: Fix error message printed by the "Shift" option.
I noticed a small error in snmp.c in collectd-5.1.0 (might be
elsewhere). The warning message in csnmp_config_add_data_shift says
"Scale config option" instead of "Shift" config option:
[…]
Signed-off-by: Florian Forster <octo at collectd.org>
commit 3512bb1a50e2bf1a7f2998101fb5e7c5783bfa51
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Wed Mar 21 21:34:00 2012 +0100
df plugin: when checking / do it just once
Newer system symlink /etc/mtab to /proc/mounts which makes root
filesystem seem mounted twice, once as type rootfs and once for the
real device.
When / is selected for df plugin, skip the rootfs mount-point as
real root is usually mounted right on top of it.
Not skipping it causes rrdtool to complain about two updates for the
same timestamp, the first entry for rootfs passes but rrdtool complains
when stats for the second occurrence for real filesystem is being
considered.
Signed-off-by: Bruno Prémont <bonbons at linux-vserver.org>
Signed-off-by: Florian Forster <octo at collectd.org>
commit 07739dab47ddd4d51f82e37135dcfcd2addf1812
Author: Florian Forster <octo at collectd.org>
Date: Fri Sep 7 10:11:42 2012 +0200
snmp plugin: Check for SNMP_ENDOFMIBVIEW.
Some implementations of SNMP will send a special "variable" when you're
leaving the requested subtree with type "endOfMibView" aka.
"SNMP_ENDOFMIBVIEW". Examples of such implementations are Citrix
Netscalers and IBM's General Parallel File System (GPFS). Reading past
this special variable will result in weird values being returned.
This adds an appropriate check to csnmp_check_res_left_subtree().
Thanks to "Mark" for reporting this issue and clarifying.
commit 1e648d412b43d95f5fa85ac08f094067d7984afd
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 5 08:43:18 2012 +0200
src/Makefile.am: Unconditionally link collectd with libm.
Under FreeBSD, running src/utils_format_json.c fails because isfinite()
cannot be resolved. The GNU manpages for isnan() and isfinite() also
advise users to link with libm and AIX has had the library being linked
in for a while. Since it's such a basic library it seems easier to just
link with it unconditionally.
Fixes Github issue #122.
commit 4cc660e8762159dee0c9fac38e6a49f031abf271
Merge: ce980d2 4c81ea6
Author: Florian Forster <ff at octo.it>
Date: Tue Sep 4 03:45:44 2012 -0700
Merge pull request #124 from tokkee/bj/build
Fix some build issues on AIX using automake <= 1.9 and gcc 4.7.1.
commit 4c81ea6168518f40ff4a1d043692688bff5cc9e7
Author: Benjamin Jacobs <jacobsbenja at gmail.com>
Date: Sun Sep 2 23:54:35 2012 +0200
Add missing return statements
Fix gcc warn/error: no return statement in function returning non-void [-Werror=return-type]
Signed-off-by: Sebastian Harl <sh at tokkee.org>
commit 98ab507c640ffa46aadd1f8486f353e66a6929fb
Author: Benjamin Jacobs <jacobsbenja at gmail.com>
Date: Sun Sep 2 23:53:24 2012 +0200
Automake 1.9 compatibility: don't use $(builddir)
Automake <= 1.9 don't define $(builddir) which is always defined to
'.' anyway.
Signed-off-by: Sebastian Harl <sh at tokkee.org>
commit 180f2ba844e00bd0e73acc5b4445b48652e47dcd
Merge: b736009 39ef2de
Author: Florian Forster <octo at collectd.org>
Date: Mon Aug 27 10:12:11 2012 +0200
Merge branch 'sh/collectd-5.1' into collectd-5.1
commit b736009816ddeb00a2ec4c7e3986f98522215afd
Author: Jonathan Huot <jonathan.huot at gmail.com>
Date: Thu Aug 2 18:56:05 2012 +0300
Added the instance name to varnish API
Fixed issue collectd#110
Signed-off-by: Florian Forster <octo at collectd.org>
commit ce980d2a92b562e1e0390c062421169335d4e242
Merge: 4b3e411 101c7c0
Author: Florian Forster <ff at octo.it>
Date: Fri Aug 10 00:16:37 2012 -0700
Merge pull request #109 from tokkee/sh/collectd-5.0
configure: Define _REENTRANT when compiling on Solaris.
LGTM
commit 8e50e5d967d0b5a8627ef00d37063f746b957307
Author: Chris Lundquist <ChrisMLundquist at gmail.com>
Date: Fri Jul 13 01:06:15 2012 +0000
Fix to make write_mongodb work with any version of mongo-c-driver
commit 101c7c008fee8c3386628bce49af14b58845c69b
Author: Mathijs Möhlmann <collectd at mmrc.nl>
Date: Tue Mar 22 14:26:47 2011 +0100
configure: Define _REENTRANT when compiling on Solaris.
On Wed, Mar 16, 2011 at 10:35:07AM +0100, Mathijs Möhlmann wrote:
> I'm using collectd 4.10.2 on Solaris 10 (gcc 3.4.6). Sometimes when I
> start with a clean rrd directory or add a host the .rrd file (rrdtools
> plugin) don't get created and I get the following message:
>
> collectd[2996]: [ID 702911 daemon.error] stat(/usr/local/var/lib/collectd/rrd/asterix/load/load.rrd) failed: Bad file number
This patch fixes this.
Signed-off-by: Sebastian Harl <sh at teamix.net>
commit 4b3e4116a7c512b8e5ac660850a0a2cc6979fe3c
Author: Sebastian Harl <sh at teamix.net>
Date: Thu Aug 2 12:16:38 2012 +0200
configure, utils_dns: Check for and use netinet/ip_compat.h.
This is required on Solaris in order to get the ip6_ext struct.
commit 3cc6836b0c1155ce81d50d3dcc295380346b1e1b
Author: Sebastian Harl <sh at teamix.net>
Date: Wed Aug 1 09:16:34 2012 +0200
mysql plugin: Use the database instance name for identifying read callbacks.
The database instance is specified as argument to the <Database> block.
Without this fix, we cannot specify two database blocks without the
(optional!) 'Database' option as this would result in registering two read
callbacks with the name 'mysql'.
Thanks to Johan Bergström for reporting this on IRC!
commit 91f0e886b3f80f5cdfcb0101db27ab90d982e4d3
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Jul 15 13:04:09 2012 +0200
contrib/migrate-4-5.px: Added missing end quotes in a call to rrd_filter.px.
commit ee992f505a64e4da5637988c33783ef9a350ed29
Author: Daniel Sutto <sutto.daniel at itk.ppke.hu>
Date: Wed Jul 11 19:32:16 2012 +0200
Fix bad definition of UDP src port in DNS plugin.
commit 719286f21b91e1122b23fbc7dbf2190e356af464
Author: biancalana <ale at biancalanas.net>
Date: Thu Jul 5 22:07:15 2012 -0300
Correct compilation on FreeBSD, set HOST_NAME_MAX to _POSIX_HOST_NAME_MAX if isn't defined
commit 605dab534eb2f0ee26446c157c9fdd2ad6e9427a
Author: Florian Forster <octo at collectd.org>
Date: Thu Jul 5 15:48:29 2012 +0200
contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
commit cb3174def47717246e0401305ca3b1832181b4c6
Author: Florian Forster <octo at collectd.org>
Date: Thu Jul 5 08:32:28 2012 +0200
collectd.conf(5): Improve description of the configuration syntax.
commit a8369b08f0c2cd2793e423840820c719caacfa31
Merge: c00718f 86f8abb
Author: Florian Forster <github at nospam.verplant.org>
Date: Mon Jul 2 13:00:34 2012 -0700
Merge pull request #97 from tokkee/sh/swap
swap plugin: Don't report an error if there is no swap space on Linux.
commit 86f8abbafa7a174299caa435c7e0bc5d07b84968
Author: Sebastian Harl <sh at tokkee.org>
Date: Sat Jun 30 16:33:09 2012 +0200
swap plugin: Don't report an error if there is no swap space on Linux.
… rather, simply record zeros in that case. Swap may be switched on and off at
arbitrary times and/or might be added at "later" times. Thus, storing zero in
case the swap plugin is enabled sounds like the best approach to me.
commit 64c5dc9eb67132d8a943edfcd248fd161131ff3d
Author: Pascal Hofmann <mail at pascalhofmann.de>
Date: Thu Jun 14 21:54:47 2012 +0200
Fix for config file parsing ("memcachec plugin: Option `Server' not allowed here.")
commit 9343b7456d7b846f657a1d0566cb6732f0f2ea50
Author: Will Hawkins <hawkinsw at opentechinstitute.org>
Date: Fri Jun 22 14:45:45 2012 -0400
Fix out-of-bound index in rrdtool.c
Fix a reference to argv[1] that is (always?)
outside the bounds of the argv array. It happens
during a log statement that seems to want
to actually refer to the rrd filename.
commit fe88af34d1b23c05ef674930d41c691e46df0a8f
Author: Florian Forster <octo at collectd.org>
Date: Tue Jun 19 13:14:32 2012 +0200
oracle plugin: Add database name and query name (if applicable) to error messages.
commit 5957693cb9b458ba575eaf1c6c08f0053eb54ad9
Author: Florian Forster <octo at collectd.org>
Date: Mon Jun 18 10:49:38 2012 +0200
oracle plugin: Report the "connect id" when OCILogon() fails.
commit 084561b5c844c532c1e93964a4b1a403114eb80f
Author: Florian Forster <octo at collectd.org>
Date: Sun Jun 17 20:46:43 2012 +0200
collection3: Use {instance} in Df's grpah title.
{type_instance} didn't work when used with other plugins than "df", e.g.
the example configuration of the Oracle plugin uses this.
commit e06c9a7cbc62b82c9ef5a4074a94c037174ca723
Author: Florian Forster <octo at collectd.org>
Date: Fri Jun 1 07:45:30 2012 +0200
src/utils_dns.c: Remove duplicate line.
commit 0c1b6ab12216ce6fab16eb68e130aaf021b15e3c
Author: Florian Forster <octo at collectd.org>
Date: Thu May 31 15:09:43 2012 +0200
src/utils_dns.c: Rename the "s_addr" and "d_addr" variables.
On Solaris, there is a macro called "s_addr" resulting in syntax errors
when this is used as a variable name. The variables have been renamed to
circumvent this problem. Thanks to Maciej Bliziński for reporting this
problem and helping to debug it!
commit 1c10afb5bfaf55d8cf89e2b60b0618aa869dcc19
Author: Florian Forster <octo at collectd.org>
Date: Sun May 27 11:13:04 2012 +0200
collection3: Filter out identifiers with control characters.
Otherwise XML errors will prevent the page from rendering.
commit da93b3172489e2eb51a93b0ab2238247a16c8e5b
Author: Florian Forster <octo at collectd.org>
Date: Sun May 27 11:10:56 2012 +0200
src/utils_avltree.c: Add sanity check to c_avl_destroy().
commit c00718f5ae61eea67abdd92aa4cb65920d4803aa
Author: Florian Forster <octo at collectd.org>
Date: Sat May 12 17:29:44 2012 +0200
src/utils_rrdcreate.c: Handle "last update" in a saner way.
commit 15677f366c063fd3aadeb612e367b0d6d68587b8
Author: Florian Forster <octo at collectd.org>
Date: Sat May 12 16:17:17 2012 +0200
netapp plugin: Close connection on communication errors.
commit d7aa39502a8ba790108473620be5913fbc56b472
Author: Florian Forster <octo at collectd.org>
Date: Sat May 5 18:05:12 2012 +0200
collectd.conf(5): Fix typo.
commit 119bd8e21c762a30d6f12e419cf5a7b7ee9e6b48
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 19 14:25:59 2012 +0200
collectdctl: Fix PUTVAL for data sets with multiple data sources.
Thanks to Cyril Feraudet for pointing out this problem!
commit 1c662d906121eaf8daaa5c927f54082765a96583
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 16 15:02:04 2012 +0200
contrib/collection3: Ignore control characters.
While they are correctly encoded, e.g. as "", browsers will
complain about invalid XML and not render the page. Ignore all control
characters other than whitespace.
commit 03fffc410e946598dbb6db2b9d9371b5f01048da
Author: Florian Forster <octo at collectd.org>
Date: Fri Apr 6 16:18:18 2012 +0200
Create directories with permission 0777.
Let umask work its magic. Thanks to "Poil" for reporting this problem.
Fixes GitHub issue #63.
commit 39ef2de9c9a29ae6ce6a2847361f6e25aa2117d1
Author: Sebastian Harl <sh at teamix.net>
Date: Thu Aug 2 11:28:13 2012 +0200
nfs, zfs_arc plugins: Make sure to return from non-void function.
commit ed5fd2d3982bc10d91c2abe8468d5ca51abdffe8
Author: Sebastian Harl <sh at teamix.net>
Date: Thu Aug 2 11:25:51 2012 +0200
nfs, zfs_arc plugins: Fixed discards qualifiers from pointer target type warn.
kstat_data_lookup() and get_kstat_value() expect char pointers rather than
const char pointers.
More information about the collectd-changes
mailing list