Florian Forster [Mon, 8 Oct 2012 14:20:34 +0000 (16:20 +0200)]
src/utils_avltree.c: Fix an off-by-one error in c_avl_insert().
When inserting the first node in the tree, the size is not incremented.
This causes c_avl_size() to return one element too little.
Thanks to Yves Mettier for debugging this!
Manuel Luis Sanmartin Rozada [Sat, 29 Sep 2012 19:45:33 +0000 (21:45 +0200)]
The commit
3bda88e8b425f43644e303e6957e38ae59c1bc83 change the shell from sh to bash.
To fix the configure script generation error: remove the echo whith \c used in sh.
Note: bash is not installed in AIX by default.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 23 Sep 2012 10:22:27 +0000 (12:22 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sun, 23 Sep 2012 10:20:49 +0000 (12:20 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/utils_db_query.c
src/zfs_arc.c
hume-github [Tue, 18 Sep 2012 18:19:39 +0000 (15:19 -0300)]
Fix for Solaris when setting ip-opt multicast-loop (must be a char, not int).
General logging additions for tracking down the problem.
Signed-off-by: Florian Forster <octo@collectd.org>
hume-github [Tue, 18 Sep 2012 18:12:25 +0000 (15:12 -0300)]
Multithreading fix: localize unneeded global variable
Florian Forster [Sun, 23 Sep 2012 10:00:43 +0000 (12:00 +0200)]
ethstat plugin: Initialize realloc'ated memory.
The last element in "interfaces" is not guaranteed to be zeroed, resulting in a
segfault when cf_util_get_string() tries to free the "pointer".
Thanks to Mark T. Voelker for reporting and analyzing this bug!
This should fix Github issue #133.
Florian Forster [Sun, 23 Sep 2012 09:56:58 +0000 (11:56 +0200)]
ethstat plugin: Fix off-by-one error.
This hopefully fixes Github issue #135.
JonathanHuot [Thu, 13 Sep 2012 16:27:57 +0000 (18:27 +0200)]
libs varnish & varnishcompat are NOT needed. "pkg-config --libs varnishapi" output only libvarnishapi as well
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Wed, 13 Jun 2012 12:33:05 +0000 (14:33 +0200)]
bindings/Makefile: perl: Use INSTALL_BASE rather than PREFIX.
Some versions of Perl / ExtUtils::MakeMaker will else abort with an error
message explaining INSTALL_BASE and PREFIX may not be used both. However, I
don't know where the other definition comes from.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Wed, 13 Jun 2012 12:31:00 +0000 (14:31 +0200)]
configure: Don't add -liptc to the global LIBS setting.
AC_SEARCH_LIBS() would do that, so save and restore LIBS when calling that
macro.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Fri, 18 May 2012 20:31:13 +0000 (22:31 +0200)]
configure: Use AC_INCLUDES_DEFAULT when checking any libkvm stuff.
kvm.h requires sys/types.h to be included. Using AC_INCLUDES_DEFAULT will
hopefully make sure that we're save for a bit ;-)
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 13 Sep 2012 08:53:19 +0000 (10:53 +0200)]
curl_xml plugin: Mark read-only strings as const.
Fabien Wernli [Mon, 28 Nov 2011 09:46:18 +0000 (10:46 +0100)]
fix Host config being ignored
Change-Id: I8a109818d8a821e2f3e0660fbb6ba1843279fcc2
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 13 Sep 2012 08:18:14 +0000 (10:18 +0200)]
apcups plugin: Retry sending the "status" command.
If that fails more than twice in the first 10 iterations, gracefully shut
down the socket in all future iterations.
This should fix Github issue #15.
Florian Forster [Thu, 13 Sep 2012 08:05:35 +0000 (10:05 +0200)]
apcups plugin: Add function net_shutdown().
Florian Forster [Thu, 13 Sep 2012 08:04:26 +0000 (10:04 +0200)]
apcups plugin: Make sure the socket is closed on errors.
Florian Forster [Wed, 12 Sep 2012 20:51:58 +0000 (22:51 +0200)]
src/utils_db_query.c: Use the right field when checking for size.
Florian Forster [Wed, 12 Sep 2012 19:31:41 +0000 (21:31 +0200)]
Revert "swap plugin: Add the "ReportBytes" option."
This reverts commit
25fd1667c186eb871a4b66f9866d6446e41f1bc2.
Florian Forster [Wed, 12 Sep 2012 16:55:08 +0000 (18:55 +0200)]
swap plugin: Add the "ReportBytes" option.
When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.
This should fix Github issue #10.
Florian Forster [Wed, 12 Sep 2012 16:25:20 +0000 (18:25 +0200)]
exec plugin: Really remove STDERR from the select() set.
select(2) is actually using a variable called "copy", which we didn't set in
this case.
Fixes Github issue #12. Thanks to Tetsuya Kawaguchi for reporting this problem.
Florian Forster [Tue, 11 Sep 2012 07:54:32 +0000 (09:54 +0200)]
configure.in: Make sure sa_familiy_t is defined when checking rtnl_dump_filter().
Sebastian Harl [Sat, 19 May 2012 10:31:52 +0000 (12:31 +0200)]
netlink plugin: Check for the number of arguments to 'rtnl_dump_filter'.
In recent versions of iproute2, 'rtnl_dump_filter' expects three rather than
five arguments.
This should fix Github issue #7.
Signed-off-by: Florian Forster <octo@collectd.org>
Gerrie Roos [Tue, 17 Apr 2012 13:22:36 +0000 (15:22 +0200)]
Fixed collectd's unixsock read interrupted by SIGCHLD's.
Signed-off-by: Florian Forster <octo@collectd.org>
Gerrie Roos [Fri, 25 May 2012 03:38:47 +0000 (05:38 +0200)]
Fixed various collectd memory leaks.
Once I understood what's going on I tried to keep the changes to a minimum.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Mon, 10 Sep 2012 19:10:45 +0000 (21:10 +0200)]
Merge branch 'ff/kstat' into collectd-4.10
Adrian Perez [Fri, 7 Sep 2012 13:59:32 +0000 (16:59 +0300)]
Set license info line to ”GPLv2 or newer”
Recently I had a request to change the licensing of this file to
use it in a GPLv3 application. This change would make it easier,
while retaining GPLv2 to make the license still match the one in
collectd.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 7 Sep 2012 09:15:24 +0000 (11:15 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1
Conflicts:
src/swap.c
Florian Forster [Fri, 7 Sep 2012 09:05:48 +0000 (11:05 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
m4rienf [Thu, 6 Sep 2012 19:25:22 +0000 (21:25 +0200)]
corrected high-resolution time conversions after code review
Signed-off-by: Florian Forster <octo@collectd.org>
m4rienf [Tue, 4 Sep 2012 18:23:43 +0000 (20:23 +0200)]
Updated Adrian Perez' 2009 Python network proto classes
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Thomson [Fri, 7 Sep 2012 02:00:11 +0000 (19:00 -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@collectd.org>
Bruno Prémont [Wed, 21 Mar 2012 20:34:00 +0000 (21:34 +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@linux-vserver.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 7 Sep 2012 08:11:42 +0000 (10:11 +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.
Florian Forster [Thu, 6 Sep 2012 15:29:59 +0000 (17:29 +0200)]
src/common.c: Add missing semicolon.
Florian Forster [Thu, 6 Sep 2012 14:12:53 +0000 (16:12 +0200)]
src/common.c: get_kstat_value: Check the arguments and return error codes.
Rather than asserting that an argument is not NULL, check this condition
and return an error code.
This should fix Github issue #71.
Florian Forster [Wed, 5 Sep 2012 06:43:18 +0000 (08:43 +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.
Florian Forster [Tue, 4 Sep 2012 10:45:44 +0000 (03:45 -0700)]
Merge pull request #124 from tokkee/bj/build
Fix some build issues on AIX using automake <= 1.9 and gcc 4.7.1.
Benjamin Jacobs [Sun, 2 Sep 2012 21:54:35 +0000 (23:54 +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@tokkee.org>
Benjamin Jacobs [Sun, 2 Sep 2012 21:53:24 +0000 (23:53 +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@tokkee.org>
Florian Forster [Mon, 27 Aug 2012 08:12:11 +0000 (10:12 +0200)]
Merge branch 'sh/collectd-5.1' into collectd-5.1
Jonathan Huot [Thu, 2 Aug 2012 15:56:05 +0000 (18:56 +0300)]
Added the instance name to varnish API
Fixed issue collectd#110
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 10 Aug 2012 07:16:37 +0000 (00:16 -0700)]
Merge pull request #109 from tokkee/sh/collectd-5.0
configure: Define _REENTRANT when compiling on Solaris.
LGTM
Chris Lundquist [Fri, 13 Jul 2012 01:06:15 +0000 (01:06 +0000)]
Fix to make write_mongodb work with any version of mongo-c-driver
Mathijs Möhlmann [Tue, 22 Mar 2011 13:26:47 +0000 (14:26 +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@teamix.net>
Sebastian Harl [Thu, 2 Aug 2012 10:16:38 +0000 (12:16 +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.
Sebastian Harl [Wed, 1 Aug 2012 07:16:34 +0000 (09:16 +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!
Sebastian Harl [Sun, 15 Jul 2012 11:04:09 +0000 (13:04 +0200)]
contrib/migrate-4-5.px: Added missing end quotes in a call to rrd_filter.px.
Daniel Sutto [Wed, 11 Jul 2012 17:32:16 +0000 (19:32 +0200)]
Fix bad definition of UDP src port in DNS plugin.
biancalana [Fri, 6 Jul 2012 01:07:15 +0000 (22:07 -0300)]
Correct compilation on FreeBSD, set HOST_NAME_MAX to _POSIX_HOST_NAME_MAX if isn't defined
Florian Forster [Thu, 5 Jul 2012 13:48:29 +0000 (15:48 +0200)]
contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
Florian Forster [Thu, 5 Jul 2012 06:32:28 +0000 (08:32 +0200)]
collectd.conf(5): Improve description of the configuration syntax.
Florian Forster [Mon, 2 Jul 2012 20:00:34 +0000 (13:00 -0700)]
Merge pull request #97 from tokkee/sh/swap
swap plugin: Don't report an error if there is no swap space on Linux.
Sebastian Harl [Sat, 30 Jun 2012 14:33:09 +0000 (16:33 +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.
Pascal Hofmann [Thu, 14 Jun 2012 19:54:47 +0000 (21:54 +0200)]
Fix for config file parsing ("memcachec plugin: Option `Server' not allowed here.")
Will Hawkins [Fri, 22 Jun 2012 18:45:45 +0000 (14:45 -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.
Florian Forster [Tue, 19 Jun 2012 11:14:32 +0000 (13:14 +0200)]
oracle plugin: Add database name and query name (if applicable) to error messages.
Florian Forster [Mon, 18 Jun 2012 08:49:38 +0000 (10:49 +0200)]
oracle plugin: Report the "connect id" when OCILogon() fails.
Florian Forster [Sun, 17 Jun 2012 18:46:43 +0000 (20:46 +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.
Florian Forster [Fri, 1 Jun 2012 05:45:30 +0000 (07:45 +0200)]
src/utils_dns.c: Remove duplicate line.
Florian Forster [Thu, 31 May 2012 13:09:43 +0000 (15:09 +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!
Florian Forster [Sun, 27 May 2012 09:13:04 +0000 (11:13 +0200)]
collection3: Filter out identifiers with control characters.
Otherwise XML errors will prevent the page from rendering.
Florian Forster [Sun, 27 May 2012 09:10:56 +0000 (11:10 +0200)]
src/utils_avltree.c: Add sanity check to c_avl_destroy().
Florian Forster [Sat, 12 May 2012 15:29:44 +0000 (17:29 +0200)]
src/utils_rrdcreate.c: Handle "last update" in a saner way.
Florian Forster [Sat, 12 May 2012 14:17:17 +0000 (16:17 +0200)]
netapp plugin: Close connection on communication errors.
Florian Forster [Sat, 5 May 2012 16:05:12 +0000 (18:05 +0200)]
collectd.conf(5): Fix typo.
Florian Forster [Thu, 19 Apr 2012 12:25:59 +0000 (14:25 +0200)]
collectdctl: Fix PUTVAL for data sets with multiple data sources.
Thanks to Cyril Feraudet for pointing out this problem!
Florian Forster [Mon, 16 Apr 2012 13:02:04 +0000 (15:02 +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.
Florian Forster [Fri, 6 Apr 2012 14:18:18 +0000 (16:18 +0200)]
Create directories with permission 0777.
Let umask work its magic. Thanks to "Poil" for reporting this problem.
Fixes GitHub issue #63.
Florian Forster [Mon, 2 Apr 2012 08:14:12 +0000 (10:14 +0200)]
varnish plugin: Make argument "stats" const.
Florian Forster [Mon, 2 Apr 2012 08:04:23 +0000 (10:04 +0200)]
ethstat plugin: Fix a typo.
Florian Forster [Sun, 1 Apr 2012 15:15:20 +0000 (17:15 +0200)]
Bump version to 5.1.0; Update ChangeLog.
Florian Forster [Sun, 1 Apr 2012 10:07:20 +0000 (12:07 +0200)]
Merge branch 'collectd-5.0'
Florian Forster [Sun, 1 Apr 2012 10:07:09 +0000 (12:07 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
Florian Forster [Sun, 1 Apr 2012 10:06:42 +0000 (12:06 +0200)]
ChangeLog: Correct date.
Florian Forster [Sun, 1 Apr 2012 10:06:24 +0000 (12:06 +0200)]
Bump version to 5.0.4; Update ChangeLog.
Florian Forster [Sun, 1 Apr 2012 10:01:58 +0000 (12:01 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
src/collectd.conf.pod
src/common.c
src/network.c
src/processes.c
version-gen.sh
Florian Forster [Sun, 1 Apr 2012 09:51:38 +0000 (11:51 +0200)]
Bump version to 4.10.7; Update ChangeLog.
Florian Forster [Sat, 31 Mar 2012 15:27:14 +0000 (17:27 +0200)]
Revert "Proposal fix for large "MaxPacketSize" use."
This reverts commit
12213f8dfeee3feb3846aa658def0bb79c1211d0.
Florian Forster [Fri, 23 Mar 2012 21:21:43 +0000 (22:21 +0100)]
network plugin: Do not forward received notifications.
The network plugin would send out all notifications it got through its
callback, even the ones it received itself and even when forwarding was
disabled.
With this patch the network plugin will only transmit notifications created
locally -- forwarding of notifications is not implemented due to missing
loop-detection. For loop-detection we would have to keep track of the last
timestamp of each notifications, and since each host/plugin/type/-instance
field may be empty, this is not as straight forward as with value lists. If
someone needs this, they will need to invest some work I'm afraid.
Florian Forster [Fri, 23 Mar 2012 13:17:00 +0000 (06:17 -0700)]
Merge pull request #56 from octo/ci/nfs
NFS plugin: Add Solaris support.
Florian Forster [Fri, 23 Mar 2012 12:53:39 +0000 (13:53 +0100)]
Merge branch 'ff/zfs'
Florian Forster [Fri, 23 Mar 2012 12:52:51 +0000 (13:52 +0100)]
zfs_arc plugin: Move reading of kstat values into separate functions.
This way error handling can be done in a central place and we can do this more
carefully overall.
Florian Forster [Fri, 23 Mar 2012 12:48:19 +0000 (05:48 -0700)]
Merge pull request #60 from octo/ar/zfs
more zfs kstat values
Florian Forster [Thu, 22 Mar 2012 08:05:12 +0000 (09:05 +0100)]
zfs_arc plugin: Add copyright header for Aurelien Rougemont.
Cyril Feraudet [Mon, 19 Mar 2012 10:08:06 +0000 (11:08 +0100)]
Proposal fix for large "MaxPacketSize" use.
When we use a "MaxPacketSize" over two thousand of octets (to pass huge
message in notification for example), buffer may not be flushed for a
while.
By flushing buffer when there is about 1400 octets, we're sure there is
no data too longer in.
Florian Forster [Wed, 21 Mar 2012 06:41:38 +0000 (07:41 +0100)]
zfs_arc plugin: Fix the "hash collision" and "mutex miss" metrics.
Florian Forster [Tue, 20 Mar 2012 21:40:39 +0000 (22:40 +0100)]
zfs_arc plugin: Fix typo in variable name.
Florian Forster [Tue, 20 Mar 2012 21:39:39 +0000 (22:39 +0100)]
zfs_arc plugin: Introduce the single-valued "mutex_operation" type.
Florian Forster [Tue, 20 Mar 2012 21:32:14 +0000 (22:32 +0100)]
zfs_arc plugin: Introduce the single-valued "cache_eviction" type.
Florian Forster [Tue, 20 Mar 2012 21:29:59 +0000 (22:29 +0100)]
zfs_arc plugin: Convert to use DERIVE.
Aurelien Rougemont [Thu, 1 Mar 2012 13:48:45 +0000 (14:48 +0100)]
add types for deleted, evict, hash, mutex
Signed-off-by: Florian Forster <octo@collectd.org>
Aurelien Rougemont [Thu, 1 Mar 2012 13:40:10 +0000 (14:40 +0100)]
add hash_collisions, deleted, mutex_miss, evict_*
Cosmin Ioiart [Mon, 19 Mar 2012 09:56:03 +0000 (10:56 +0100)]
Fixed Solaris compilation errors
The value returned by get_kstat_value is of type long long whereas values is a union. Fixed the code so that the value gets assigned to one of the union members, in this case counter.
Cosmin Ioiart [Mon, 19 Mar 2012 09:54:57 +0000 (10:54 +0100)]
Fixed solaris configure script generation errors
The brackets in configure.in and the changes in version-gen.sh are needed in order for the build.sh script to generate the configure script correctly. Else the generated script won't work.
Florian Forster [Mon, 19 Mar 2012 09:47:22 +0000 (10:47 +0100)]
src/common.h: Add comment about return value of read_file_contents().
Florian Forster [Sun, 18 Mar 2012 10:35:13 +0000 (11:35 +0100)]
nfs plugin: Minor coding style fixes.
Florian Forster [Sun, 18 Mar 2012 10:27:03 +0000 (11:27 +0100)]
nfs plugin: Remove duplicated code.
Changes include:
* Calculate nfs[234]_procedures_names_num at compile time.
* Made nfs_procedures_submit() more versatile, so it can be used from the Linux
and the Solaris code.
* Switched to plugin_dispatch_values_secure(), since the code is using the same
value_list_t for multiple values.
* Broke out nfs_submit_fields() from the Linux code. This removed quite a bit
of code duplication between the v2/v3 code.
* Broke out nfs_read_kstat() which does the get_kstat_value() call in a loop
rather than duplicating all the NFS procedure names.
Cosmin Ioiart [Thu, 8 Mar 2012 10:12:53 +0000 (11:12 +0100)]
Enable modules for Solaris
Enabling nfs,processes and protocols modules for Solaris when running the
configure script.
Cosmin Ioiart [Tue, 13 Mar 2012 07:38:16 +0000 (08:38 +0100)]
Fix Linux compilation errors
Fixed compilation errors for the linux platform