Code

collectd.git
15 years agonetwork plugin: Fix an incorrectly used configuration variable.
Florian Forster [Tue, 4 Aug 2009 10:13:41 +0000 (12:13 +0200)]
network plugin: Fix an incorrectly used configuration variable.

The `CacheFlush' option was assigned to the `TTL' variable. Ouch.

Version 4.6 and earlier are not effected.

15 years agosrc/collectd.conf.in: Fix a typo.
Florian Forster [Tue, 21 Jul 2009 06:46:49 +0000 (08:46 +0200)]
src/collectd.conf.in: Fix a typo.

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

15 years agoBumped version to 4.7.2; Updated ChangeLog. collectd-4.7.2
Florian Forster [Sun, 19 Jul 2009 11:04:20 +0000 (13:04 +0200)]
Bumped version to 4.7.2; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sun, 19 Jul 2009 11:00:20 +0000 (13:00 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
version-gen.sh

15 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.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 15 Jul 2009 09:10:19 +0000 (11:10 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:

src/memcached.c

15 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..

15 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.

15 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.

15 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.

15 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.

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

15 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'.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 6 Jul 2009 11:45:32 +0000 (13:45 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agobindings/java/Makefile.am: Fully support $DESTDIR.
Sebastian Harl [Mon, 22 Jun 2009 18:24:20 +0000 (20:24 +0200)]
bindings/java/Makefile.am: Fully support $DESTDIR.

15 years agosrc/Makefile: Link the ping plugin against libm.
Sebastian Harl [Sat, 6 Jun 2009 20:13:03 +0000 (22:13 +0200)]
src/Makefile: Link the ping plugin against libm.

The plugin now uses sqrt() which is provided by the math lib.

15 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.

15 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>
15 years agogmond plugin: Use `strtoull' to parse counter values.
Florian Forster [Wed, 1 Jul 2009 13:39:11 +0000 (15:39 +0200)]
gmond plugin: Use `strtoull' to parse counter values.

Instead of `strtoll'.

15 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'.

15 years agoconfigure.in: Add -rpath to JAVA_LDFLAGS.
Florian Forster [Sat, 27 Jun 2009 11:19:53 +0000 (13:19 +0200)]
configure.in: Add -rpath to JAVA_LDFLAGS.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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 :/

15 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.

15 years agosrc/Makefile.am: Link the `sensors' plugin against libsensors.
Mirko Buffoni [Sat, 20 Jun 2009 10:24:41 +0000 (12:24 +0200)]
src/Makefile.am: Link the `sensors' plugin against libsensors.

This regression was introduced in 451d75ba.

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

15 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.

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

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Tue, 2 Jun 2009 09:31:32 +0000 (11:31 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

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

15 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.

15 years agoconfigure: Include libganglia in the configuration summary.
Sebastian Harl [Sun, 31 May 2009 20:56:39 +0000 (22:56 +0200)]
configure: Include libganglia in the configuration summary.

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

15 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.

15 years agojava plugin: Replace dots ('.') with slashes ('/') when loading a class.
Florian Forster [Thu, 28 May 2009 10:10:42 +0000 (12:10 +0200)]
java plugin: Replace dots ('.') with slashes ('/') when loading a class.

Thanks to Randy Rizun for pointing this out:

Hi!

just wanted to point out an issue in cjni_config_load_plugin

the call to FindClass passes the "Name" verbatim from the LoadPlugin directive

one might intuitively say LoadPlugin "com.foobar.Plugin"

whereas FindClass wants to see it as "com/foobar/Plugin"

so I guess either (a) document LoadPlugin to say to use slashes or (b)
subst / for . in cjni_config_load_plugin or (c) something else?!?

of course, everything works fine if my plugin is in the 'default' java
package (i.e., no package name) =)

either way, thanks a lot for the great work!!

-Randy

15 years agojava plugin: Use slashes rather than dots to lookup classes.
Randy Rizun [Thu, 28 May 2009 10:06:37 +0000 (12:06 +0200)]
java plugin: Use slashes rather than dots to lookup classes.

there are three (3) invocations of FindClass that use "." periods
instead of "/" slashes

java.lang.Long
java.lang.Double
org.collectd.api.DataSet

those need to be fixed up to use "/" slashes

Thanks!

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 27 May 2009 13:03:44 +0000 (15:03 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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.

15 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.

15 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.

15 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.)

15 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>
15 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

15 years agoconfigure.in: Add libmemcached to Configuration/Libraries output.
Doug MacEachern [Wed, 27 May 2009 08:53:26 +0000 (10:53 +0200)]
configure.in: Add libmemcached to Configuration/Libraries output.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Fri, 22 May 2009 15:42:56 +0000 (17:42 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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!

15 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>
15 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.

15 years agoconfigure.in, java plugin: Instruct `find' to return files only.
Florian Forster [Mon, 18 May 2009 09:28:50 +0000 (11:28 +0200)]
configure.in, java plugin: Instruct `find' to return files only.

Hopefully this solves this problem:
  /home/hudson/jdk/sample/javac -d "." "./org/collectd/api"/*.java
  /bin/sh: /home/hudson/jdk/sample/javac: is a directory

15 years agosrc/Makefile.am: Added missing backslash before newline.
Sebastian Harl [Tue, 12 May 2009 06:44:24 +0000 (08:44 +0200)]
src/Makefile.am: Added missing backslash before newline.

The list of manpages is split into several lines. One of those lines was
missing the backslash which caused the list to be cut after collectd-java.5,
i.e. several of the manpages would have not been built at all.

Thanks to 'dh_install --fail-missing' for catching that ;-)

15 years agoMerge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7
Florian Forster [Mon, 11 May 2009 14:18:22 +0000 (16:18 +0200)]
Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7

15 years agobindings/java/Makefile.am: Install to $pkgdatadir/java/.
Florian Forster [Mon, 11 May 2009 13:13:41 +0000 (15:13 +0200)]
bindings/java/Makefile.am: Install to $pkgdatadir/java/.

And don't use $(builddir): It may be an empty string, making handling of this
variable cumbersome.

15 years agocollectd.conf: Added a sample config for the memcachec plugin.
Sebastian Harl [Mon, 11 May 2009 09:39:00 +0000 (11:39 +0200)]
collectd.conf: Added a sample config for the memcachec plugin.

... copied from the manpage.

15 years agocollectd.conf: Added missing whitespace in sample table configuration.
Sebastian Harl [Sun, 10 May 2009 19:29:10 +0000 (21:29 +0200)]
collectd.conf: Added missing whitespace in sample table configuration.

WTF happened there? ...

15 years agoconfigure: Added support for --enable-<plugin>=force.
Sebastian Harl [Sun, 10 May 2009 17:15:37 +0000 (19:15 +0200)]
configure: Added support for --enable-<plugin>=force.

This may be used to force a plugin to be built, no matter what the dependency
check yielded. I.e. this is basically the same --enable-<plugin> before commit
9276a81328091fdebc833eb10580d53bc51659db (configure.in: Let configure bail out
on missing dependencies).

15 years agoconfigure: Added the --enable-all-plugins option.
Sebastian Harl [Sun, 10 May 2009 16:47:41 +0000 (18:47 +0200)]
configure: Added the --enable-all-plugins option.

This option may be used to enable or disable all plugins by default. The
default may be overwritten by explicitly enabling or disabling a plugin using
the --enable-<plugin> option.

15 years agomemcachec plugin: Fixed a typo in a comment.
Sebastian Harl [Sun, 10 May 2009 15:58:56 +0000 (17:58 +0200)]
memcachec plugin: Fixed a typo in a comment.

15 years agoBuild system: Build and install .java files in bindings/java/ automatically.
Florian Forster [Mon, 11 May 2009 08:12:46 +0000 (10:12 +0200)]
Build system: Build and install .java files in bindings/java/ automatically.

15 years agocollectd.conf(5): Add documentation for the memcachec plugin.
Florian Forster [Mon, 11 May 2009 06:52:39 +0000 (08:52 +0200)]
collectd.conf(5): Add documentation for the memcachec plugin.

15 years agoREADME: Fix a typo.
Florian Forster [Mon, 11 May 2009 06:08:54 +0000 (08:08 +0200)]
README: Fix a typo.

15 years agobindings/Makefile: Include java/ subdir in the dist tarball.
Sebastian Harl [Sun, 10 May 2009 14:44:06 +0000 (16:44 +0200)]
bindings/Makefile: Include java/ subdir in the dist tarball.

15 years agocontrib/README: Added a short description for collectd-{network,unixsock}.py.
Sebastian Harl [Sun, 10 May 2009 13:42:12 +0000 (15:42 +0200)]
contrib/README: Added a short description for collectd-{network,unixsock}.py.

15 years agoREADME: Added missing plugins and libraries.
Sebastian Harl [Sun, 10 May 2009 13:29:05 +0000 (15:29 +0200)]
README: Added missing plugins and libraries.

That is, the fscache, memcachec, table and uptime plugins and libganglia,
libgcrypt and libmemcached.

15 years agocollectd.conf: Added fscache, memcachec, table and ted plugins.
Sebastian Harl [Sun, 10 May 2009 12:23:22 +0000 (14:23 +0200)]
collectd.conf: Added fscache, memcachec, table and ted plugins.

15 years agoconfigure: Sort plugins alphabetically in the summary output.
Sebastian Harl [Sun, 10 May 2009 11:26:29 +0000 (13:26 +0200)]
configure: Sort plugins alphabetically in the summary output.

15 years agoChangeLog: Changed date to May 11th; Updated version.
Florian Forster [Sun, 10 May 2009 15:30:30 +0000 (17:30 +0200)]
ChangeLog: Changed date to May 11th; Updated version.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sun, 10 May 2009 15:24:50 +0000 (17:24 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog

15 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

15 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.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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

15 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.

15 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>
15 years agoconfigure.in: Check libgcrypt minimum version 1.2.0.
Doug MacEachern [Fri, 8 May 2009 06:13:48 +0000 (23:13 -0700)]
configure.in: Check libgcrypt minimum version 1.2.0.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 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>
15 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>
15 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>
15 years agoREADME: Document how to build the Java plugin.
Florian Forster [Fri, 8 May 2009 15:13:00 +0000 (17:13 +0200)]
README: Document how to build the Java plugin.

15 years agoconfigure.in: Simplified configuration of the Java plugin.
Florian Forster [Fri, 8 May 2009 14:55:05 +0000 (16:55 +0200)]
configure.in: Simplified configuration of the Java plugin.

The configure script now uses `find' to search the JAVA_HOME directory for the
files `jni.h', `jni_md.h', and `libjvm.so'. Not nice, but I don't know how else
to solve this problem.

15 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

15 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.

15 years agolibcollectdclient: Fix a typo.
Florian Forster [Wed, 6 May 2009 12:41:11 +0000 (14:41 +0200)]
libcollectdclient: Fix a typo.

15 years agonetwork plugin: Fix use of a uninitialized variable.
Florian Forster [Wed, 6 May 2009 09:23:17 +0000 (11:23 +0200)]
network plugin: Fix use of a uninitialized variable.

This only happened if debugging was enabled.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 6 May 2009 08:44:00 +0000 (10:44 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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

15 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>
15 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>
15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Tue, 5 May 2009 18:30:10 +0000 (20:30 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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..

15 years agoRestructure the --enable-standards option.
Florian Forster [Tue, 5 May 2009 18:15:35 +0000 (20:15 +0200)]
Restructure the --enable-standards option.

On Debian GNU/Linux (testing) this works. Let's see how other
systems hold up.

15 years agosrc/Makefile.am: Add standards.h to the sources.
Florian Forster [Tue, 5 May 2009 07:50:28 +0000 (09:50 +0200)]
src/Makefile.am: Add standards.h to the sources.

15 years agoiptables plugin: Initialize ip_version.
Doug MacEachern [Tue, 5 May 2009 07:37:00 +0000 (09:37 +0200)]
iptables plugin: Initialize ip_version.

iptables.c: In function 'iptables_config':
iptables.c:99: warning: 'ip_version' is used uninitialized in this function

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 4 May 2009 17:25:01 +0000 (19:25 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 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

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

15 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

15 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.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 4 May 2009 15:13:08 +0000 (17:13 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7