Code

collectd.git
14 years agosrc/Makefile: Support parallel builds when creating the manpages. sh/collectd-4.6
Sebastian Harl [Wed, 28 Oct 2009 18:32:36 +0000 (19:32 +0100)]
src/Makefile: Support parallel builds when creating the manpages.

A temporary file name is used when creating the manpages. So far, a static
file name had been used for that, thus causing race conditions. Now, a unique
suffix (PID) is used to fix that.

Thanks to BC^bd for reporting that on IRC!

14 years agorrdcached plugin: Work around a bug in RRDtool 1.4rc2.
Sebastian Harl [Wed, 28 Oct 2009 16:38:51 +0000 (17:38 +0100)]
rrdcached plugin: Work around a bug in RRDtool 1.4rc2.

rrd_client.h in that pre-release checked for HAVE_CONFIG_H and would then try
to include rrd_config.h, which, obviously, is not available in collectd.

14 years agoBump version to 4.6.5. collectd-4.6.5
Florian Forster [Thu, 10 Sep 2009 18:19:24 +0000 (20:19 +0200)]
Bump version to 4.6.5.

14 years agocollection3: Added some more metrics.
Florian Forster [Wed, 26 Aug 2009 13:09:47 +0000 (15:09 +0200)]
collection3: Added some more metrics.

14 years agoFixed the year of the first three entries.
Florian Forster [Wed, 9 Sep 2009 16:37:25 +0000 (18:37 +0200)]
Fixed the year of the first three entries.

They say it was 2004, but in fact they were released in 2005.

14 years agoChangeLog: Add entries for release 4.6.5.
Florian Forster [Wed, 9 Sep 2009 16:36:45 +0000 (18:36 +0200)]
ChangeLog: Add entries for release 4.6.5.

14 years agopowerdns plugin: Use the “ipt_packets” type rather than “io_packets”.
Florian Forster [Tue, 8 Sep 2009 15:45:56 +0000 (17:45 +0200)]
powerdns plugin: Use the “ipt_packets” type rather than “io_packets”.

“io_packets”, as the name suggests, requires incoming *and* outgoing
packets. The infrastructure of the powerdns plugin uses only value lists
with one data source though.

Thanks to Luke for noticing!

14 years agocontrib/collectd_unix_sock.rb: Ruby class which abstracts the plain text protocol.
Duncan Mac-Vicar P [Sun, 6 Sep 2009 15:22:37 +0000 (17:22 +0200)]
contrib/collectd_unix_sock.rb: Ruby class which abstracts the plain text protocol.

Used to talk to the unixsock plugin.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agoiptables plugin: Support the new libiptc API.
Sebastian Harl [Sun, 6 Sep 2009 12:14:55 +0000 (12:14 +0000)]
iptables plugin: Support the new libiptc API.

When libiptc has been officially made available as a shared library, the API
and ABI have been changed slightly. By checking for the existance of a type
that has been removed in that course, configure now checks which version is
available. This is quite error prone (the type might be re-introduced any
time), so this should be improved some time - currently, I do not have an idea
how to do so, though :-/

14 years agoconfigure: Replaced src/libiptc/ with src/owniptc/.
Sebastian Harl [Sun, 6 Sep 2009 10:36:10 +0000 (10:36 +0000)]
configure: Replaced src/libiptc/ with src/owniptc/.

14 years agosrc/owniptc: Moved the “src/libiptc” directory to “src/owniptc” to avoid build issues.
Florian Forster [Sun, 6 Sep 2009 10:06:12 +0000 (12:06 +0200)]
src/owniptc: Moved the “src/libiptc” directory to “src/owniptc” to avoid build issues.

