Code

collectd.git
17 years agoMerge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Wed, 26 Sep 2007 15:18:31 +0000 (17:18 +0200)]
Merge branch 'pull/collectd-4.1' into collectd-4.1

17 years agobuild system: Fix detection of libraries when giving a directory.
Florian Forster [Wed, 26 Sep 2007 15:18:13 +0000 (17:18 +0200)]
build system: Fix detection of libraries when giving a directory.

17 years agobuild system: Fixed the improved detection of the Net-SNMP library.
Florian Forster [Tue, 18 Sep 2007 18:51:38 +0000 (20:51 +0200)]
build system: Fixed the improved detection of the Net-SNMP library.

17 years agobuild system: Improve the detection of the Net-SNMP library.
Florian Forster [Tue, 18 Sep 2007 11:45:36 +0000 (13:45 +0200)]
build system: Improve the detection of the Net-SNMP library.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Sat, 15 Sep 2007 09:01:40 +0000 (11:01 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

17 years agoMerge branch 'collectd-3.11' into collectd-4.0
Florian Forster [Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200)]
Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

src/apcups.c

nothing added to commit but untracked files present (use "git add" to track)

17 years agoapcups plugin: Warn about the irritating name `apcups_charge_pct'.
Florian Forster [Sat, 15 Sep 2007 08:58:53 +0000 (10:58 +0200)]
apcups plugin: Warn about the irritating name `apcups_charge_pct'.

17 years agonetlink plugin: Fix build issues under Debian Sarge
Florian Forster [Sat, 15 Sep 2007 08:48:25 +0000 (10:48 +0200)]
netlink plugin: Fix build issues under Debian Sarge

or generally older Linux versions.

17 years agoMerge branch 'ff/apcups' into collectd-4.0
Florian Forster [Fri, 14 Sep 2007 07:15:06 +0000 (09:15 +0200)]
Merge branch 'ff/apcups' into collectd-4.0

17 years agoBumped the version to 4.1.1
Florian Forster [Fri, 14 Sep 2007 07:11:04 +0000 (09:11 +0200)]
Bumped the version to 4.1.1

