Code

collectd.git
13 years agocurl_json plugin: Be more clever building the type instance.
Florian Forster [Sat, 27 Aug 2011 19:29:42 +0000 (15:29 -0400)]
curl_json plugin: Be more clever building the type instance.

When the key of the parent object is empty, don't use it. The previous code led
to type instances starting with a dash, e.g. "-foo".

Also, be more verbose when unable to resolve types.

Change-Id: Ib5f55efe1acc1e819ac3189b6780a4e998bf9c9f

13 years agoMerge "fix xff excessive rounding" into collectd-4.10
Florian Forster [Fri, 26 Aug 2011 12:37:25 +0000 (14:37 +0200)]
Merge "fix xff excessive rounding" into collectd-4.10

13 years ago.gitignore: Added collectdctl.
Sebastian Harl [Thu, 12 Aug 2010 20:12:47 +0000 (22:12 +0200)]
.gitignore: Added collectdctl.

13 years agosrc/plugin.c: add info to 'Invalid value list' error message
Xavier Mehrenberger [Sat, 11 Jun 2011 21:01:57 +0000 (23:01 +0200)]
src/plugin.c: add info to 'Invalid value list' error message

Signed-off-by: Florian Forster <octo@collectd.org>
13 years agocollectd_unixsock.py: Fix infinite wait.
Peter Warasin [Mon, 27 Jun 2011 18:10:51 +0000 (20:10 +0200)]
collectd_unixsock.py: Fix infinite wait.

raise a KeyError if getval() or getthreshold() unixsock returns replies an
error because of request of an unknown identifier

Signed-off-by: Florian Forster <octo@collectd.org>
13 years agoconfigure: Link with ip4tc and ip6tc, too.
Florian Forster [Sun, 21 Aug 2011 14:40:23 +0000 (16:40 +0200)]
configure: Link with ip4tc and ip6tc, too.

This solves this problem:

octo@leeloo:/tmp $ gcc -o conftest -g -O2     conftest.c -liptc -ldl
/usr/bin/ld: /tmp/ccuJEDqP.o: undefined reference to symbol 'iptc_init'
/usr/bin/ld: note: 'iptc_init' is defined in DSO /lib64/libip4tc.so.0 so try adding it to the linker command line
/lib64/libip4tc.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

Why the iptables plugin compiles without this is beyond me.

Change-Id: If615bee0c9524d907ca1834d5c337ed50c625c5b

13 years agofix xff excessive rounding
Francois-Xavier Bourlet [Sun, 21 Aug 2011 09:05:40 +0000 (11:05 +0200)]
fix xff excessive rounding

Hi,

When generating arguments for rrd_create, the previous
format string "%.1f", was rounding up the value too aggressively.

ex: for xff==0.9999 the result would be -> 1.0 (invalid value for xff!)

The new format string is "%.10f", which lead up to 10 digits after the
dot, enough to be close to the double type limit, and so handling
correctly the previous example.

Change-Id: I7c6cc55b0d43beb5ef351bb04b67f4628249c737

13 years agoconfigure.in: Add AC_CONFIG_AUX_DIR for libltdl.
Florian Forster [Tue, 16 Aug 2011 06:51:59 +0000 (08:51 +0200)]
configure.in: Add AC_CONFIG_AUX_DIR for libltdl.

13 years agomysql plugin: Remove sideeffect-free function call.
Florian Forster [Tue, 16 Aug 2011 06:51:21 +0000 (08:51 +0200)]
mysql plugin: Remove sideeffect-free function call.

13 years agonotify_email plugin: Remove useless function and fix indentation.
Florian Forster [Tue, 16 Aug 2011 06:50:40 +0000 (08:50 +0200)]
notify_email plugin: Remove useless function and fix indentation.

13 years agoMany build fixes that turned up with GCC 4.6.
Peter Green [Tue, 16 Aug 2011 06:48:52 +0000 (08:48 +0200)]
Many build fixes that turned up with GCC 4.6.

Signed-off-by: Florian Forster <octo@collectd.org>
13 years agosrc/csv.c: use a bigger buffer
Colin Patrick McCabe [Wed, 27 Jul 2011 17:00:30 +0000 (10:00 -0700)]
src/csv.c: use a bigger buffer