If there is a system-wide version of this library available, the “-I.”
argument (added automatically by automake :() will lead to the shipped
header files being used. Later, the binary is linked with the
system-wide library, which leads to severe problems when API/ABI
incompatibilities have been introduced in other versions.

14 years agocontrib/collection3: Allow numbers in type names.
Anthony Dewhurst [Sun, 30 Aug 2009 21:32:55 +0000 (22:32 +0100)]
contrib/collection3: Allow numbers in type names.

When converting the on-disk type name to the displayed name,
do not strip numbers out.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agocontrib/collection3: GenericStacked: Use stacking by default.
Florian Forster [Mon, 31 Aug 2009 15:16:40 +0000 (17:16 +0200)]
contrib/collection3: GenericStacked: Use stacking by default.

14 years agocontrib/collection3: Option to turn stacking off in GenericStacking
Anthony Dewhurst [Sun, 2 Aug 2009 22:25:45 +0000 (23:25 +0100)]
contrib/collection3: Option to turn stacking off in GenericStacking

CDEFs are not stacked and AREAs are not added when "Stacking" is set to off.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agocontrib/collection.cgi: Fix spam_check graph for email plugin.
Brad Fritz [Mon, 24 Aug 2009 17:25:37 +0000 (13:25 -0400)]
contrib/collection.cgi: Fix spam_check graph for email plugin.

Corrects DS name to fix email plugin's spam_check graph.

Signed-off-by: Brad Fritz <brad@fewerhassles.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agocollection3: Add a module for the “java_memory” type.
Florian Forster [Wed, 26 Aug 2009 11:47:47 +0000 (13:47 +0200)]
collection3: Add a module for the “java_memory” type.

14 years agocollection3: Add the possibility to scale generic graphs.
Florian Forster [Wed, 26 Aug 2009 11:46:36 +0000 (13:46 +0200)]
collection3: Add the possibility to scale generic graphs.

14 years agocontrib/cussh.pl: Add synopsis for specific commands.
Florian Forster [Wed, 26 Aug 2009 09:31:24 +0000 (11:31 +0200)]
contrib/cussh.pl: Add synopsis for specific commands.

You can now do
  HELP FLUSH
to get information about the FLUSH command.

14 years agocontrib/cussh.pl: Fix a typo in the `FLUSH' command.
Florian Forster [Wed, 26 Aug 2009 08:34:08 +0000 (10:34 +0200)]
contrib/cussh.pl: Fix a typo in the `FLUSH' command.

14 years agocontrib/collection3: Common.pm: Sort identifiers by filename.
Aman Gupta [Sat, 22 Aug 2009 12:07:26 +0000 (14:07 +0200)]
contrib/collection3: Common.pm: Sort identifiers by filename.

14 years agodf plugin: Check ignorelists before stat'ing the filesystem.
Florian Forster [Thu, 20 Aug 2009 12:10:37 +0000 (14:10 +0200)]
df plugin: Check ignorelists before stat'ing the filesystem.

 → See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542859

14 years agopowerdns plugin: Fix handling of the “LocalSocket” config option.
Luke Heberling [Thu, 20 Aug 2009 12:10:37 +0000 (14:10 +0200)]
powerdns plugin: Fix handling of the “LocalSocket” config option.

 → See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535787

14 years agopowerdns plugin: Set a timeout for the datagram socket.
Luke Heberling [Thu, 20 Aug 2009 12:08:53 +0000 (14:08 +0200)]
powerdns plugin: Set a timeout for the datagram socket.

 → See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535787

14 years agoPlugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option.
Florian Forster [Thu, 20 Aug 2009 11:48:23 +0000 (13:48 +0200)]
Plugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option.

This hopefully fixes Debian#541953.

14 years agoRemoved remaining traces of the "main" chain.
Sebastian Harl [Tue, 18 Aug 2009 07:55:42 +0000 (09:55 +0200)]
Removed remaining traces of the "main" chain.

The chains are called "PreCache" and "PostCache" now.

14 years agocontrib/fedora/init.d-collectd: Fix condrestart.
Alan Pevec [Tue, 11 Aug 2009 22:52:47 +0000 (00:52 +0200)]
contrib/fedora/init.d-collectd: Fix condrestart.

on upgrade collectd is not restarted
https://bugzilla.redhat.com/show_bug.cgi?id=516273

Signed-off-by: Alan Pevec <apevec@redhat.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agosrc/utils_cache.c: Update GETVAL output when missing state.
Andrés J. Díaz [Tue, 11 Aug 2009 19:57:34 +0000 (21:57 +0200)]
src/utils_cache.c: Update GETVAL output when missing state.

Hi

I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.

I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.

BTW a GETSTATE command will be an useful feature too :P

Regards,
  Andres

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agolibvirt plugin: Further improve the connection handling.
Florian Forster [Wed, 12 Aug 2009 13:08:40 +0000 (15:08 +0200)]
libvirt plugin: Further improve the connection handling.

Use the complaint mechanism for failed connection attempts and handle multiple
`Connection' configuration options like other options in other plugins (i. e.
later options overwrite earlier settings of the same name).

14 years agolibvirt plugin: Re-connect to libvirtd if connecting fails.
Alan Pevec [Tue, 11 Aug 2009 22:53:00 +0000 (00:53 +0200)]
libvirt plugin: Re-connect to libvirtd if connecting fails.

https://bugzilla.redhat.com/show_bug.cgi?id=480997

Signed-off-by: Alan Pevec <apevec@redhat.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agosrc/meta_data.c: Fix a typo.
Florian Forster [Wed, 22 Jul 2009 08:20:59 +0000 (10:20 +0200)]
src/meta_data.c: Fix a typo.

14 years agocollectd.conf(5): Fix two minor typos.
Florian Forster [Tue, 4 Aug 2009 15:37:25 +0000 (17:37 +0200)]
collectd.conf(5): Fix two minor typos.

14 years agoMerge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
Florian Forster [Sun, 2 Aug 2009 10:22:20 +0000 (12:22 +0200)]
Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6

14 years agocontrib/collection3: Don't use SI prefix for number of processes
Anthony Dewhurst [Thu, 30 Jul 2009 20:42:07 +0000 (21:42 +0100)]
contrib/collection3: Don't use SI prefix for number of processes

I, at least, don't normally measure processes in "milliprocesses".

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agocollection3/etc/collection.conf: Reencoded in UTF-8.
Sebastian Harl [Sun, 26 Jul 2009 13:01:53 +0000 (15:01 +0200)]
collection3/etc/collection.conf: Reencoded in UTF-8.

Depending on the locale settings, RRDtool might fail to handle "special
characters" correctly. Using UTF-8 is a way to work around that issue.

Thanks to Daniel Danner for reporting and testing this.

14 years agosrc/utils_cache.c: Make really sure to free the right cache entry.
Sebastian Harl [Wed, 8 Jul 2009 11:19:57 +0000 (13:19 +0200)]
src/utils_cache.c: Make really sure to free the right cache entry.

Make sure we do not try to free a (possibly some random) cache entry after
removing it from the AVL tree. Potentially, this might have caused invalid
free()s in some rare situations.

14 years agoChangeLog: Fix a typo.
Florian Forster [Sun, 19 Jul 2009 15:38:55 +0000 (17:38 +0200)]
ChangeLog: Fix a typo.

14 years agoBumped version to 4.6.4; Updated ChangeLog. collectd-4.6.4
Florian Forster [Sat, 18 Jul 2009 14:36:44 +0000 (16:36 +0200)]
Bumped version to 4.6.4; Updated ChangeLog.

14 years agosrc/configfile.c: Warn if an unexpected block is found.
Florian Forster [Wed, 15 Jul 2009 08:09:48 +0000 (10:09 +0200)]
src/configfile.c: Warn if an unexpected block is found.

If the `snmp' plugin isn't loaded (but a configuration exists), no
warning is printed because there are only blocks in the SNMP
configuration..

14 years agobuild.sh, version-gen.sh: Remove bashisms.
Florian Forster [Sun, 12 Jul 2009 09:03:07 +0000 (11:03 +0200)]
build.sh, version-gen.sh: Remove bashisms.

Thanks to Peter Bray for pointing them out.

14 years agosrc/utils_cache.c: `ce' *is* written to in `c_avl_remove'.
Florian Forster [Wed, 8 Jul 2009 09:55:33 +0000 (11:55 +0200)]
src/utils_cache.c: `ce' *is* written to in `c_avl_remove'.

Therefore we should definitely free it.

14 years agosrc/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.
Florian Forster [Wed, 8 Jul 2009 08:51:28 +0000 (10:51 +0200)]
src/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.

This may habe been a cause of the reported assertion failure, too.

14 years agosrc/utils_cache.c: Add a missing `continue'.
Paul Sadauskas [Wed, 8 Jul 2009 08:49:23 +0000 (10:49 +0200)]
src/utils_cache.c: Add a missing `continue'.

tokkee on IRC & I think we found a bug with utils_cache.c. The uc_check_timeout
function is missing a continue after the "uninteresting" service check, that
causes a key to be null.

This probably caused an assertion failure in cache_compare as reported by
Mariusz.

14 years agocpu plugin: Fix a typo.
Florian Forster [Mon, 6 Jul 2009 20:31:28 +0000 (22:31 +0200)]
cpu plugin: Fix a typo.

14 years agomemcached plugin: Pass `ai_hints' to `getaddrinfo'.
Amit Gupta [Mon, 6 Jul 2009 11:07:00 +0000 (13:07 +0200)]
memcached plugin: Pass `ai_hints' to `getaddrinfo'.

14 years agocollectd2html.pl: Added --recursive command line option.
Sebastian Harl [Mon, 22 Jun 2009 14:02:24 +0000 (16:02 +0200)]
collectd2html.pl: Added --recursive command line option.

This option may be used to recursively scan the specified directory for RRD
files. This way, the script works reasonably well with collectd 4.

Thanks to 'ABL <abl@xxx.lt>' for providing an initial patch in Debian bug
 #482185.

14 years agocollectd2html.pl: Allow for --imgformat to be passed to rrdtool.
Ivan Shmakov [Wed, 21 May 2008 10:40:04 +0000 (17:40 +0700)]
collectd2html.pl: Allow for --imgformat to be passed to rrdtool.

This was reported as Debian bug #482185.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
14 years agosrc/common.c: More reliable error reporting in `parse_values'.
Florian Forster [Wed, 1 Jul 2009 12:56:17 +0000 (14:56 +0200)]
src/common.c: More reliable error reporting in `parse_values'.

14 years agosrc/utils_cache.c: Try to improve code readability.
Florian Forster [Sat, 20 Jun 2009 10:50:21 +0000 (12:50 +0200)]
src/utils_cache.c: Try to improve code readability.

Unfortunately, there is quite some magic going on there :/

14 years agosrc/utils_cache.c: Fix OKAY notifications for missing values.
Andrés J. Díaz [Sat, 20 Jun 2009 10:49:34 +0000 (12:49 +0200)]
src/utils_cache.c: Fix OKAY notifications for missing values.

14 years agodns plugin: Improve debug message.
Florian Forster [Sat, 20 Jun 2009 09:43:42 +0000 (11:43 +0200)]
dns plugin: Improve debug message.

14 years agolibcollectdclient/client.c: Made sstrerror() static.
Sebastian Harl [Tue, 2 Jun 2009 19:53:29 +0000 (21:53 +0200)]
libcollectdclient/client.c: Made sstrerror() static.

This is a private helper function only.

14 years agoBumped version to 4.6.3; Updated ChangeLog. collectd-4.6.3
Florian Forster [Tue, 2 Jun 2009 09:15:03 +0000 (11:15 +0200)]
Bumped version to 4.6.3; Updated ChangeLog.

14 years agoChangeLog: Fixed sorting of entries.
Sebastian Harl [Wed, 27 May 2009 19:58:00 +0000 (21:58 +0200)]
ChangeLog: Fixed sorting of entries.

14 years agoconfigfile.c: Fixed Include'ing empty files.
Sebastian Harl [Thu, 28 May 2009 09:15:41 +0000 (11:15 +0200)]
configfile.c: Fixed Include'ing empty files.

When including empty files, a typo prevented that the "Include" child (of the
config parse tree) was removed correctly, leaving behind garbage which in turn
led to a segfault if the Include option was not the last element of the config
file.

Also, another Include option following the inclusion of an empty file used to
be ignored. This has been fixed as well.

14 years agocollectd.conf(5): Fixed alphabetic sorting of plugins.
Sebastian Harl [Wed, 27 May 2009 11:51:05 +0000 (13:51 +0200)]
collectd.conf(5): Fixed alphabetic sorting of plugins.

14 years agocollectd.conf(5): Mark {Min,Max}PGVersion as deprecated.
Sebastian Harl [Wed, 27 May 2009 11:38:05 +0000 (13:38 +0200)]
collectd.conf(5): Mark {Min,Max}PGVersion as deprecated.

Instead, document the {Min,Max}Version options.

14 years agocollectd.conf: Added a sample ipmi config block.
Sebastian Harl [Wed, 27 May 2009 11:06:10 +0000 (13:06 +0200)]
collectd.conf: Added a sample ipmi config block.

14 years agorrdtool plugin: If `flush' cannot find the requested file, issue an `INFO'.
Florian Forster [Wed, 27 May 2009 09:42:47 +0000 (11:42 +0200)]
rrdtool plugin: If `flush' cannot find the requested file, issue an `INFO'.

... and not a `WARNING' - this may happen under perfectly fine conditions.
(I. e. file exists but isn't updated anymore.)

14 years agosrc/utils_cache.c: Fix incorrect checking of persistent thresholds.
Andrés J. Díaz [Wed, 27 May 2009 09:14:40 +0000 (11:14 +0200)]
src/utils_cache.c: Fix incorrect checking of persistent thresholds.

I attached a patch to solve a problem related with notifications. When a value
is missing for a while (2 intervals), a FAILURE notification is raised, and if
Persist is false, the notification is repeated each interval, but man page
says:

  If set to false (the default) then a notification is only generated if a
  value is out of range but the previous value was okay.

So, I think that is a bug, if not I'm sorry for the noise :)

Regards,
  Andres

P.S.: The problem is only a mixing in if conditions into uc_check_timeout
      function.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoDisable LFS flags to avoid 32-bit solaris sys/swap.h error
Doug MacEachern [Fri, 22 May 2009 22:03:57 +0000 (15:03 -0700)]
Disable LFS flags to avoid 32-bit solaris sys/swap.h error

14 years agobuild system: (Hopefully) added support for libtool 1.5 _and_ 2.2.
Sebastian Harl [Wed, 13 May 2009 09:43:36 +0000 (09:43 +0000)]
build system: (Hopefully) added support for libtool 1.5 _and_ 2.2.

The macro LT_PACKAGE_VERSION (which appeared in libtool 2.2) is used to check
weather we're using libtool 2.2.

14 years agorrdtool plugin: Make sure the initialization is run only once.
Florian Forster [Mon, 18 May 2009 12:42:39 +0000 (14:42 +0200)]
rrdtool plugin: Make sure the initialization is run only once.

Thanks to Amit Gupta for reporting this bug!

14 years agosrc/plugin.c: Initiate the threshold checking again.
Andrés J. Díaz [Mon, 18 May 2009 12:09:11 +0000 (14:09 +0200)]
src/plugin.c: Initiate the threshold checking again.

Hi,

I have the same problem in my instalation, exactly the same scenario, I found a
possible explanation in the plugin.c module. While in the 4.5 branch exists a
callback to function ut_check_threshold (defined in utils_threshold.c), in the
4.6.2 (and also in 4.6.1, I think), the callback is missing, so threshold
checking never runs.

In fact, a grep -r ut_check_threshold over src dir, only show the definition of
the function in ut_check_threshold module.

I'm not sure if it's really a bug, but when I patched my code, it works fine
for me :) I'm using the 4.6.2 version from tar.gz.

Best regards,
  Andrés

The regression was introduced in 65954d9b.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoconfigure.in: Be more verbose if libperl exists but doesn't support ithreads.
Florian Forster [Mon, 18 May 2009 11:05:26 +0000 (13:05 +0200)]
configure.in: Be more verbose if libperl exists but doesn't support ithreads.

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sun, 10 May 2009 15:22:47 +0000 (17:22 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:
ChangeLog
version-gen.sh

14 years agoBumped version to 4.5.4; Updated ChangeLog. collectd-4.5.4
Florian Forster [Sat, 9 May 2009 11:56:43 +0000 (13:56 +0200)]
Bumped version to 4.5.4; Updated ChangeLog.

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 9 May 2009 10:29:44 +0000 (12:29 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

14 years agoconfigure.in: Hint towards the CFLAGS instead of using $CC.
Florian Forster [Sat, 9 May 2009 09:08:48 +0000 (11:08 +0200)]
configure.in: Hint towards the CFLAGS instead of using $CC.

14 years agoconfigure.in: Add hint for building solaris 64-bit binary.
Doug MacEachern [Sat, 9 May 2009 01:54:51 +0000 (18:54 -0700)]
configure.in: Add hint for building solaris 64-bit binary.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoswap module: Include <vm/anon.h> on Solaris.
Doug MacEachern [Sat, 9 May 2009 00:35:03 +0000 (17:35 -0700)]
swap module: Include <vm/anon.h> on Solaris.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoconfigure.in: Check for `mysql_get_server_version' in libmyql.
Doug MacEachern [Fri, 8 May 2009 01:05:01 +0000 (18:05 -0700)]
configure.in: Check for `mysql_get_server_version' in libmyql.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoconfigure.in: Use AC_HEADER_STDBOOL
Doug MacEachern [Thu, 7 May 2009 19:50:17 +0000 (12:50 -0700)]
configure.in: Use AC_HEADER_STDBOOL

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Wed, 6 May 2009 14:37:18 +0000 (16:37 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:

src/Makefile.am

14 years agoBuild system: Straighten up building of the DF plugin.
Florian Forster [Wed, 6 May 2009 14:28:27 +0000 (16:28 +0200)]
Build system: Straighten up building of the DF plugin.

In rare cases, e. g. Solaris, getmntent is available but neither the one nor
the two argument version could be recognized. This lead to `cu_mount_getlist'
returning NULL without an error, leading to the df plugin fail without notice.

While at it I re-implemented the dependency checking of the DF plugin to match
the proprocessor logic in utils_mount.c.

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Wed, 6 May 2009 08:43:47 +0000 (10:43 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

14 years agouuid plugin: Pass `int' to `isxdigit'.
Doug MacEachern [Wed, 6 May 2009 08:42:01 +0000 (10:42 +0200)]
uuid plugin: Pass `int' to `isxdigit'.

Fixes compilation on NetBSD and possibly other systems.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agotcpconns plugin: Compilation fixes for NetBSD.
Doug MacEachern [Wed, 6 May 2009 08:41:08 +0000 (10:41 +0200)]
tcpconns plugin: Compilation fixes for NetBSD.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agolibcollectdclient: Copy `sstrerror' from src/common.c.
Florian Forster [Tue, 5 May 2009 18:29:08 +0000 (20:29 +0200)]
libcollectdclient: Copy `sstrerror' from src/common.c.

I don't want to simply include common.h, since that pulls in a lot of
other daemon-related headers..

14 years agoSet process vmem_size and stack_size on FreeBSD
Doug MacEachern [Mon, 4 May 2009 17:22:43 +0000 (19:22 +0200)]
Set process vmem_size and stack_size on FreeBSD

   Fixes:
   processes.c: In function 'ps_read':
   processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
   processes.c:1300: note: 'pse.vmem_size' was declared here
   processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
   processes.c:1300: note: 'pse.stack_size' was declared here

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.

Conflicts:

src/processes.c

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Mon, 4 May 2009 17:12:00 +0000 (19:12 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

14 years agoprocesses plugin: Fix compilation issues under OpenBSD.
Florian Forster [Mon, 4 May 2009 16:51:51 +0000 (18:51 +0200)]
processes plugin: Fix compilation issues under OpenBSD.

Unfortunately OpenBSD support is non-trivial to add, so we'll keep that for
later.

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

14 years agorrdtool plugin: Make absolutely sure two local variables are initialized.
Florian Forster [Mon, 4 May 2009 15:08:22 +0000 (17:08 +0200)]
rrdtool plugin: Make absolutely sure two local variables are initialized.

To make the compiler happy.

14 years agobind plugin: Fixes for FreeBSD 7.1
Florian Forster [Mon, 4 May 2009 14:48:58 +0000 (16:48 +0200)]
bind plugin: Fixes for FreeBSD 7.1

X/Open is needed for strptime,
sys/select.h is needed for some libcurl versions, and
mktime is the POSIX variant of timegm (+ localization).

14 years agoVarious: Remove strict standards compliance defines.
Florian Forster [Mon, 4 May 2009 14:46:02 +0000 (16:46 +0200)]
Various: Remove strict standards compliance defines.

14 years agontpd plugin: Fix dereference of type-punned pointer.
Florian Forster [Sun, 3 May 2009 21:45:16 +0000 (23:45 +0200)]
ntpd plugin: Fix dereference of type-punned pointer.

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

14 years agoprocesses plugin: Comment out nonexistent struct members.
Florian Forster [Sat, 2 May 2009 08:49:35 +0000 (10:49 +0200)]
processes plugin: Comment out nonexistent struct members.

We should reintroduce those values eventually.

14 years agomemory plugin: Fix a formatstring error.
Florian Forster [Sat, 2 May 2009 08:45:51 +0000 (10:45 +0200)]
memory plugin: Fix a formatstring error.

14 years agoemail plugin: Don't assume `pthread_t' is a `unsigned long'.
Florian Forster [Sat, 2 May 2009 08:29:14 +0000 (10:29 +0200)]
email plugin: Don't assume `pthread_t' is a `unsigned long'.

14 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Fri, 1 May 2009 14:34:51 +0000 (16:34 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

14 years agoirq plugin: Force 32bit wrap-around.
Florian Forster [Fri, 1 May 2009 14:34:30 +0000 (16:34 +0200)]
irq plugin: Force 32bit wrap-around.

14 years agobattery plugin: Fix a typo.
Florian Forster [Fri, 1 May 2009 14:34:15 +0000 (16:34 +0200)]
battery plugin: Fix a typo.

15 years agosrc/libcollectdclient/: Specify _XOPEN_SOURCE=600.
Florian Forster [Mon, 20 Apr 2009 20:04:28 +0000 (22:04 +0200)]
src/libcollectdclient/: Specify _XOPEN_SOURCE=600.

15 years agoirq plugin: Parse interrupt counters as unsigned long long.
Tomasz Pala [Sat, 18 Apr 2009 15:45:01 +0000 (17:45 +0200)]
irq plugin: Parse interrupt counters as unsigned long long.

Hello,

attached patch fixes accounting of most frequent interrupts (like NICs
on routers). E.g. in my case:

213:      76266      76357      76250      76397 2408617852 2411844062 2411642538 2411814531   PCI-MSI-edge      eth1
214: 2621368360 2621463385 2621343444 2621386931    2349184         28         35         32   PCI-MSI-edge      eth0

Here LONG_MAX (2147483647L) overflows in 10 days uptime and strtol()
returns the same value.

As all the values (including counter_t) are unsigned long long int, the
fix is trivial (for now there's no need to check for irq_value overflow;>).

--
Tomasz Pala <gotar@pld-linux.org>

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocsv plugin: Update copyright information.
Florian Forster [Mon, 20 Apr 2009 14:17:08 +0000 (16:17 +0200)]
csv plugin: Update copyright information.

15 years agoVarious plugins: Update copyright information.
Florian Forster [Mon, 20 Apr 2009 14:16:33 +0000 (16:16 +0200)]
Various plugins: Update copyright information.

15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Fri, 17 Apr 2009 23:04:48 +0000 (01:04 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:
src/cpu.c

15 years agosrc/libcollectdclient/: Check if EILSEQ is defined.
Florian Forster [Fri, 17 Apr 2009 23:02:59 +0000 (01:02 +0200)]
src/libcollectdclient/: Check if EILSEQ is defined.

And fall back to EPROTO or EINVAL if it is not, e. g. under FreeBSD.

15 years agointerface, memory, ping plugins: Update copyright information.
Florian Forster [Fri, 17 Apr 2009 22:55:59 +0000 (00:55 +0200)]
interface, memory, ping plugins: Update copyright information.