17 years agobuild system: Fix yet another issue with the detection of libupsclient.
Florian Forster [Fri, 14 Sep 2007 06:32:37 +0000 (08:32 +0200)]
build system: Fix yet another issue with the detection of libupsclient.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Thu, 13 Sep 2007 08:01:23 +0000 (10:01 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

ChangeLog

17 years agoapcups plugin: Fix reporting of the `load percent' data.
Florian Forster [Thu, 13 Sep 2007 07:56:04 +0000 (09:56 +0200)]
apcups plugin: Fix reporting of the `load percent' data.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1 collectd-4.1.1
Florian Forster [Wed, 12 Sep 2007 12:57:43 +0000 (14:57 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

contrib/PerlLib/Collectd.pm

nothing added to commit but untracked files present (use "git add" to track)

17 years agocontrib/PerlLib/Collectd.pm: Bumbed the version to 4.0.8. collectd-4.0.8
Florian Forster [Wed, 12 Sep 2007 12:45:30 +0000 (14:45 +0200)]
contrib/PerlLib/Collectd.pm: Bumbed the version to 4.0.8.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Wed, 12 Sep 2007 09:15:54 +0000 (11:15 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

ChangeLog
configure.in

17 years agoBumped version to 4.0.8; updated ChangeLog.
Florian Forster [Wed, 12 Sep 2007 09:14:33 +0000 (11:14 +0200)]
Bumped version to 4.0.8; updated ChangeLog.

17 years agoplugin.c: Print lt_dlopen() error messages to STDERR as well.
Sebastian Harl [Wed, 12 Sep 2007 08:55:35 +0000 (10:55 +0200)]
plugin.c: Print lt_dlopen() error messages to STDERR as well.

This makes sure the user will get the message on the terminal in any case.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoRemoved some legacy calls to DEBUG().
Sebastian Harl [Wed, 12 Sep 2007 08:54:57 +0000 (10:54 +0200)]
Removed some legacy calls to DEBUG().

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agorrdtool plugin: Use `-b' (begin) when creating rrd-files.
Florian Forster [Wed, 12 Sep 2007 07:14:45 +0000 (09:14 +0200)]
rrdtool plugin: Use `-b' (begin) when creating rrd-files.

When receiving data from a host that has a clock that lacks behind the servers
clock, the newly created rrd-files had a timestamp that was ten seconds in the
past from the server's point of view. If the client was, for example, 10:00
minutes late, there would therefore be 9:50 minutes of invalid data which cause
warnings, empty graphs and overall missery. This commit changes this behavior
to not use the default `begin' time but set it explicitely based on the
client's time.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

17 years agoChangeLog: Documented the fix in the apcups plugin.
Florian Forster [Tue, 11 Sep 2007 09:50:43 +0000 (11:50 +0200)]
ChangeLog: Documented the fix in the apcups plugin.

17 years agoMerge branch 'uni/collectd-4.1' into collectd-4.1
Florian Forster [Tue, 11 Sep 2007 09:46:07 +0000 (11:46 +0200)]
Merge branch 'uni/collectd-4.1' into collectd-4.1

17 years agoMerge branch 'uni/collectd-4.0' into collectd-4.0
Florian Forster [Tue, 11 Sep 2007 09:45:50 +0000 (11:45 +0200)]
Merge branch 'uni/collectd-4.0' into collectd-4.0

17 years agoapcups plugin: Fix the types used in the plugin.
Florian Forster [Tue, 11 Sep 2007 09:14:56 +0000 (11:14 +0200)]
apcups plugin: Fix the types used in the plugin.

They still had an `apcups_' prefix which isn't legal anymore.

17 years agocollectd: Make `mkdir' error messages more identifiable.
Florian Forster [Tue, 11 Sep 2007 09:11:25 +0000 (11:11 +0200)]
collectd: Make `mkdir' error messages more identifiable.

17 years agonetlink plugin: Fix an error-message.
Florian Forster [Tue, 11 Sep 2007 09:09:32 +0000 (11:09 +0200)]
netlink plugin: Fix an error-message.

17 years agoChangeLog: Documented the changes since 4.1.0.
Florian Forster [Mon, 10 Sep 2007 08:49:51 +0000 (10:49 +0200)]
ChangeLog: Documented the changes since 4.1.0.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Mon, 10 Sep 2007 08:43:49 +0000 (10:43 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

ChangeLog

17 years agoChangeLog: Fix a merge bug.
Florian Forster [Mon, 10 Sep 2007 08:43:19 +0000 (10:43 +0200)]
ChangeLog: Fix a merge bug.

17 years agoChangeLog: Added a note about the improved `sstrerror' function.
Florian Forster [Mon, 10 Sep 2007 08:41:39 +0000 (10:41 +0200)]
ChangeLog: Added a note about the improved `sstrerror' function.

17 years agocontrib/collection.cgi: Fix a bug in the `meta_graph_generic_stack' function.
Florian Forster [Wed, 5 Sep 2007 07:30:01 +0000 (09:30 +0200)]
contrib/collection.cgi: Fix a bug in the `meta_graph_generic_stack' function.

Also add a meta-graph-handler for if_[rt]x_errors.

17 years agoMerge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Tue, 4 Sep 2007 21:46:12 +0000 (23:46 +0200)]
Merge branch 'pull/collectd-4.1' into collectd-4.1

17 years agobuild system: Include <adm/types.h> when checking for `libnetlink.h'.
Florian Forster [Tue, 4 Sep 2007 21:44:50 +0000 (23:44 +0200)]
build system: Include <adm/types.h> when checking for `libnetlink.h'.

17 years agonetlink plugin: Use the defines to determine where the `libnetlink.h' is.
Florian Forster [Tue, 4 Sep 2007 08:32:13 +0000 (10:32 +0200)]
netlink plugin: Use the defines to determine where the `libnetlink.h' is.

17 years agobuild system: Check for libnetlink.h in more than one directory.
Florian Forster [Tue, 4 Sep 2007 08:31:38 +0000 (10:31 +0200)]
build system: Check for libnetlink.h in more than one directory.

And some minor cleanups..

17 years agobuild system: Some cosmetic fixes for the libupsclient.
Florian Forster [Tue, 4 Sep 2007 08:14:22 +0000 (10:14 +0200)]
build system: Some cosmetic fixes for the libupsclient.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Mon, 3 Sep 2007 14:00:51 +0000 (16:00 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

17 years agoMerge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Mon, 3 Sep 2007 14:00:23 +0000 (16:00 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0

17 years agosrc/plugin.c: plugin_dispatch_values: Include the interval in the debugging output.
Florian Forster [Mon, 3 Sep 2007 14:00:11 +0000 (16:00 +0200)]
src/plugin.c: plugin_dispatch_values: Include the interval in the debugging output.

17 years agoexec plugin: Set the real group, effective group, and real and effective user.
Florian Forster [Mon, 3 Sep 2007 13:59:08 +0000 (15:59 +0200)]
exec plugin: Set the real group, effective group, and real and effective user.

In that order. The manpage and the config template have been updated.

17 years agoexec plugin: Call `setgid' first so argitary groups can be configured.
Florian Forster [Fri, 31 Aug 2007 09:52:31 +0000 (11:52 +0200)]
exec plugin: Call `setgid' first so argitary groups can be configured.

17 years agosstrerror: Be even more cautios with the return value of `strerror_r'..
Florian Forster [Mon, 3 Sep 2007 12:44:53 +0000 (14:44 +0200)]
sstrerror: Be even more cautios with the return value of `strerror_r'..

I don't trust this GNU implementation one bit.. ;)

17 years agocontrib/collection.cgi: Display MySQL traffic as bits/s, not bytes/s.
Florian Forster [Sun, 2 Sep 2007 17:43:03 +0000 (19:43 +0200)]
contrib/collection.cgi: Display MySQL traffic as bits/s, not bytes/s.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Sun, 2 Sep 2007 17:28:25 +0000 (19:28 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

17 years agocontrib/collection.cgi: Added meta graph handlers for nfs_procedure, ps_state, swap...
Florian Forster [Sun, 2 Sep 2007 17:28:09 +0000 (19:28 +0200)]
contrib/collection.cgi: Added meta graph handlers for nfs_procedure, ps_state, swap, mysql_commands, and mysql_handler.

17 years agosrc/common.c: Copy the error-string to the buffer - no matter which implementation...
Florian Forster [Sun, 2 Sep 2007 16:38:47 +0000 (18:38 +0200)]
src/common.c: Copy the error-string to the buffer - no matter which implementation is used.

17 years agoChangeLog: Fix a typo.
Ulf Zimmermann [Sun, 2 Sep 2007 16:22:24 +0000 (18:22 +0200)]
ChangeLog: Fix a typo.

17 years agoMerge branch 'collectd-4.0' into collectd-4.1
Florian Forster [Sun, 2 Sep 2007 16:15:36 +0000 (18:15 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

contrib/collection.cgi

17 years agoREADME: Added libnetlink, libnetsnmp and libxmms prerequisites.
Sebastian Harl [Sun, 2 Sep 2007 16:07:43 +0000 (18:07 +0200)]
README: Added libnetlink, libnetsnmp and libxmms prerequisites.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocontrib/collection.cgi: Don't show all the plugins on the host's page.
Florian Forster [Sun, 2 Sep 2007 16:01:05 +0000 (18:01 +0200)]
contrib/collection.cgi: Don't show all the plugins on the host's page.

Waiting for so many graphs to load is no fun. You _have_ to specify the plugins
you're interested in now.

17 years agocontrib/collection.cgi: Quite some changes, but still incomplete and not very usable..
Florian Forster [Sat, 1 Sep 2007 18:59:27 +0000 (20:59 +0200)]
contrib/collection.cgi: Quite some changes, but still incomplete and not very usable..

17 years agoMerge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Sun, 2 Sep 2007 15:55:38 +0000 (17:55 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0

17 years agoAdded the AC_FUNC_STRERROR_R check.
Sebastian Harl [Sun, 2 Sep 2007 14:24:28 +0000 (16:24 +0200)]
Added the AC_FUNC_STRERROR_R check.

Even though Posix requires "strerror_r" to return an "int", some systems
(e.g. the GNU libc) return a "char *" _and_ ignore the second argument.

sstrerror() (in src/common.c) has been changed to be aware of this and
handle both cases correctly.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoAdded "snmp" and "xmms" plugins to README and src/collectd.conf.in.
Sebastian Harl [Sun, 2 Sep 2007 15:23:53 +0000 (17:23 +0200)]
Added "snmp" and "xmms" plugins to README and src/collectd.conf.in.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoChangeLog: Added a note about the queueing changes to the rrdtool plugin. collectd-4.1.0
Florian Forster [Sat, 1 Sep 2007 21:42:55 +0000 (23:42 +0200)]
ChangeLog: Added a note about the queueing changes to the rrdtool plugin.

17 years agocollectd(1): Add some references to collectd-snmp(5).
Florian Forster [Sat, 1 Sep 2007 21:42:31 +0000 (23:42 +0200)]
collectd(1): Add some references to collectd-snmp(5).

17 years agocollectd.conf(5): Add some more references to collectd-snmp(5).
Florian Forster [Sat, 1 Sep 2007 21:42:01 +0000 (23:42 +0200)]
collectd.conf(5): Add some more references to collectd-snmp(5).

17 years agoBumped version to 4.1.0; Updated ChangeLog.
Florian Forster [Sat, 1 Sep 2007 20:01:24 +0000 (22:01 +0200)]
Bumped version to 4.1.0; Updated ChangeLog.

17 years agocollectd-snmp(5): Update the documentation.
Florian Forster [Sat, 1 Sep 2007 19:44:59 +0000 (21:44 +0200)]
collectd-snmp(5): Update the documentation.

17 years agoMerge branch 'collectd-4.0'
Florian Forster [Sat, 1 Sep 2007 19:00:46 +0000 (21:00 +0200)]
Merge branch 'collectd-4.0'

17 years agoMerge branch 'pull/master'
Florian Forster [Sat, 1 Sep 2007 19:00:40 +0000 (21:00 +0200)]
Merge branch 'pull/master'

17 years agoMerge branch 'pull/master'
Florian Forster [Sat, 1 Sep 2007 18:59:45 +0000 (20:59 +0200)]
Merge branch 'pull/master'

17 years agocontrib/collection.cgi: Quite some changes, but still incomplete and not very usable..
Florian Forster [Sat, 1 Sep 2007 18:59:27 +0000 (20:59 +0200)]
contrib/collection.cgi: Quite some changes, but still incomplete and not very usable..

17 years agosrc/plugin.c: Remove a legacy debug message.
Florian Forster [Sat, 1 Sep 2007 18:54:35 +0000 (20:54 +0200)]
src/plugin.c: Remove a legacy debug message.

17 years agonetlink plugin: Removed unused code.
Florian Forster [Sat, 1 Sep 2007 18:53:52 +0000 (20:53 +0200)]
netlink plugin: Removed unused code.

17 years agoChangeLog, README: Added the netlink plugin.
Florian Forster [Sat, 1 Sep 2007 13:41:22 +0000 (15:41 +0200)]
ChangeLog, README: Added the netlink plugin.

17 years agobuild system: Fix linking with the libnetlib library.
Florian Forster [Sat, 1 Sep 2007 13:41:00 +0000 (15:41 +0200)]
build system: Fix linking with the libnetlib library.

17 years agonetlink plugin: Fix several issues, including the collection of classes and filters.
Florian Forster [Sat, 1 Sep 2007 13:39:38 +0000 (15:39 +0200)]
netlink plugin: Fix several issues, including the collection of classes and filters.

When requesting qdiscs for ifindex == 0 you get the qdiscs of all interfaces.
The same doesn't work for classes and filters.
This commit changes the behavior to iterate over a list of interfaces and
request qdiscs, classes and filters for each interface seperately. The
ignorelist is checked before sending a request to avoid unnecessary requests.

Newlines have been removed from error messages.

17 years agobuild system: Correct the detection of Mac OS X.
Florian Forster [Sat, 1 Sep 2007 10:00:24 +0000 (12:00 +0200)]
build system: Correct the detection of Mac OS X.

17 years agoMerge branch 'pull/master'
Florian Forster [Sat, 1 Sep 2007 09:07:58 +0000 (11:07 +0200)]
Merge branch 'pull/master'

17 years agobuild system: Skip a lot of Mac OS X only header checks when not on Mac OS X.
Florian Forster [Sat, 1 Sep 2007 09:07:40 +0000 (11:07 +0200)]
build system: Skip a lot of Mac OS X only header checks when not on Mac OS X.

17 years agobuild system: Improve detection of the libnetlink library.
Florian Forster [Sat, 1 Sep 2007 08:57:45 +0000 (10:57 +0200)]
build system: Improve detection of the libnetlink library.

17 years agoMerge branch 'collectd-4.0'
Florian Forster [Fri, 31 Aug 2007 14:10:33 +0000 (16:10 +0200)]
Merge branch 'collectd-4.0'

17 years agocollectd.conf(5): Undo the changes of the previous merge.
Florian Forster [Fri, 31 Aug 2007 14:09:53 +0000 (16:09 +0200)]
collectd.conf(5): Undo the changes of the previous merge.

This problem doesn't exist in this version.

17 years agoMerge branch 'collectd-3.11' into collectd-4.0
Florian Forster [Fri, 31 Aug 2007 14:08:37 +0000 (16:08 +0200)]
Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

ChangeLog
configure.in

17 years agoBumped version to 3.11.6; Updated ChangeLog. collectd-3.11.6
Florian Forster [Fri, 31 Aug 2007 10:17:48 +0000 (12:17 +0200)]
Bumped version to 3.11.6; Updated ChangeLog.

17 years agonetlink plugin: Yet another fix. `if_dropped' was getting bytes..
Florian Forster [Fri, 31 Aug 2007 08:42:01 +0000 (10:42 +0200)]
netlink plugin: Yet another fix. `if_dropped' was getting bytes..

17 years agonetlink plugin: Fix the submitted values.
Florian Forster [Thu, 30 Aug 2007 21:35:39 +0000 (23:35 +0200)]
netlink plugin: Fix the submitted values.

17 years agoconfigure.in: Display wether the netlink library was found or not.
Florian Forster [Thu, 30 Aug 2007 13:42:25 +0000 (15:42 +0200)]
configure.in: Display wether the netlink library was found or not.

17 years agosrc/types.db: Added the new types introduced by the netlink plugin.
Florian Forster [Thu, 30 Aug 2007 13:42:05 +0000 (15:42 +0200)]
src/types.db: Added the new types introduced by the netlink plugin.

17 years agocollectd.conf(5): Added informatioin about the netlink plugin.
Florian Forster [Thu, 30 Aug 2007 13:41:40 +0000 (15:41 +0200)]
collectd.conf(5): Added informatioin about the netlink plugin.

src/collectd.conf.in has been updated, too.

17 years agonetlink plugin: Use the parent's classid for `filter'.
Florian Forster [Thu, 30 Aug 2007 13:40:54 +0000 (15:40 +0200)]
netlink plugin: Use the parent's classid for `filter'.

Also added the remaining statistics for `VerboseInterface'.

17 years agonetlink plugin: Added a plugin for (very) enhanced Linux traffic statistics.
Florian Forster [Wed, 29 Aug 2007 20:34:47 +0000 (22:34 +0200)]
netlink plugin: Added a plugin for (very) enhanced Linux traffic statistics.

This plugin uses the netlink sockets provided by Linux 2.2 and later to get
information about the links, qdiscs, classes, and filters in the network stack
of a Linux system. With this plugin it's possible to get some _very_ detailed
statistics.

Still to do: Update the `types.db', `collectd.conf(5)', and `configure.conf.in'.

17 years agoutils_cmd_putval.c: Fixed a copy&paste error.
Sebastian Harl [Tue, 28 Aug 2007 17:05:19 +0000 (19:05 +0200)]
utils_cmd_putval.c: Fixed a copy&paste error.

"unixsock plugin" is supposed to be "cmd putval".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
17 years agosrc/Makefile.am: Added utils_cmd_putval to exec_la_SOURCES.
Sebastian Harl [Tue, 28 Aug 2007 17:04:53 +0000 (19:04 +0200)]
src/Makefile.am: Added utils_cmd_putval to exec_la_SOURCES.

Without this, utils_cmd_putval will not be linked into the exec plugin and the
"handle_putval" symbol will not be available at runtime.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
17 years agoexec plugin: Fixed a "control reaches end of non-void function" warning.
Sebastian Harl [Tue, 28 Aug 2007 17:04:19 +0000 (19:04 +0200)]
exec plugin: Fixed a "control reaches end of non-void function" warning.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
17 years ago[PATCH 2/2] collectd.conf.pod: Documented the exec plugin's group support.
Sebastian Harl [Tue, 28 Aug 2007 16:56:22 +0000 (18:56 +0200)]
[PATCH 2/2] collectd.conf.pod: Documented the exec plugin's group support.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
17 years ago[PATCH 1/2] exec plugin: Added support to specify a group as well.
Sebastian Harl [Tue, 28 Aug 2007 16:54:53 +0000 (18:54 +0200)]
[PATCH 1/2] exec plugin: Added support to specify a group as well.

Now, the user and group as which the process should be executed can be
specified as the first argument to the "Exec" config option. The syntax is
identical to the one used by GNU's chown(1).

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
17 years agoMerge branch 'collectd-4.0'
Florian Forster [Tue, 28 Aug 2007 22:02:21 +0000 (00:02 +0200)]
Merge branch 'collectd-4.0'

Conflicts:

ChangeLog
configure.in
src/Makefile.am
src/collectd-unixsock.pod
src/mysql.c
src/nut.c

17 years agoChangeLog: Added a short note about the fix in the processes plugin. collectd-4.0.7
Florian Forster [Tue, 28 Aug 2007 13:23:48 +0000 (15:23 +0200)]
ChangeLog: Added a short note about the fix in the processes plugin.

17 years agomysql plugin: Use a different define to determine if the read functionality should...
Florian Forster [Tue, 28 Aug 2007 13:18:27 +0000 (15:18 +0200)]
mysql plugin: Use a different define to determine if the read functionality should be enabled.

17 years agocollectd.conf(5): Added a note about that trailing whitespace bug.
Florian Forster [Mon, 27 Aug 2007 15:02:04 +0000 (17:02 +0200)]
collectd.conf(5): Added a note about that trailing whitespace bug.

17 years agoBumped version to 4.0.7; Updated ChangeLog.
Florian Forster [Sun, 26 Aug 2007 17:40:19 +0000 (19:40 +0200)]
Bumped version to 4.0.7; Updated ChangeLog.

17 years agoMerge branch 'collectd-3.11' into collectd-4.0
Florian Forster [Sun, 26 Aug 2007 17:07:46 +0000 (19:07 +0200)]
Merge branch 'collectd-3.11' into collectd-4.0

17 years agoprocesses plugin: Fix a possible segfault.
Florian Forster [Sun, 26 Aug 2007 17:07:10 +0000 (19:07 +0200)]
processes plugin: Fix a possible segfault.

17 years agobuild system: Several fixes for libcurl, libmysql, and libupsclient.
Florian Forster [Sun, 26 Aug 2007 13:14:36 +0000 (15:14 +0200)]
build system: Several fixes for libcurl, libmysql, and libupsclient.

libcurl:      Check for CFLAGS using `curl-config --cflags' and use these
      CFLAGS when checking for <curl/curl.h> to allow for weird
      locations of the library.
libmysql:     Cleaned up the checking code.
libupsclient: Check if the header file provides `UPSCONN' or `UPSCONN_t' and
      use the one available. This should fix compile issues with with
      the nut plugin.

17 years agobuild system: Use the libs provided by `mysql_config' to check for the lib itself.
Florian Forster [Fri, 24 Aug 2007 11:57:19 +0000 (13:57 +0200)]
build system: Use the libs provided by `mysql_config' to check for the lib itself.

17 years agoMerge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Fri, 24 Aug 2007 10:12:40 +0000 (12:12 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0

17 years agobuild system: Use `mysql_config' to find the appropriate flags for MySQL.
Florian Forster [Fri, 24 Aug 2007 10:12:23 +0000 (12:12 +0200)]
build system: Use `mysql_config' to find the appropriate flags for MySQL.