The CSV plugin formerly used a relatively small output buffer. If you
had a large dataset, you would always get error -1 because the line
length was be too long. This patch extends the buffer.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agocurl_json plugin: Add compatibility code for libyajl v2.
Florian Forster [Tue, 5 Jul 2011 14:28:10 +0000 (16:28 +0200)]
curl_json plugin: Add compatibility code for libyajl v2.

Thanks to "spupykin" of the Arch Linux project on whose patch this commit is
loosely based.

13 years agoVarious plugins: Set the cURL option "CURLOPT_NOSIGNAL".
Mike Flisher [Sun, 22 May 2011 15:39:29 +0000 (17:39 +0200)]
Various plugins: Set the cURL option "CURLOPT_NOSIGNAL".

This fixes problems with version 7.21.2 (and later) of libcurl that are due to
collectd being a multi-threaded program.

Signed-off-by: Florian Forster <octo@collectd.org>
13 years agosrc/meta_data.c: Free a leaking mutex.
Rafal Lesniak [Fri, 13 May 2011 15:15:54 +0000 (17:15 +0200)]
src/meta_data.c: Free a leaking mutex.

This problem primarily manifested on FreeBSD but may well effect other
systems as well.

Thanks to Tomas Krasnican for reporting this problem.

Signed-off-by: Florian Forster <octo@collectd.org>
13 years agodf plugin: Improve error message.
Florian Forster [Mon, 9 May 2011 21:36:17 +0000 (23:36 +0200)]
df plugin: Improve error message.

13 years agonotify_desktop plugin: Add compatibility code for libnotify 0.7.
Samuli Suominen [Mon, 28 Mar 2011 00:16:33 +0000 (02:16 +0200)]
notify_desktop plugin: Add compatibility code for libnotify 0.7.

The current code in src/notify_desktop.c is not compatible with the new
libnotify 0.7 API

This:

  notification = notify_notification_new (summary, n->message, NULL, NULL);

Should now be:

  notification = notify_notification_new (summary, n->message, NULL;

As in, one argument less for notify_notification_new.

But we can't just remove it or it'll break compability with libnotify
0.4.x and 0.5.x.

This piece of code sets dummy NOTIFY_CHECK_VERSION for libnotify-0.4.x,
because NOTIFY_CHECK_VERSION was added only in 0.5.x:

  #ifndef NOTIFY_CHECK_VERSION
  #define NOTIFY_CHECK_VERSION(x,y,z) 0
  #endif

Then we can freely use NOTIFY_CHECK_VERSION, and it will work with all
of 0.4, 0.5 and 0.7 series:

  #if NOTIFY_CHECK_VERSION (0, 7, 0)
  do something cool
  #endif

I'm attaching the working patch.  It's been tested with all of the
mentioned versions, as well as it's in active use at Gentoo Linux.

Thanks, Samuli

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agoBump version to 4.10.3; Update ChangeLog. collectd-4.10.3
Florian Forster [Sat, 26 Mar 2011 16:00:17 +0000 (09:00 -0700)]
Bump version to 4.10.3; Update ChangeLog.

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Sat, 26 Mar 2011 15:53:22 +0000 (08:53 -0700)]
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
ChangeLog
version-gen.sh

13 years agoBump version to 4.9.5; Update ChangeLog. collectd-4.9.5
Florian Forster [Fri, 25 Mar 2011 15:39:17 +0000 (08:39 -0700)]
Bump version to 4.9.5; Update ChangeLog.

13 years agolibvirt plugin: Correctly check the status code of virDomainGetVcpus().
Florian Forster [Sat, 19 Mar 2011 14:43:41 +0000 (15:43 +0100)]
libvirt plugin: Correctly check the status code of virDomainGetVcpus().

The status code is less than zero on failure and the number of vCPUs
otherwise. Thanks to "JLPC" for pointing this problem out.

13 years agoFix compilation error with plugin_register_shutdown
Bruno Prémont [Fri, 18 Mar 2011 07:24:40 +0000 (08:24 +0100)]
Fix compilation error with plugin_register_shutdown

