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>
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 [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
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.
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 [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.
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 [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 [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.
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 [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 08:14:54 +0000 (09:14 +0100)]
tcpconns plugin: Include <bsd/nlist.h> rather than <nlist.h>.
It appears that <nlist.h> is being deprecated / moved.
This hopefully fixes Debian bug #664429.
Florian Forster [Fri, 16 Mar 2012 17:26:08 +0000 (18:26 +0100)]
src/common.c: parse_value: Strip trailing whitespace before parsing.
This hopefully avoids the annoying "trailing garbage" message when the buffer
only contains a newline or space at the end.
Florian Forster [Fri, 16 Mar 2012 16:44:50 +0000 (17:44 +0100)]
collectd.conf(5): Document the "Hits" and "Hysteresis" threshold options.
Fixes GitHub issue #53.
Clemens Lang [Sat, 10 Mar 2012 01:30:26 +0000 (02:30 +0100)]
Makefile adds dependency on $(LIBLTDL), which is valued "-lltdl"
When building on OS X, the collectd build failed, because the collectd target
has a dependency on "-lltdl", which is the value the variable $(LIBLTDL) has.
Obviously, this should be the file name instead. I am however not sure how to
specify the correct filename in this case.
Fixes GitHub issue #54.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 11 Mar 2012 13:47:24 +0000 (14:47 +0100)]
amqp plugin: Fix compabitility with current librabbitmq.
In particular, add compatibility to the 0.9.1 and current development version.
Unfortunately, no version macro exists, so we need to do some autoconf trickery
:(
Fixes GitHub issue #6.
Florian Forster [Sun, 11 Mar 2012 12:11:33 +0000 (05:11 -0700)]
Merge pull request #44 from octo/ff/perl
Fix race condition in the Perl plugin.
Florian Forster [Sun, 11 Mar 2012 12:04:13 +0000 (13:04 +0100)]
collectd.conf(5): Improve the network plugin's documentation.
The example given was confusing since it didn't make it clear enough, that only
one "Server" stanza is required.
Resolves GitHub issue #19.
Florian Forster [Sun, 11 Mar 2012 11:57:10 +0000 (12:57 +0100)]
network plugin: Fix compiler warnings.
Resolves GitHub issue #49.
Florian Forster [Sun, 11 Mar 2012 11:13:37 +0000 (12:13 +0100)]
snmp plugin: Keep track of signedness of ASN values.
Prior to this, the signed variant was used when casting to gauge_t. This caused
problems with values larger than 2^31-1, since they were casted to negative
values.
Hopefully fixes GitHub issue #50.
Jason Schmidlapp [Thu, 1 Mar 2012 01:27:50 +0000 (20:27 -0500)]
Fixed memory leak in collectdclient library.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 4 Mar 2012 10:10:20 +0000 (11:10 +0100)]
perl plugin: Fix a race condition.
This hopefully fixes GitHub issue #9.
Florian Forster [Thu, 1 Mar 2012 09:57:02 +0000 (01:57 -0800)]
Merge pull request #40 from octo/db/processes
Add support for processes with spaces in their names.
Florian Forster [Thu, 1 Mar 2012 08:56:56 +0000 (09:56 +0100)]
processes plugin: Support processes with spaces in their names.
… without replacing the space in the process name. This is done by using
an equivalent of strchr() and strrchr() to determine the boundaries of
the second "field".
Change-Id: Id4c1a84c0544554fae05623457d2a7a3e0630db2
Darrell Bishop [Sat, 5 Nov 2011 08:29:00 +0000 (09:29 +0100)]
processes plugin: Support processes with spaces in their name.
Fixes GitHub issue #11.
Change-Id: Ifa9db0e020f19da43bbf49bba0626e70c16dc30f
Florian Forster [Wed, 29 Feb 2012 19:47:08 +0000 (20:47 +0100)]
conntrack plugin: Strip newlie before calling parse_value().
Change-Id: Ifa4db20a6b937912db77a214d2c0ef3eeebfa164
Louis Opter [Tue, 28 Feb 2012 17:23:06 +0000 (18:23 +0100)]
Use parse_value in the conntrack plugin and submit the result even if it's zero
Dear collectd,
Please find attached a patch for the conntrack plugin.
The patch is about two things:
1. submit the value even if it is zero (which is a legitimate value according
to types.db);
2. use parse_value and a value_t instead of directly using a double and atof(3).
The first point was important because it meant that the metric was not created
when the initial value was zero. (It could also lead to holes in your graphs).
The parse_value return value is correctly checked, note that the parsed file
ends with a \n which mean that parse_value always complain when running in
debug/info maybe we should replace it with a \0 before handing the buffer to
parse_value() ?
Thanks
--
Louis Opter
Signed-off-by: Florian Forster <octo@collectd.org>
Timon [Tue, 28 Feb 2012 11:10:35 +0000 (17:10 +0600)]
Fix buffer size for memcached stats answer
Typical stats answer has ~1900 bytes length.
$ memcached-tool localhost:11211 stats | wc -c
1863
But buffer for this answer was only 1024 bytes length.
Signed-off-by: Florian Forster <octo@collectd.org>
Andrew Elwell [Sun, 26 Feb 2012 21:32:08 +0000 (22:32 +0100)]
Also check in ip4tc for iptc_init
./configure --enable-iptables was failing on fedora as iptc_init
wasn't found. This patches configure.in to also look in ip4tc
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 25 Feb 2012 17:15:36 +0000 (18:15 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/df.c
Change-Id: Ie7c9fd4a20cc356bb53b135bf2ca2d5162a8a953
Florian Forster [Mon, 19 Apr 2010 11:04:35 +0000 (13:04 +0200)]
contrib/exec-nagios.px: Implement the "NRPEConfig" option.
Florian Forster [Sat, 25 Feb 2012 15:56:35 +0000 (16:56 +0100)]
bind plugin: Fix use of the "QType" types.
This should resolve GitHub issue #21.
Change-Id: I67e4b440a6fbc8a8608fa672fb3320b05f9c0a12
Florian Forster [Sat, 25 Feb 2012 10:42:19 +0000 (11:42 +0100)]
df plugin: Fix a compiler issue with Mac OS X 10.7.
Xcode Version 4.1 (11C74), GitHub issue #24
Change-Id: Ic6f49a95868c7f77bfb19f9c8afc87a97a1bf670
Florian Forster [Sun, 19 Feb 2012 11:51:09 +0000 (12:51 +0100)]
AMQP plugin: Support sub-second sleep intervals.
Change-Id: I9afcd8d17f1251b0765dfbdae5ed8581b73b15fe
Florian Forster [Sun, 19 Feb 2012 11:42:57 +0000 (12:42 +0100)]
AMQP plugin: Fix sleeping of "interval_g seconds".
Since "interval_g" was changed to "cdtime_t", the plugin would sleep 2^30 times
as long as intended. D'oh! Thanks to Xavier for reporting this!
Change-Id: I8e9992307a1fdbb2df799a5359eb6695409684df
Florian Forster [Sun, 19 Feb 2012 10:12:43 +0000 (11:12 +0100)]
Bump version to 5.0.3; Update ChangeLog.
Change-Id: I3c73ac8b3ac73227e20ea32d052f5bea1575e29a
Florian Forster [Sun, 19 Feb 2012 10:11:28 +0000 (11:11 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
version-gen.sh
Change-Id: Id72b28eb1432835ab710d1f551bb886d0638e079
Florian Forster [Sun, 19 Feb 2012 09:58:46 +0000 (10:58 +0100)]
Update ChangeLog.
Change-Id: I41518e6e48c089e79919d1bc65b03744872bcec0
Florian Forster [Fri, 17 Feb 2012 14:09:26 +0000 (15:09 +0100)]
exec plugin: Replace tabs with spaces to fix indentation.
Change-Id: I6e623f237c1d79007bd471732476a4e32dafde97
Gerrie Roos [Tue, 20 Dec 2011 04:30:59 +0000 (06:30 +0200)]
network plugin: Fixed incorrect collectd warning when configuring network plugin.
Cosmetic only
Change-Id: I4c4c8fe19c23e9aa31b35e61eba31aa686429c10
Signed-off-by: Florian Forster <octo@collectd.org>
Gerrie Roos [Tue, 10 Jan 2012 07:00:42 +0000 (09:00 +0200)]
exec plugin: incorrectly exited select loop on signal.
Sometimes dead modules won't be started up correctly or running ones
would not generate stats anymore. Problem manifests more often under
load and on multicore hw
Change-Id: Ifb70a74c0cd55fc421b65a1f4332147916eadb70
Signed-off-by: Florian Forster <octo@collectd.org>
Cyril Feraudet [Tue, 14 Feb 2012 09:47:27 +0000 (10:47 +0100)]
configure.in: Use the `--libs_r' option of mysql-config.
Rather than the `--libs' option.
Change-Id: Idd2a3828f4d154f353c44a4b69aa094acbadcabf
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 5 Feb 2012 13:02:07 +0000 (14:02 +0100)]
Bump version to 4.10.6; Update ChangeLog.
Change-Id: I95bfb6e742ba7ad9e2b9c89dc990cd4bf573dbfa
Florian Forster [Sun, 5 Feb 2012 12:49:45 +0000 (13:49 +0100)]
Build system: Remove superfluous C(PP)FLAG.
Change-Id: Ic2f665869f863b1e0dca9b5ccde2803715386a3c
Florian Forster [Sat, 4 Feb 2012 15:28:02 +0000 (16:28 +0100)]
Build system: Use pkg-config to configure libiptc.
This hopefully fixes Goobuntu Bug #375733.
Change-Id: I0a4215351ce836fb62418cbd40bee27fd695d9da
Florian Forster [Fri, 3 Feb 2012 10:49:04 +0000 (11:49 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Jo-Philipp Wich [Thu, 2 Feb 2012 22:27:45 +0000 (23:27 +0100)]
version-gen.sh: Switch to bash due to bashisms.
Change-Id: I8480afad2d157382fb7e5ff35785e97066c8553c
Florian Forster [Mon, 30 Jan 2012 15:29:13 +0000 (16:29 +0100)]
Revert "interface plugin: Fix for bogus interfaces under Solaris."
This results in problems on aggregated interfaces, amongst other things.
I guess Solaris users will need to use the "IgnoreSelected" option to
get rid of "bogus" interfaces.
This reverts commit
e7a75874a24c1bf19931d5b4b423a0daa7f9be6b.
Florian Forster [Mon, 30 Jan 2012 13:47:04 +0000 (14:47 +0100)]
network plugin: Document the standard buffer size with more detail.
Change-Id: I48e61fc2613ca50c477794167f180e3b4f4fc673
Florian Forster [Sat, 28 Jan 2012 11:26:41 +0000 (12:26 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sat, 28 Jan 2012 11:03:35 +0000 (12:03 +0100)]
Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
Florian Forster [Thu, 26 Jan 2012 21:54:34 +0000 (22:54 +0100)]
Minor doc fixes for the Python plugin.
Change-Id: I233d0ae4ec035c74811ef33aa119573066c9a3f6
Florian Forster [Thu, 26 Jan 2012 13:00:33 +0000 (05:00 -0800)]
Merge pull request #2 from trenkel/collectd-4.10
Even more fun than memory leaks: Memory corruption.
Sven Trenkel [Thu, 26 Jan 2012 11:20:28 +0000 (11:20 +0000)]
python: Fixed crash bug in case the plugin had more than one configuration block.
Florian Forster [Thu, 26 Jan 2012 10:36:03 +0000 (11:36 +0100)]
oracle plugin: Fix use of the OCIErrorGet() function.
Change-Id: I9899b98517fe0c239bffcf7a75681560029aa2ba
Jonathan Nieder [Mon, 9 Jan 2012 18:01:50 +0000 (19:01 +0100)]
common: check_create_dir(): Support symlinks as well.
Previously, the following situation would cause an endless look (as reported
by Michael Prokop in Debian bug #619123): the (CSV or RRD) datadir is a
symlink pointing to a non-existent target.
With this patch applied, check_create_dir() fails with "<file> exists but is
not a directory".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Mon, 9 Jan 2012 10:16:19 +0000 (11:16 +0100)]
build system, ipvs plugin: Check for linux/ip_vs.h as well.
Also, try to find ip_vs.h without using KERNEL_CFLAGS at first. The Linux
kernel headers should not be used directly -- in current kernel versions this
generates warnings leading to build failures because of -Werror.
Florian Forster [Sat, 21 Jan 2012 17:25:37 +0000 (18:25 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Change-Id: I8fea9338ac6490b2a76530a58c6bd36ec17d021a
Florian Forster [Sat, 21 Jan 2012 17:24:45 +0000 (18:24 +0100)]
Update ChangeLog.
Change-Id: I7361ea08e1695b2928463150df36d385aa51299c
Florian Forster [Sat, 21 Jan 2012 17:21:46 +0000 (18:21 +0100)]
oracle plugin: Fix a memory leak.
Parameters must be freed using OCIDescriptorFree. D'oh!
Thanks to Rena Vetterling for helping me hunt down this problem!
Change-Id: Ic374ae13085c8d2afbdf9a3c0ceef92b485e7723
Florian Forster [Sat, 21 Jan 2012 17:01:24 +0000 (18:01 +0100)]
oracle plugin: Improve the error printing function.
Change-Id: Ie52c80bd4a686b403037c97383176adf3e701419
Florian Forster [Sat, 21 Jan 2012 13:01:34 +0000 (14:01 +0100)]
Bump version to 5.0.2; Update ChangeLog.
Change-Id: I8e564e51d9e9f3dc847811fd0d51fbf0079c20ba
Florian Forster [Sat, 21 Jan 2012 12:07:50 +0000 (13:07 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
src/df.c
src/plugin.h
version-gen.sh
Change-Id: Id7a31088cdb3371534d5c1e6a690464f3343543d
Florian Forster [Sat, 21 Jan 2012 12:04:28 +0000 (13:04 +0100)]
Bump version to 4.10.5; Update ChangeLog.
Change-Id: I900278064970e0c2d2bf471f4f80c7672aa8211f
Toni Ylenius [Fri, 6 Jan 2012 16:13:56 +0000 (18:13 +0200)]
df: Set negative free space values to zero.
Some file systems (eg. UFS) may report negative free spave values.
Previously this caused underflow, but now it is prevented by setting
negative values to zero.
Change-Id: I821adb8a6d7a40dcbd6c65ab3541fbcd714f8aba
Conflicts:
src/df.c
Florian Forster [Wed, 23 Nov 2011 13:40:58 +0000 (14:40 +0100)]
network plugin: Use the new plugin_dispatch_values_secure().
Change-Id: I2cc65a36366c6c714cd79c2905879bce313efe31
Florian Forster [Wed, 23 Nov 2011 13:28:27 +0000 (14:28 +0100)]
src/plugin.[ch]: Add plugin_dispatch_values_secure().
Change-Id: I1f7403b2e82edd099f0168d0a0735cd18f8ce05a
Florian Forster [Wed, 23 Nov 2011 13:28:01 +0000 (14:28 +0100)]
src/meta_data.[ch]: Add meta_data_clone().
Change-Id: I8449e27c908cbe75ea4ea3b8dd4df556f9aec9e7
Florian Forster [Sat, 21 Jan 2012 10:14:53 +0000 (11:14 +0100)]
Merge "Fix case when availrmem < freemem" into collectd-4.10
Fabien Wernli [Fri, 9 Dec 2011 15:30:30 +0000 (16:30 +0100)]
Fix case when availrmem < freemem
Change-Id: I03b188afeb2357e7b8c426bd0c6daff06fda2c4f
Conflicts:
src/memory.c
Florian Forster [Wed, 18 Jan 2012 11:01:04 +0000 (03:01 -0800)]
Merge pull request #13 from insom/improved-migration
Migration: Ensure destination directories exist when moving RRDs
Sven Trenkel [Tue, 17 Jan 2012 01:56:03 +0000 (01:56 +0000)]
python: Fixed memory leaks during dispatch.
Aaron Brady [Sun, 15 Jan 2012 13:16:37 +0000 (13:16 +0000)]
Migration: Ensure destination directories exist when moving RRDs
If you have not run collectd 5 before, then when type instances
are migrated to plugin instances the destination directories
may not already exist. For example:
mv "./test/df/df-mnt-dlna.rrd" "./test/df-mnt-dlna/df.rrd"
This one-liner does a mkdir -p of the destination before
attempting to move the file.
Florian Forster [Mon, 19 Dec 2011 14:17:39 +0000 (15:17 +0100)]
src/common.c: parse_value: Be more verbose about parsing problems.
Change-Id: I784ec4ee9a1e89a82fdc9da54ed1fafd3d9c3e57
Florian Forster [Wed, 14 Dec 2011 12:02:16 +0000 (13:02 +0100)]
collectd-perl(5): Fix example Perl script.
Thanks to Sergey for catching this!
Change-Id: I4bbb609079734cd54d68f77681ea742b4eb83239
Fabien Wernli [Tue, 25 Oct 2011 13:15:16 +0000 (15:15 +0200)]
This improves solaris memory plugin granularity.
Locked memory is now only tracking non-kernel locked memory.
We add kernel and unusable memory.
Source: http://www.brendangregg.com/K9Toolkit/swapinfo
Change-Id: I4f4d281e991068dc845d8c3615d285fc2a3296c8
Fabien Wernli [Thu, 27 Oct 2011 15:14:06 +0000 (17:14 +0200)]
use 64bit counters if available
Florian Forster [Fri, 25 Nov 2011 09:48:22 +0000 (10:48 +0100)]
Merge "Fix file:// not working as return code is 0 and not 200, as fixed beforehand in curl_json. Remove mention of http in documention as file also works now (and ftp most likely too)" into collectd-4.10
Fabien Wernli [Fri, 4 Nov 2011 10:25:59 +0000 (11:25 +0100)]
Fix file:// not working as return code is 0 and not 200, as fixed
beforehand in curl_json.
Remove mention of http in documention as file also works now (and ftp most likely too)
Change-Id: Iccb35e6b8c831f555dc5bbd17fa8d04672e13eb3
Florian Forster [Thu, 24 Nov 2011 14:43:21 +0000 (15:43 +0100)]
Merge "interface plugin: Fix for bogus interfaces under Solaris." into collectd-4.10
Florian Forster [Fri, 14 Oct 2011 20:42:26 +0000 (22:42 +0200)]
ChangeLog: Remove blank line.
Change-Id: Ief9cabb148d75b79e0764d629c571ee9dc3d7d3b
Florian Forster [Fri, 14 Oct 2011 20:42:09 +0000 (22:42 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2
Florian Forster [Fri, 14 Oct 2011 20:41:21 +0000 (22:41 +0200)]
ChangeLog: Add thanks to Peter Green.
Change-Id: Ie392f7dfc7d637c92e286b0bf6d5d32877f70f76
Florian Forster [Fri, 7 Oct 2011 15:36:10 +0000 (17:36 +0200)]
Bump version to 5.0.1; Update ChangeLog.
Change-Id: I01466d5fb5c0d5c08a48d7c7e7a81239960a2d3c
Florian Forster [Fri, 7 Oct 2011 15:27:06 +0000 (17:27 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
src/collectd.conf.in
src/curl_json.c
version-gen.sh
Change-Id: I313c0d3c73d47481baa0a3b38bcdf508f1d4f8d8
Florian Forster [Fri, 7 Oct 2011 15:21:57 +0000 (17:21 +0200)]
Bump version to 4.10.4; Update ChangeLog.
Change-Id: Ie23cf45f929c52e94e968c7129d24aca7a287dd5
Eddy Geez [Sat, 3 Sep 2011 13:10:21 +0000 (09:10 -0400)]
interface plugin: Fix for bogus interfaces under Solaris.
Under newer versions of Solaris, the method for finding network interfaces
results in 'collectd' gathering statistics on an interface called 'mac', along
with 16 interfaces named 'wrsmd0' through 'wrsmd15' (which are for WCI Remote
Shared Memory). The 'mac' interface is especially problematic because it
occurs multiple times, which results in warnings from rrdtool about insertions
with the same timestamp.
Change-Id: I1ae070ecbc820da25c0f0ad457aba80213339fd2
Signed-off-by: Florian Forster <octo@collectd.org>