Code

collectd.git
15 years agoMerge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4
Florian Forster [Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)]
Merge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4

15 years agobuild system: Check for the libupsclient library using pkg-config *and* a custom...
Florian Forster [Thu, 29 Jan 2009 15:47:04 +0000 (16:47 +0100)]
build system: Check for the libupsclient library using pkg-config *and* a custom script.

References: #24

15 years agotcpconns plugin: Fix an endianness problem under *BSD.
Florian Forster [Sat, 24 Jan 2009 10:00:30 +0000 (11:00 +0100)]
tcpconns plugin: Fix an endianness problem under *BSD.

The port numbers were assumed to be in the host's byte order, when in
fact they are in network byte order (big endian). The patch adds `ntohs'
where necessary to fix this problem.

Resolves: #35

15 years agoutils_cache: Free then unused memory before returning in an error condition.
Sebastian Harl [Tue, 20 Jan 2009 12:24:54 +0000 (13:24 +0100)]
utils_cache: Free then unused memory before returning in an error condition.

15 years agoutils_cache: Unlock the cache mutex before returning in an error condition.
Sebastian Harl [Tue, 20 Jan 2009 12:20:00 +0000 (13:20 +0100)]
utils_cache: Unlock the cache mutex before returning in an error condition.

15 years agocontrib/cussh.pl: Add the PUTNOTIF command.
Doug MacEachern [Tue, 20 Jan 2009 09:27:10 +0000 (10:27 +0100)]
contrib/cussh.pl: Add the PUTNOTIF command.

I was using this to test notifications for jcollectd like so:
echo "PUTNOTIF host=foo severity=warning message=my perl is rusty" |
perl -Mblib=bindings/perl contrib/cussh.pl

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoascent plugin: Fix a memory leak.
Bruno Prémont [Sat, 17 Jan 2009 10:40:53 +0000 (11:40 +0100)]
ascent plugin: Fix a memory leak.

According to libxml2 API doc, the string returned by
   xmlNodeListGetString()
must be freed by the user with
   xmlFree()

The attached patch adds the missing calls to xmlFree() for the ascent plugin.

15 years agoBumped version to 4.4.5; Updated ChangeLog. collectd-4.4.5
Florian Forster [Fri, 2 Jan 2009 17:31:11 +0000 (18:31 +0100)]
Bumped version to 4.4.5; Updated ChangeLog.

15 years agonetwork plugin: A fix for the buffer problem for version 4.4.
Florian Forster [Tue, 30 Dec 2008 16:13:31 +0000 (17:13 +0100)]
network plugin: A fix for the buffer problem for version 4.4.

This patch fixes the same problem as 6605ff1a, the insufficient copying of
values to the `type' buffer.

Thanks again to Bruno Prémont for reporting and debugging this :)

Resolves: #37

15 years agotypes.db(5): Fix a typo.
Florian Forster [Sat, 20 Dec 2008 12:34:43 +0000 (13:34 +0100)]
types.db(5): Fix a typo.

15 years agotypes.db(5): Explain in more detail how custom types should be added.
Florian Forster [Sat, 20 Dec 2008 10:20:31 +0000 (11:20 +0100)]
types.db(5): Explain in more detail how custom types should be added.

Apparently there was quite some confusion over this.

15 years agoDo not use *printf() to report errors / debugging messages.
Sebastian Harl [Fri, 19 Dec 2008 17:20:41 +0000 (18:20 +0100)]
Do not use *printf() to report errors / debugging messages.

The only exception to that is during configuration (which is done before
daemonization) to let the user know about problems immediately.

15 years agocollectd.conf(5): Updated the section about the "mysql" plugin.
Sebastian Harl [Fri, 19 Dec 2008 16:00:56 +0000 (17:00 +0100)]
collectd.conf(5): Updated the section about the "mysql" plugin.

 * Do not talk about what RRD files things end up in - there is more than
   "rrdtool" by now.
 * Updated the section number of the "Server Status Variables" in the MySQL
   reference manual.
 * Mention that the MySQL user does not need any special privileges.