Compiling collectd-4.10.2 on an OpenSuSE 11.3 system causes the
following error:
  snmp.c: In function ‘module_register’:
  snmp.c:1620:3: error: passing argument 1 of ‘plugin_register_shutdown’ discards qualifiers from pointer target type
  plugin.h:275:5: note: expected ‘char *’ but argument is of type ‘const char *’

Convert plugin_register_shutdown's name argument from 'char *' to
'const char *' in order to match the other plugin_register_*
functions.

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Mon, 14 Mar 2011 19:06:53 +0000 (20:06 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10

13 years agodispatch proper values in Python write plugin
Gregory Szorc [Sat, 5 Mar 2011 06:25:45 +0000 (22:25 -0800)]
dispatch proper values in Python write plugin

Fixes the Python write callback so the appropriate value is dispatched to
Python. Previously, the code only looked at the first element of a data set
to determine which value type (GAUGE, COUNTER, etc) to dispatch. If your data
set consisted of multiple values of different types, then the Python write
plugin was receiving bad values for the elements at position n > 0 whose type
was not the same as that at position 0.

13 years agoprocesses plugin: Call kvm_close() after kvm_geterr().
Florian Forster [Tue, 8 Mar 2011 08:36:13 +0000 (09:36 +0100)]
processes plugin: Call kvm_close() after kvm_geterr().

13 years agocollectd.conf(5): Mention MySQL privileges required for repl stats.
Sebastian Harl [Tue, 22 Feb 2011 09:17:46 +0000 (10:17 +0100)]
collectd.conf(5): Mention MySQL privileges required for repl stats.

13 years agocollectd.conf(5): Be more verbose about how to access a notification daemon.
Sebastian Harl [Tue, 7 Sep 2010 20:03:54 +0000 (22:03 +0200)]
collectd.conf(5): Be more verbose about how to access a notification daemon.

13 years agofilter_chain: Use a complaint to report plugin_write()'s ENOENT error.
Sebastian Harl [Tue, 7 Sep 2010 19:45:44 +0000 (21:45 +0200)]
filter_chain: Use a complaint to report plugin_write()'s ENOENT error.

In most cases this is a permanent error, so using the complain mechanism
avoids spamming the logs.

13 years agosrc/plugin.c: Print a more verbose error message if lt_dlopen() fails.
Florian Forster [Wed, 9 Feb 2011 06:28:03 +0000 (07:28 +0100)]
src/plugin.c: Print a more verbose error message if lt_dlopen() fails.

Since the Debian package doesn't depend on the libraries used by the
collectd plugins, some plugins may fail to load. ltdl reports this with
the very confusing error message "file not found". Since the plugin is
in fact available, many users don't realize a dependency is missing and
assume collectd is looking in the wrong directory -- and they are hardly
to blame for this.

This commit introduces a lengthy error message which hopefully points
users into the right direction.

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Mon, 7 Feb 2011 07:47:18 +0000 (08:47 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10

13 years agoexec plugin: Remove useless preprocessor stuff.
Florian Forster [Mon, 7 Feb 2011 07:31:37 +0000 (08:31 +0100)]
exec plugin: Remove useless preprocessor stuff.

13 years agontpd plugin: Report failures of "ntpd_do_query" as *errors*, not debug messages.
Florian Forster [Fri, 28 Jan 2011 08:18:16 +0000 (09:18 +0100)]
ntpd plugin: Report failures of "ntpd_do_query" as *errors*, not debug messages.

13 years agosrc/utils_threshold.c: Fix creation of percentage notifications.
Florian Forster [Thu, 13 Jan 2011 07:57:24 +0000 (08:57 +0100)]
src/utils_threshold.c: Fix creation of percentage notifications.

Joey Hess has reported a problem when creating notifications from
percentage thresholds. Because the (percentage) minimum value is
compared to the (raw) DS value, the following message is possible:

  Message: Host XXX, plugin df type df (instance root): Data source
  "free" is currently 1773072384.000000. That is above the warning
  threshold of nan%.

A new section will handle this case correctly. In the inverted case, the
problem should not exist.

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10

13 years agodns plugin: Include <pcap-bpf.h> if available.
Florian Forster [Tue, 4 Jan 2011 11:39:22 +0000 (12:39 +0100)]
dns plugin: Include <pcap-bpf.h> if available.

13 years agojava plugin: Improve an error message.
Florian Forster [Thu, 30 Dec 2010 07:10:15 +0000 (08:10 +0100)]
java plugin: Improve an error message.

13 years agoREADME: Document the version of libmodbus used and update URL.
Florian Forster [Thu, 16 Dec 2010 00:26:50 +0000 (01:26 +0100)]
README: Document the version of libmodbus used and update URL.

13 years agomodbus plugin: Restore compatibility to libmodbus 2.0.3.
Florian Forster [Wed, 15 Dec 2010 14:56:14 +0000 (15:56 +0100)]
modbus plugin: Restore compatibility to libmodbus 2.0.3.

This is the current "stable" version.

13 years agocurl_json plugin: Fix handling of arrays.
Florian Forster [Mon, 13 Dec 2010 08:45:44 +0000 (09:45 +0100)]
curl_json plugin: Fix handling of arrays.

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Mon, 6 Dec 2010 08:31:15 +0000 (09:31 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10

13 years agosrc/common.c: parse_value: Fix assignment of derive and absolute values.
Florian Forster [Sun, 5 Dec 2010 11:05:18 +0000 (12:05 +0100)]
src/common.c: parse_value: Fix assignment of derive and absolute values.

13 years agoconfigure.in: Fix a typo in an AC_ARG_WITH description.
Florian Forster [Sat, 4 Dec 2010 08:30:47 +0000 (09:30 +0100)]
configure.in: Fix a typo in an AC_ARG_WITH description.

13 years agoChangeLog: Add missing line (copynpaste error).
Florian Forster [Sun, 28 Nov 2010 07:36:39 +0000 (08:36 +0100)]
ChangeLog: Add missing line (copynpaste error).

13 years agoBump version to 4.10.2; Update ChangeLog. collectd-4.10.2
Florian Forster [Sat, 27 Nov 2010 10:03:34 +0000 (11:03 +0100)]
Bump version to 4.10.2; Update ChangeLog.

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Sat, 27 Nov 2010 10:00:29 +0000 (11:00 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh

13 years agoBump version to 4.9.4; Update ChangeLog. collectd-4.9.4
Florian Forster [Sat, 27 Nov 2010 09:55:47 +0000 (10:55 +0100)]
Bump version to 4.9.4; Update ChangeLog.

14 years agoMerge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Florian Forster [Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)]
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9

14 years agonetapp: Fixed incompatible changes between NetApp Release 7.2 and 7.3 that prevented...
Sven Trenkel [Thu, 25 Nov 2010 09:56:30 +0000 (10:56 +0100)]
netapp: Fixed incompatible changes between NetApp Release 7.2 and 7.3 that prevented collecting SIS data

14 years agoswap plugin: Fix a bug collecting swap I/O.
Florian Forster [Tue, 23 Nov 2010 17:45:49 +0000 (18:45 +0100)]
swap plugin: Fix a bug collecting swap I/O.

14 years agoMerge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Florian Forster [Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)]
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9

14 years agoFixed RedHat init script to shut down collectd on reboot/halt.
Sven Trenkel [Tue, 16 Nov 2010 11:11:45 +0000 (12:11 +0100)]
Fixed RedHat init script to shut down collectd on reboot/halt.

14 years agocollectd.conf(5): Document the dangers of messing with the interval setting.
Florian Forster [Sun, 14 Nov 2010 09:52:13 +0000 (10:52 +0100)]
collectd.conf(5): Document the dangers of messing with the interval setting.

14 years agoprocesses plugin: Don't complain about a failed open(/proc/$PID/cmdline)
Florian Forster [Fri, 12 Nov 2010 07:13:42 +0000 (08:13 +0100)]
processes plugin: Don't complain about a failed open(/proc/$PID/cmdline)

... if the error is ENOENT. This merely means we were too slow and that
we can safely ignore the process.

14 years agosrc/utils_rrdcreate.c: Remove a too strict assertion.
Florian Forster [Thu, 11 Nov 2010 13:20:58 +0000 (14:20 +0100)]
src/utils_rrdcreate.c: Remove a too strict assertion.

We don't actually check anywhere that vl->time is greater than 10, so we
cannot assure this.

14 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
src/collectd.conf.in
src/python.c

14 years agoREADME: Add libperfstat as an optional dependency.
Florian Forster [Sat, 6 Nov 2010 08:58:57 +0000 (09:58 +0100)]
README: Add libperfstat as an optional dependency.

14 years agonetapp plugin: Fixed a bug that prevented the configured interval to be passed on...
Sven Trenkel [Mon, 11 Oct 2010 11:35:39 +0000 (13:35 +0200)]
netapp plugin: Fixed a bug that prevented the configured interval to be passed on to the dispatch function.

14 years agoMerge remote branch 'trenkel/collectd-4.10' into collectd-4.10
Florian Forster [Wed, 6 Oct 2010 08:11:10 +0000 (10:11 +0200)]
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10

14 years agoFixed epic documentation fail. Python3 and meta-data support was added with 4.10...
Sven Trenkel [Mon, 4 Oct 2010 23:26:22 +0000 (01:26 +0200)]
Fixed epic documentation fail. Python3 and meta-data support was added with 4.10 but is still listed as missing.

14 years agoAdd sys.argv. Not too many programs consider the possibility that it might not exist...
Sven Trenkel [Fri, 1 Oct 2010 00:41:38 +0000 (02:41 +0200)]
Add sys.argv. Not too many programs consider the possibility that it might not exist resulting in unhandled exceptions.

14 years agoFixed possible memory leak in case of broken match_value configs.
Sven Trenkel [Thu, 30 Sep 2010 10:59:21 +0000 (12:59 +0200)]
Fixed possible memory leak in case of broken match_value configs.

14 years agosrc/types.db: Remove unused type "pinba_view".
Florian Forster [Thu, 30 Sep 2010 07:23:22 +0000 (09:23 +0200)]
src/types.db: Remove unused type "pinba_view".

14 years agosrc/utils_cache.c: Replace a left-over hard-coded default of "2" with "timeout_g".
Florian Forster [Wed, 29 Sep 2010 15:56:58 +0000 (17:56 +0200)]
src/utils_cache.c: Replace a left-over hard-coded default of "2" with "timeout_g".

14 years agocurl_json plugin: Restore struct when handling error.
Florian Forster [Fri, 24 Sep 2010 09:52:52 +0000 (11:52 +0200)]
curl_json plugin: Restore struct when handling error.

14 years agosrc/collectd.h: Do not include <sensors/sensors.h> here.
Florian Forster [Wed, 15 Sep 2010 15:21:40 +0000 (17:21 +0200)]
src/collectd.h: Do not include <sensors/sensors.h> here.

14 years agoFix errno thread-safety under AIX
Aurelien Reynaud [Sat, 19 Jun 2010 18:03:52 +0000 (20:03 +0200)]
Fix errno thread-safety under AIX

Unlike Linux or Solaris, errno under AIX is not thread-safe by
default.

This patch sets _THREAD_SAFE_ERRNO when AIX is detected in order to
force the thread-safe implementation of errno. Without this, calls
like stat() in the rrdtool plugin fail with errno incorrectly set,
leading to the inability to create previously absent rrd files.

Maybe _THREAD_SAFE should be set instead, to prevent other possible
threads-related problems, but this is enough to scratch my current
itch...

Here is the relevant part of /usr/include/errno.h on AIX:

 #if defined(_THREAD_SAFE) || defined(_THREAD_SAFE_ERRNO)
 /*
  * Per thread errno is provided by the threads provider. Both the extern
  * int
  * and the per thread value must be maintained by the threads library.
  */
 extern  int     *_Errno( void );
 #define errno   (*_Errno())

 #else

 extern int errno;

 #endif  /* _THREAD_SAFE || _THREAD_SAFE_ERRNO */

Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agocollection3: Add graph for "ps_disk_octets".
Florian Forster [Sun, 5 Sep 2010 08:12:02 +0000 (10:12 +0200)]
collection3: Add graph for "ps_disk_octets".

14 years agonotify_email plugin: Check for "session == NULL" and return gracefully.
Florian Forster [Sun, 5 Sep 2010 07:42:40 +0000 (09:42 +0200)]
notify_email plugin: Check for "session == NULL" and return gracefully.

I don't know how libesmtp handles NULL pointers and I don't want to take
my chances.

14 years agonotify_email plugin: Serialize all accesses to libesmtp using a mutex.
Florian Forster [Sun, 5 Sep 2010 07:36:55 +0000 (09:36 +0200)]
notify_email plugin: Serialize all accesses to libesmtp using a mutex.

14 years agocollection3: fix multiple hosts selection issue
Jerome Oufella [Wed, 1 Sep 2010 18:35:58 +0000 (14:35 -0400)]
collection3: fix multiple hosts selection issue

When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).

This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.

Comments and enhancements will be welcome.

Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agonetwork plugin: Use the complain mechanism to inform the user about ignored signatures.
Florian Forster [Wed, 1 Sep 2010 18:36:40 +0000 (20:36 +0200)]
network plugin: Use the complain mechanism to inform the user about ignored signatures.

14 years agosrc/utils_tail: Remove newline characters at the end of a line.
Sebastian Harl [Mon, 23 Aug 2010 17:02:06 +0000 (19:02 +0200)]
src/utils_tail: Remove newline characters at the end of a line.

The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.

Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.

14 years agoutils_match: Let '^' and '$' affect lines rather than the full string.
Sebastian Harl [Mon, 23 Aug 2010 16:56:02 +0000 (18:56 +0200)]
utils_match: Let '^' and '$' affect lines rather than the full string.

The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.

14 years agosrc/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.
Florian Forster [Fri, 20 Aug 2010 06:22:00 +0000 (08:22 +0200)]
src/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.

Thanks to Renaud Chaput for pointing this out!

14 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Thu, 19 Aug 2010 13:02:41 +0000 (15:02 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10

14 years agosrc/utils_heap.c: Fix calculation of the parent's index.
Florian Forster [Thu, 19 Aug 2010 13:00:26 +0000 (15:00 +0200)]
src/utils_heap.c: Fix calculation of the parent's index.

This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.

14 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Tue, 17 Aug 2010 16:53:29 +0000 (18:53 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10

14 years agosrc/plugin.c: Improve an info message.
Florian Forster [Tue, 17 Aug 2010 16:52:36 +0000 (18:52 +0200)]
src/plugin.c: Improve an info message.

Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.

14 years agocollectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.
Florian Forster [Tue, 17 Aug 2010 06:07:35 +0000 (08:07 +0200)]
collectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.

14 years agosrc/utils_match.c: Use strtoull(3) for counter and absolute data sources.
Florian Forster [Tue, 17 Aug 2010 06:05:38 +0000 (08:05 +0200)]
src/utils_match.c: Use strtoull(3) for counter and absolute data sources.

14 years agosrc/utils_match.h: Fix a bug preventing derive values from being handled correctly.
Florian Forster [Mon, 16 Aug 2010 08:32:27 +0000 (10:32 +0200)]
src/utils_match.h: Fix a bug preventing derive values from being handled correctly.

Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.

14 years agosrc/configfile.c: Continue parsing config files if stat'ing one file fails.
Florian Forster [Fri, 13 Aug 2010 21:15:48 +0000 (23:15 +0200)]
src/configfile.c: Continue parsing config files if stat'ing one file fails.

14 years agocurl json: Fix checking the response code.
Florian Forster [Sun, 8 Aug 2010 08:59:15 +0000 (10:59 +0200)]
curl json: Fix checking the response code.

14 years agoFix incorrect error logging.
Garret Heaton [Tue, 20 Jul 2010 01:56:31 +0000 (18:56 -0700)]
Fix incorrect error logging.

Was calling sys.stderror instead of sys.stderr.

14 years agocurl_json plugin: Use a more descriptive define as return value.
Florian Forster [Wed, 4 Aug 2010 12:40:04 +0000 (14:40 +0200)]
curl_json plugin: Use a more descriptive define as return value.

14 years agocollectd-perl(5): Mention that "Globals" should be enabled.
Sebastian Harl [Wed, 28 Jul 2010 20:42:48 +0000 (22:42 +0200)]
collectd-perl(5): Mention that "Globals" should be enabled.

14 years agocollectd.conf(5): Documents LoadPlugin's "Globals" option.
Sebastian Harl [Wed, 28 Jul 2010 20:42:23 +0000 (22:42 +0200)]
collectd.conf(5): Documents LoadPlugin's "Globals" option.

14 years agocurl_json plugin: Use the "number" callback of libyajl.
Florian Forster [Tue, 13 Jul 2010 11:58:34 +0000 (13:58 +0200)]
curl_json plugin: Use the "number" callback of libyajl.

The "integer" callback only works with "long"s, which are 32bit on
x86 and other 32bit architectures. The "number" callback gets the raw
string for us to parse ourselves – honoring the data source type in the
process.

The "integer" and "double" callbacks have been removed, since they are not
used if the "number" callback is present.

14 years agoBumped version to 4.10.1; Updated ChangeLog. collectd-4.10.1
Florian Forster [Fri, 9 Jul 2010 10:01:28 +0000 (12:01 +0200)]
Bumped version to 4.10.1; Updated ChangeLog.

14 years agoswap plugin: Multiply swap sizes by 1024.
Florian Forster [Fri, 9 Jul 2010 09:58:28 +0000 (11:58 +0200)]
swap plugin: Multiply swap sizes by 1024.

This fixes a regression introduced in 6a3935d.

14 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Fri, 9 Jul 2010 09:49:31 +0000 (11:49 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
ChangeLog
version-gen.sh

14 years agoChangeLog: Fix the release date for 4.9.3. collectd-4.9.3
Florian Forster [Fri, 9 Jul 2010 09:47:07 +0000 (11:47 +0200)]
ChangeLog: Fix the release date for 4.9.3.

14 years agoBumped version to 4.9.3; Updated ChangeLog.
Florian Forster [Fri, 9 Jul 2010 09:39:08 +0000 (11:39 +0200)]
Bumped version to 4.9.3; Updated ChangeLog.

14 years agosrc/plugin.c: Check "read_loop" when returning from "pthread_cond_timedwait".
Florian Forster [Tue, 6 Jul 2010 11:00:32 +0000 (13:00 +0200)]
src/plugin.c: Check "read_loop" when returning from "pthread_cond_timedwait".

Otherwise it may take up to $Interval seconds until all read threads
shut down. This bug was introduced in version 4.8.4 (commit dbe1a7d).

14 years agoRemove usage of obsoleted XSI extensions wrt. the "test" command.
Florian Forster [Mon, 28 Jun 2010 15:52:19 +0000 (17:52 +0200)]
Remove usage of obsoleted XSI extensions wrt. the "test" command.

14 years agoFix usage of Solaris /usr/bin/echo
Alexander Wuerstlein [Mon, 28 Jun 2010 07:57:02 +0000 (09:57 +0200)]
Fix usage of Solaris /usr/bin/echo

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agodf plugin: Remove the complaint code again.
Florian Forster [Mon, 28 Jun 2010 08:01:39 +0000 (10:01 +0200)]
df plugin: Remove the complaint code again.

Calls to the plugin are delayed when an error is returned anyway, so it's
better to have an error message in addition to the "has failed, will suspend"
message generated in src/plugin.c.

14 years agodf plugin: Report an error if "cu_mount_getlist" fails.
Florian Forster [Mon, 28 Jun 2010 07:25:58 +0000 (09:25 +0200)]
df plugin: Report an error if "cu_mount_getlist" fails.

14 years agocollection3: df_complex graph: Add "reserved" space.
Florian Forster [Thu, 24 Jun 2010 14:08:43 +0000 (16:08 +0200)]
collection3: df_complex graph: Add "reserved" space.

14 years agocollection3: Add Windows data sources to the "memory" graph.
Florian Forster [Thu, 24 Jun 2010 14:05:53 +0000 (16:05 +0200)]
collection3: Add Windows data sources to the "memory" graph.