15 years agocollectd: Abort with an appropriate status in exit_usage().
Sebastian Harl [Wed, 10 Dec 2008 21:12:24 +0000 (22:12 +0100)]
collectd: Abort with an appropriate status in exit_usage().

In case of an error, the exit status code now equals 1.

15 years agocollectd: Abort if any non-options are left over after command-line parsing.
Sebastian Harl [Wed, 10 Dec 2008 21:08:26 +0000 (22:08 +0100)]
collectd: Abort if any non-options are left over after command-line parsing.

This happens if any arguments not starting with a dash are passed to collectd.
Any of those are invalid, so let the user know about that.

Thanks to Kris (gruntruk) for (unknowingly) pointing that out ;-)

15 years agocollectd.conf.in: Fixed a wrong type used in the "tail" example.
Sebastian Harl [Sat, 6 Dec 2008 15:41:04 +0000 (16:41 +0100)]
collectd.conf.in: Fixed a wrong type used in the "tail" example.

15 years agocollectd.conf.pod: Consistently use spaces instead of tabs in examples.
Sebastian Harl [Sat, 6 Dec 2008 15:32:27 +0000 (16:32 +0100)]
collectd.conf.pod: Consistently use spaces instead of tabs in examples.

15 years agounixsock plugin: Make sure the initialization function is run only once.
Florian Forster [Fri, 5 Dec 2008 10:29:54 +0000 (11:29 +0100)]
unixsock plugin: Make sure the initialization function is run only once.

If called multiple times, the global `sock_fd' variable will be re-set,
breaking the plugin.

15 years agoconfigure.in: Some improvements for Solaris, expecially the swap plugin.
Florian Forster [Wed, 3 Dec 2008 21:07:24 +0000 (22:07 +0100)]
configure.in: Some improvements for Solaris, expecially the swap plugin.

If Solaris is detected, "-D_POSIX_PTHREAD_SEMANTICS" will be added to
CPPFLAGS automatically now.

If sys/swap.h is not found, print a message suggesting to build a 64bit
binary. (sys/swap.h cannot be included when a 32bit binary is being built,
but it's most likely present under Solaris.)

Enable the swap plugin only if sys/swap.h has been found (when under
Solaris).

16 years agomultimeter plugin: Check the return value of `write'.
Florian Forster [Mon, 24 Nov 2008 18:23:25 +0000 (19:23 +0100)]
multimeter plugin: Check the return value of `write'.

This resolves warnings when compiling on GNU with:
  CPPFLAGS="-D_FORTIFY_SOURCE"

16 years agocontrib/collection.cgi: Add meta-graph definitions for the vmem plugin.
Mirko Buffoni [Sun, 16 Nov 2008 09:40:32 +0000 (10:40 +0100)]
contrib/collection.cgi: Add meta-graph definitions for the vmem plugin.

16 years agocontrib/collection.cgi: Add graph definitions for the vmem plugin.
Mirko Buffoni [Sun, 16 Nov 2008 09:39:39 +0000 (10:39 +0100)]
contrib/collection.cgi: Add graph definitions for the vmem plugin.

16 years agoconfigure, mysql plugin: Check for mysql.h as well.
Sebastian Harl [Sat, 1 Nov 2008 10:28:30 +0000 (11:28 +0100)]
configure, mysql plugin: Check for mysql.h as well.

Up to now, only mysql/mysql.h has been checked for. However, mysql_config
--cflags usually adds the complete path to mysql.h to the include flags. In
most setups, mysql/mysql.h can be found in the search path as well (usually
the header is available in something like /usr/include/mysql/mysql.h) so this
issue has not been found so far. However, if that's not the case, the build
will fail.

Thanks to Dusty Doris <collectd@dusty.name> for reporting this.

16 years agocontrib/collection3: Add the `format' parameter to the graph.cgi.
Florian Forster [Fri, 31 Oct 2008 17:05:39 +0000 (18:05 +0100)]
contrib/collection3: Add the `format' parameter to the graph.cgi.

With this parameter one can specify the file format the graph is returned in,
for example `format=SVG' for an SVG image.

16 years agoapcups plugin: Include "collectd.h" *before" <stdlib.h>.
Florian Forster [Fri, 31 Oct 2008 14:44:53 +0000 (15:44 +0100)]
apcups plugin: Include "collectd.h" *before" <stdlib.h>.

If not defined, <stdlib.h> sets/defines _FILE_OFFSET_BITS. Since (in 32bit
mode) "collectd.h" defines that, too, you'll run into compilation problems.

16 years agosrc/utils_dns.c: Cast a `char' to `int' when using `tolower'.
Ulrich Habel [Wed, 29 Oct 2008 05:54:26 +0000 (06:54 +0100)]
src/utils_dns.c: Cast a `char' to `int' when using `tolower'.

This is needed at least on NetBSD, but probably on other non-GNU libcs as well.

Resolves: #32

16 years agolibiptc/libip6tc.c: Fix a glibc 2.8 compatibility problem.
Devid Antonio Filoni [Sat, 18 Oct 2008 20:01:53 +0000 (22:01 +0200)]
libiptc/libip6tc.c: Fix a glibc 2.8 compatibility problem.

Hi,
the attached patch fix the build with glibc 2.8. Please include it in
the next version.

Thanks,
Devid Antonio Filoni

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/configfile.c: Fix a closing-brace comment.
Florian Forster [Mon, 20 Oct 2008 06:42:11 +0000 (08:42 +0200)]
src/configfile.c: Fix a closing-brace comment.

16 years agoChangeLog: Fix a typo.
Florian Forster [Thu, 16 Oct 2008 21:16:38 +0000 (23:16 +0200)]
ChangeLog: Fix a typo.

16 years agoChangeLog: Added the changed poisoning behavior. collectd-4.4.4
Florian Forster [Thu, 16 Oct 2008 20:07:59 +0000 (22:07 +0200)]
ChangeLog: Added the changed poisoning behavior.

16 years agosrc/collectd.h: Poison various insecure string functions only when debugging is enabled.
Florian Forster [Thu, 16 Oct 2008 20:04:46 +0000 (22:04 +0200)]
src/collectd.h: Poison various insecure string functions only when debugging is enabled.

Because the `poison' pragma complains about macros (which are then never
used), this feature does more harm than good in everyday use. So we'll
only activate it when building in debug mode, so hopefully authors of
new plugins will use this.

16 years agoBumped version to 4.4.4; Updated ChangeLog.
Florian Forster [Thu, 16 Oct 2008 19:41:47 +0000 (21:41 +0200)]
Bumped version to 4.4.4; Updated ChangeLog.

16 years agocontrib/exec-munin.px: Fix the folding markers..
Florian Forster [Thu, 16 Oct 2008 07:51:33 +0000 (09:51 +0200)]
contrib/exec-munin.px: Fix the folding markers..

16 years agosrc/utils_tail.c: Call `clearerr' before `fgets'.
Florian Forster [Fri, 10 Oct 2008 10:40:38 +0000 (12:40 +0200)]
src/utils_tail.c: Call `clearerr' before `fgets'.

Hopefully this will resolve problems under the dietlibc.

16 years agosrc/Makefile.am: Fix a copy'n'paste typo.
Florian Forster [Fri, 10 Oct 2008 07:29:10 +0000 (09:29 +0200)]
src/Makefile.am: Fix a copy'n'paste typo.

16 years agotypes.db: Reintroduced the "spam_check" type.
Sebastian Harl [Wed, 8 Oct 2008 13:46:39 +0000 (15:46 +0200)]
types.db: Reintroduced the "spam_check" type.

This is used by the "email" plugin. Apparently, it got lost when converting
the plugin to the v4 interface: Instead of "spam_check", "email_check" had
been added to types.db. I did not remove "email_check" though as this would
introduce a regression - though very unlikely, somebody out there might be
using that type.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollection.cgi: Added support for the "connection" type.
Sebastian Harl [Wed, 8 Oct 2008 10:23:08 +0000 (12:23 +0200)]
collection.cgi: Added support for the "connection" type.

This is used e.g. by the "ipvs" plugin.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/utils_cache.c: Fix a serious memory leak.
Florian Forster [Fri, 10 Oct 2008 06:17:22 +0000 (08:17 +0200)]
src/utils_cache.c: Fix a serious memory leak.

Whenever a data set went missing, the its name (the `key'; up to (5*64)+4
bytes) was not free'd.

Thanks to Niraj Tolia for reporting this :)

16 years agosrc/configfile.c: Fix a minor memory leak.
Florian Forster [Thu, 9 Oct 2008 06:43:48 +0000 (08:43 +0200)]
src/configfile.c: Fix a minor memory leak.

Thanks to Niraj Tolia for reporting this :)

16 years agonetwork plugin: Fix a minor memory leak.
Florian Forster [Thu, 9 Oct 2008 06:43:20 +0000 (08:43 +0200)]
network plugin: Fix a minor memory leak.

Thanks to Niraj Tolia for reporting this :)

16 years agocollectd-nagios(1): Make the documentation easier to read, more correct and fix errors.
Florian Forster [Mon, 6 Oct 2008 21:53:37 +0000 (23:53 +0200)]
collectd-nagios(1): Make the documentation easier to read, more correct and fix errors.

16 years agoconfigure.in: Correct the `--enable-<plugin>' code.
Florian Forster [Mon, 6 Oct 2008 13:35:42 +0000 (15:35 +0200)]
configure.in: Correct the `--enable-<plugin>' code.

The new behavior is documented in the `README' file, too.

16 years agoconfigure.in: Let configure bail out on missing dependencies
Bruno Prémont [Sun, 5 Oct 2008 12:09:08 +0000 (14:09 +0200)]
configure.in: Let configure bail out on missing dependencies

The patch below adds check in AC_PLUGIN() that verifies if the
dependencies are met for any enabled plugin.

In case some dependency is missing (default is disabled and enabled
is selected) configure will fail after dumping summary so all
dependency issues are visible in a single configure pass.

A later addition would be to list requirements (dependencies, OS/Kernel
restrictions) for all plugins in an easily accessible location (e.g.
INSTALL file)

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/collectd-nagios.c: Improve handling of lines returned from `GETVAL'.
Florian Forster [Mon, 6 Oct 2008 09:46:59 +0000 (11:46 +0200)]
src/collectd-nagios.c: Improve handling of lines returned from `GETVAL'.

Then selecting only certain data sources with the `-d' option, the program
would try to read more lines from the server than the server reports, resulting
in the communication never finishing.

This patch resolves that problem and introduces a couple other error handling
blocks.

Thanks to Fabian Linzberger for pointing this out.

16 years agonetlink plugin: Fix an incorrect format string.
Florian Forster [Sun, 5 Oct 2008 10:12:52 +0000 (12:12 +0200)]
netlink plugin: Fix an incorrect format string.

16 years agosrc/utils_ignorelist.c: Fix an off-by-one errror when adding regular expressions.
Florian Forster [Fri, 3 Oct 2008 21:11:47 +0000 (23:11 +0200)]
src/utils_ignorelist.c: Fix an off-by-one errror when adding regular expressions.

Resolves: #20

16 years agocollectdmon: Do not block SIGCHLD.
Sebastian Harl [Thu, 2 Oct 2008 13:25:10 +0000 (15:25 +0200)]
collectdmon: Do not block SIGCHLD.

There is no reason to do so as we do not need to synchronize any waitpid()
calls. In fact, doing so was wrong because waitpid() should then return with
an error according to POSIX. This was still working so far since waitpid()
would not return until all children terminated and this is all we really care
about.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollectd.conf(5): Briefly document "OKAY"-notifications.
Sebastian Harl [Thu, 2 Oct 2008 13:05:51 +0000 (15:05 +0200)]
collectd.conf(5): Briefly document "OKAY"-notifications.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoipvs plugin: Use sizeof() instead of a constant.
Sebastian Harl [Thu, 2 Oct 2008 12:54:06 +0000 (14:54 +0200)]
ipvs plugin: Use sizeof() instead of a constant.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agobuild.sh: Check for more (all?) programs needed.
Florian Forster [Fri, 3 Oct 2008 11:30:58 +0000 (13:30 +0200)]
build.sh: Check for more (all?) programs needed.

16 years agocollection.cgi: Added support for the memcached-specific types.
Sebastian Harl [Sat, 20 Sep 2008 14:34:39 +0000 (16:34 +0200)]
collection.cgi: Added support for the memcached-specific types.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/plugin.c: Increase the plugin_log() message buffer to 1024 bytes.
Sebastian Harl [Tue, 16 Sep 2008 13:38:48 +0000 (15:38 +0200)]
src/plugin.c: Increase the plugin_log() message buffer to 1024 bytes.

512 bytes is not enough for some perl error messages.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoperl plugin: Log the perl error messages if bootstrapping Collectd failed.
Sebastian Harl [Tue, 16 Sep 2008 13:36:18 +0000 (15:36 +0200)]
perl plugin: Log the perl error messages if bootstrapping Collectd failed.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocontrib/collection3: Added graphs for `apache_{bytes,requests}'.
Florian Forster [Mon, 22 Sep 2008 12:00:31 +0000 (14:00 +0200)]
contrib/collection3: Added graphs for `apache_{bytes,requests}'.

16 years agocontrib/collection3: Use `instance' rather than `plugin_instance'
Florian Forster [Mon, 22 Sep 2008 12:00:02 +0000 (14:00 +0200)]
contrib/collection3: Use `instance' rather than `plugin_instance'

for all the `disk_*' graphs.

16 years agocollection3/etc/collection.conf: Added some mysql stuff.
Florian Forster [Wed, 17 Sep 2008 11:42:59 +0000 (13:42 +0200)]
collection3/etc/collection.conf: Added some mysql stuff.

16 years agocollectd.conf(5): Changed the default socket paths of the powerdns plugin.
Florian Forster [Fri, 12 Sep 2008 14:27:35 +0000 (16:27 +0200)]
collectd.conf(5): Changed the default socket paths of the powerdns plugin.

16 years agopowerdns plugin: Use `LOCALSTATEDIR' instead of "/var".
Boian Berberov [Fri, 12 Sep 2008 14:20:10 +0000 (16:20 +0200)]
powerdns plugin: Use `LOCALSTATEDIR' instead of "/var".

I was working on updating Gentoo's ebuild and I noticed that localstatedir was
not used in certain places.  Please review these patches and consider them.

Boian Berberov

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Thu, 4 Sep 2008 13:01:06 +0000 (15:01 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agoprocesses plugin: Fix a format string.
Florian Forster [Thu, 4 Sep 2008 13:00:40 +0000 (15:00 +0200)]
processes plugin: Fix a format string.

16 years agoBumped version to 4.4.3; Updated ChangeLog. collectd-4.4.3
Florian Forster [Mon, 1 Sep 2008 11:37:27 +0000 (13:37 +0200)]
Bumped version to 4.4.3; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Mon, 1 Sep 2008 06:04:10 +0000 (08:04 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

ChangeLog
version-gen.sh

16 years agoChangeLog: Entry for 4.3.4: Bring plugins in alphabetical order.
Florian Forster [Mon, 1 Sep 2008 06:01:33 +0000 (08:01 +0200)]
ChangeLog: Entry for 4.3.4: Bring plugins in alphabetical order.

16 years agoBumped version to 4.3.3; Updated ChangeLog. collectd-4.3.4
Florian Forster [Sun, 31 Aug 2008 13:11:15 +0000 (15:11 +0200)]
Bumped version to 4.3.3; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Wed, 27 Aug 2008 08:12:55 +0000 (10:12 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years ago.gitignore: Added collectd-nagios, collectdmon and perl stuff.
Sebastian Harl [Tue, 26 Aug 2008 13:52:11 +0000 (15:52 +0200)]
.gitignore: Added collectd-nagios, collectdmon and perl stuff.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollectd.conf.in: Moved logging plugins to the top of the file.
Sebastian Harl [Tue, 26 Aug 2008 13:51:27 +0000 (15:51 +0200)]
collectd.conf.in: Moved logging plugins to the top of the file.

This will make all logging output of all other plugins available.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoperl plugin: Re-get the perl interpreter after parsing each configuration option.
Sebastian Harl [Tue, 26 Aug 2008 09:52:53 +0000 (11:52 +0200)]
perl plugin: Re-get the perl interpreter after parsing each configuration option.

The current perl interpreter might change while parsing the configuration
(e.g. the first interpreter is created by the "LoadPlugin" option), so this is
to make sure that we're using the right interpreter at all times.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocontrib/snmp-probe-host.px: Don't fail silently, but outupt an empty config.
Florian Forster [Tue, 26 Aug 2008 15:59:18 +0000 (17:59 +0200)]
contrib/snmp-probe-host.px: Don't fail silently, but outupt an empty config.

16 years agocontrib/snmp-probe-host.px: Work-around for Windows systems.
Florian Forster [Tue, 26 Aug 2008 15:58:28 +0000 (17:58 +0200)]
contrib/snmp-probe-host.px: Work-around for Windows systems.

They don't return an error, but `success' and a string stating
  NOSUCHOBJECT.
Just great.

16 years agocontrib/snmp-probe-host.px: Fix for `table' data without instance.
Florian Forster [Tue, 26 Aug 2008 15:57:38 +0000 (17:57 +0200)]
contrib/snmp-probe-host.px: Fix for `table' data without instance.

16 years agoCollectd::Unixsock: Allow passing of `Interval' to `PUTVAL'.
Jarle Bjørgeengen [Mon, 25 Aug 2008 20:30:27 +0000 (22:30 +0200)]
Collectd::Unixsock: Allow passing of `Interval' to `PUTVAL'.

16 years agocollectd.conf(5): Fix an example for the tail plugin.
Florian Forster [Mon, 25 Aug 2008 18:49:19 +0000 (20:49 +0200)]
collectd.conf(5): Fix an example for the tail plugin.

Resolves: #27

16 years agomemcached plugin: Wait for a *little* longer for the memcached to answer.
Florian Forster [Mon, 25 Aug 2008 18:03:12 +0000 (20:03 +0200)]
memcached plugin: Wait for a *little* longer for the memcached to answer.

poll(2) takes a timeout in milliseconds, not seconds. Multiply
`interval_g' by 1000 before passing it to `poll'.

Thanks to Joost Cassee <joost at cassee.net> for helping debug this.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Thu, 21 Aug 2008 15:24:32 +0000 (17:24 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agocontrib/snmp-probe-host.px: Added script to semi-automatically create SNMP "host...
Florian Forster [Thu, 21 Aug 2008 15:14:29 +0000 (17:14 +0200)]
contrib/snmp-probe-host.px: Added script to semi-automatically create SNMP "host" blocks.

Details can be found in the inline documentation ("POD").

16 years agocollectd-exec(5): Fix two typos.
Mohammad Ebrahim Mohammadi Panah [Thu, 21 Aug 2008 14:52:52 +0000 (16:52 +0200)]
collectd-exec(5): Fix two typos.

16 years agosrc/plugin.c: Include the shared object when reporting errors with `lt_dlopen'.
Florian Forster [Thu, 21 Aug 2008 14:08:55 +0000 (16:08 +0200)]
src/plugin.c: Include the shared object when reporting errors with `lt_dlopen'.

16 years agomemcached plugin: Remove an unused variable.
Florian Forster [Wed, 20 Aug 2008 09:52:29 +0000 (11:52 +0200)]
memcached plugin: Remove an unused variable.

Oops.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Wed, 20 Aug 2008 07:20:56 +0000 (09:20 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agomemcached plugin: Fix a possible file descriptor leak.
Florian Forster [Tue, 19 Aug 2008 19:48:45 +0000 (21:48 +0200)]
memcached plugin: Fix a possible file descriptor leak.

Not sure if this fixes the reported bug, but it might.. Feedback would be
welcome.

References: #26

16 years agocontrib/collection3: Added graph description for `ps_rss'.
Florian Forster [Tue, 19 Aug 2008 15:18:57 +0000 (17:18 +0200)]
contrib/collection3: Added graph description for `ps_rss'.

16 years agocontrib/collection3: Added the ability to `flush' data sets.
Florian Forster [Tue, 19 Aug 2008 14:58:43 +0000 (16:58 +0200)]
contrib/collection3: Added the ability to `flush' data sets.

Both, bin/index.cgi and bin/graph.cgi can now send a FLUSH command to
the daemon via the Collectd::Unixsock module. For this to work you will
have to add the path to the UNIX socket of the `unixsock' plugin to the
configuration file `collection.conf'.

The configuration looks like this:
  UnixSockAddr "/var/run/collectd-unixsock"

16 years agocontrib/collection3: Remove an annoying debug message.
Florian Forster [Tue, 19 Aug 2008 14:54:10 +0000 (16:54 +0200)]
contrib/collection3: Remove an annoying debug message.

16 years agocollectd.conf(5): Added documentation for the ipmi plugin.
Peter Holik [Tue, 19 Aug 2008 09:08:53 +0000 (11:08 +0200)]
collectd.conf(5): Added documentation for the ipmi plugin.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/common.h: Make sfree() usable like a function.
Sebastian Harl [Mon, 18 Aug 2008 07:30:03 +0000 (09:30 +0200)]
src/common.h: Make sfree() usable like a function.

By putting the code into a "do { } while (0)" loop it is treated like a single
statement and does not break "if () sfree()" like constructs.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollectd(1), collectd{-exec,.conf}(5): Fixed some minor POD errors.
Sebastian Harl [Sat, 16 Aug 2008 17:35:58 +0000 (19:35 +0200)]
collectd(1), collectd{-exec,.conf}(5): Fixed some minor POD errors.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 19 Aug 2008 07:45:35 +0000 (09:45 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agobuild system: Automatically enable the swap plugin if the kvm library is found.
Florian Forster [Tue, 19 Aug 2008 07:44:56 +0000 (09:44 +0200)]
build system: Automatically enable the swap plugin if the kvm library is found.

This fixes a bug introduced with the previous commit.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 19 Aug 2008 07:26:13 +0000 (09:26 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agoMerge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
Florian Forster [Tue, 19 Aug 2008 07:25:46 +0000 (09:25 +0200)]
Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3

16 years agobuild system: Define which version of libkvm has been checked for.
Florian Forster [Tue, 19 Aug 2008 07:24:33 +0000 (09:24 +0200)]
build system: Define which version of libkvm has been checked for.

The used `kvm_getswapinfo' is apparently an extension not all versions of the
kvm library support.

16 years agotcpconns plugin: Fix another format string.
Florian Forster [Mon, 18 Aug 2008 16:19:26 +0000 (18:19 +0200)]
tcpconns plugin: Fix another format string.

16 years agotcpconns plugin: Fix formatstrings.
Florian Forster [Mon, 18 Aug 2008 14:18:41 +0000 (16:18 +0200)]
tcpconns plugin: Fix formatstrings.

16 years agosnmp plugin: Fix a possible memory leak.
Florian Forster [Mon, 18 Aug 2008 08:48:21 +0000 (10:48 +0200)]
snmp plugin: Fix a possible memory leak.

The result was not freed when `csnmp_instance_list_add' failed. This
rarely happens in 4.3, but later versions will be more strict in the
function, so this became a problem.

16 years agocontrib/collection3: Added a couple more graph definitions.
Florian Forster [Wed, 13 Aug 2008 09:45:45 +0000 (11:45 +0200)]
contrib/collection3: Added a couple more graph definitions.

16 years agocontrib/collection3: Added the forgotten Collectd::Graph::Config module.
Florian Forster [Wed, 13 Aug 2008 07:48:50 +0000 (09:48 +0200)]
contrib/collection3: Added the forgotten Collectd::Graph::Config module.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 12 Aug 2008 09:31:26 +0000 (11:31 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agosrc/utils_threshold.c: Free allocated memory before returning..
Peter Holik [Tue, 12 Aug 2008 09:04:27 +0000 (11:04 +0200)]
src/utils_threshold.c: Free allocated memory before returning..

..in an error condition.

16 years agomemory plugin: The variable is named cache, not cached, at least on libstatgrab ...
Michael Stapelberg [Sat, 9 Aug 2008 12:42:24 +0000 (14:42 +0200)]
memory plugin: The variable is named cache, not cached, at least on libstatgrab >= 0.16

Signed-off-by: Florian Forster <octo@huhu.verplant.org>