Code

collectd.git
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 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 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 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' 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 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>
16 years agoconfigfile.c: Fixed a typo.
Sebastian Harl [Sat, 12 Jul 2008 09:36:04 +0000 (11:36 +0200)]
configfile.c: Fixed a typo.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosnmp plugin: More format string fixes.
Florian Forster [Mon, 14 Jul 2008 17:38:11 +0000 (19:38 +0200)]
snmp plugin: More format string fixes.

16 years agontpd plugin: Use the standard types `uint8_t' etc. instead of `u_char' etc.
Florian Forster [Mon, 14 Jul 2008 15:35:42 +0000 (17:35 +0200)]
ntpd plugin: Use the standard types `uint8_t' etc. instead of `u_char' etc.

16 years agovserver plugin: Use `readdir_r' instead of `readdir'.
Florian Forster [Mon, 14 Jul 2008 15:27:36 +0000 (17:27 +0200)]
vserver plugin: Use `readdir_r' instead of `readdir'.

`readdir' is not thread safe, so use the (more thread safe) `readdir_r'.
Also, don't use the non-standard `d_type' member of the `dirent'
structure - it's not portable.

I'm aware that this plugin is very Linux specific and Linux most likely
will never use another C library than the GNU libc, but using this
member prevents me from compiling with the most restrictive `strict'
settings..

16 years agosrc/{collectd.h,perl.c}: Poison sprintf after perl.h has been included.
Florian Forster [Mon, 14 Jul 2008 13:47:02 +0000 (15:47 +0200)]
src/{collectd.h,perl.c}: Poison sprintf after perl.h has been included.

16 years agosnmp plugin: Fix two format strings.
Florian Forster [Mon, 14 Jul 2008 09:57:41 +0000 (11:57 +0200)]
snmp plugin: Fix two format strings.

16 years agosrc/collectd.h: Don't include <pth.h>.
Florian Forster [Mon, 14 Jul 2008 08:04:37 +0000 (10:04 +0200)]
src/collectd.h: Don't include <pth.h>.

We don't use it, we don't check for it. Why on earth is it still in there..?

16 years agoconfigure.in: Use pkg-config to detect the upsclient library.
Florian Forster [Mon, 14 Jul 2008 07:41:55 +0000 (09:41 +0200)]
configure.in: Use pkg-config to detect the upsclient library.

The libupsclient-config script is gone in newer versions, so we use pkg-config
instead.

16 years agontpd plugin: Fix two format strings.
Florian Forster [Mon, 14 Jul 2008 07:39:47 +0000 (09:39 +0200)]
ntpd plugin: Fix two format strings.

16 years agosrc/plugin.c: Initialize plugins before checking if read callbacks are available.
Sebastian Harl [Wed, 2 Jul 2008 14:26:46 +0000 (16:26 +0200)]
src/plugin.c: Initialize plugins before checking if read callbacks are available.

plugin_init_all() checks if any read callbacks are available before starting
the read threads. A few plugins register their read callback from their
init callback though. By initializing the plugins before that the read
threads are still started correctly if all plugins register the read
callback in the init callback.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agorrdtool plugin: Use a hack to case the `argv' pointers in a portable way.
Florian Forster [Wed, 2 Jul 2008 13:21:55 +0000 (15:21 +0200)]
rrdtool plugin: Use a hack to case the `argv' pointers in a portable way.

16 years agoemail plugin: Don't unlink the socket file on startup.
Sebastian Harl [Tue, 17 Jun 2008 17:59:14 +0000 (19:59 +0200)]
email plugin: Don't unlink the socket file on startup.

Usually, collectd runs as user root, thus making it an unsafe operation to
unconditionally remove the file even though one should be able to assume
that it "belongs" to collectd.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/common.c: Not enough memory is an error, not a debug message!
Florian Forster [Fri, 20 Jun 2008 12:47:16 +0000 (14:47 +0200)]
src/common.c: Not enough memory is an error, not a debug message!

16 years agocontrib/examples/: Be more verbose about how to handle types.
Sebastian Harl [Mon, 16 Jun 2008 21:35:28 +0000 (23:35 +0200)]
contrib/examples/: Be more verbose about how to handle types.

As suggested by Wolfgang Kroener.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/common.c: Add end-of-line characters to strsplit()
Michał Mirosław [Sat, 14 Jun 2008 00:29:05 +0000 (02:29 +0200)]
src/common.c: Add end-of-line characters to strsplit()

This fixes plugins that use it to break lines read using fgets()
and forget that "\n" is left at the buffer's end. At least
battery and wireless plugins is affected.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/collectd.conf.in: Fix the NotificationExec example.
Florian Forster [Fri, 13 Jun 2008 12:57:39 +0000 (14:57 +0200)]
src/collectd.conf.in: Fix the NotificationExec example.

16 years agosrc/utils_dns.c: Fix version information for __NAMESER >= 19961001.
Florian Forster [Wed, 11 Jun 2008 13:29:02 +0000 (15:29 +0200)]
src/utils_dns.c: Fix version information for __NAMESER >= 19961001.

Thanks to Oleg for reporting this.
Resolves: #22

16 years agosrc/collectd.h: Use `#pragma GCC poison' to disable evil functions.
Florian Forster [Wed, 11 Jun 2008 12:30:39 +0000 (14:30 +0200)]
src/collectd.h: Use `#pragma GCC poison' to disable evil functions.

16 years agolibvirt plugin: Replace `strcat' with `strncat'.
Florian Forster [Wed, 11 Jun 2008 12:30:02 +0000 (14:30 +0200)]
libvirt plugin: Replace `strcat' with `strncat'.

16 years agoReplace all occurrences of `strcpy' with `sstrncpy'.
Florian Forster [Wed, 11 Jun 2008 12:29:31 +0000 (14:29 +0200)]
Replace all occurrences of `strcpy' with `sstrncpy'.

16 years agonginx plugin: Use `strtok_r' instead of `strtok'.
Florian Forster [Wed, 11 Jun 2008 12:24:34 +0000 (14:24 +0200)]
nginx plugin: Use `strtok_r' instead of `strtok'.

16 years agowireless plugins: Interpret noise/power values >100 as (dBm + 256).
JoW [Mon, 9 Jun 2008 11:27:16 +0000 (13:27 +0200)]
wireless plugins: Interpret noise/power values >100 as (dBm + 256).

Hi list,

I currently develop an embedded statistics application and web interface
for OpenWrt Kamikaze based on Collectd and RRDTool.

While working with the wireless plugin I noticed some incompatibilities
with different drivers, namely the Broadcom proprietary driver and madwifi.

  /proc/net/wireless on Broadcom:

   Inter-| sta-|   Quality        |   Discarded packets               | Missed | WE
    face | tus | link level noise |  nwid  crypt   frag  retry   misc | beacon | 18
      wl0: 0000    2.  179.  163.       0      0   8040    723      0        0

  With the Broadcom proprietary driver you get the actual signal and noise
  dbm units by substracting 255 from the values in /proc:

   level: 179 - 255 = -76 dBm
   noise: 163 - 255 = -92 dBm

  /proc/net/wireless on Atheros SoC:

   Inter-| sta-|   Quality        |   Discarded packets               | Missed | WE
    face | tus | link level noise |  nwid  crypt   frag  retry   misc | beacon | 22
     ath0: 0004   21.  -73.  -94.   21841      0      0      0      0        0

  Madwifi writes the actual dBm values into /proc.

So we have (at least for now) three possible types of values:

   ( x > 0.0   && x <= 100.0 ) current implementation: x is in percent (?)

   ( x > 100.0 && x <= 255.0 ) broadcom: range intersects with percents but
values below 100.0 (100.0 - 255.0 = -155.0 dBm)
are somewhat unlikely to occur

   ( x < 0.0 ) atheros: value is already in dBm

A patch which implements the two additional possibilities in collectd's wireless
plugin can be found in the OpenWrt Trac:

https://dev.openwrt.org/browser/packages/utils/collectd/patches/200-wireless-compat.patch

The patch was made against v4.4.0 of collectd but should work with v4.4.1 too.
It would be nice to have this in the next release or so :)

Greetings,
JoW

16 years agodisk plugin: Use correct name under Linux 2.4
Alessandro Iurlano [Sat, 7 Jun 2008 13:16:18 +0000 (15:16 +0200)]
disk plugin: Use correct name under Linux 2.4

Hello everybody.

I have noticed that disk graphs are displayed by collection.cgi as
disk (71687000) instead of the correct disk name on 2.4.x linux
kernels.
The problem seems caused by the fact that the position of disk name of
/proc/partitions (used in 2.4 kernels) differs from /proc/diskstats
(used in 2.6 kernels).

I include as attachment a patch that seems to fix this problem.
I have tested it on 2.4.20 (REDHAT 9) and 2.6.24.4 (Debian Sid) systems.

Thanks a lot for Collectd. It is a _very_ useful program.

Alessandro

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agonetwork plugin: Don't blindly re-initialize everything in the init callback.
Florian Forster [Sat, 7 Jun 2008 18:39:04 +0000 (20:39 +0200)]
network plugin: Don't blindly re-initialize everything in the init callback.

Under Solaris the init functions are called every time the kstat chain
is updated. Since, among other things, send_buffer_fill was set to zero
here, the plugin ``forgot'' about values.

Thank you very much to Eric LeBlanc for debugging this issue.

16 years agosrc/collectd.h: Try even harder to determine endianess.
Florian Forster [Fri, 6 Jun 2008 10:32:13 +0000 (12:32 +0200)]
src/collectd.h: Try even harder to determine endianess.

NexentaStor 1.0.2 doesn't have <endian.h>, for example :/

16 years agosrc/plugin.h: Use __attribute__((format)) for plugin_log.
Florian Forster [Fri, 6 Jun 2008 10:21:01 +0000 (12:21 +0200)]
src/plugin.h: Use __attribute__((format)) for plugin_log.

All __attribute__'s will be automatically set to /**/ when not using the
GNU CC via a macro in src/collectd.h. This way this should be portable.

16 years agobuild.sh: Check for lex and yacc.
Sebastian Harl [Sat, 24 May 2008 20:29:56 +0000 (22:29 +0200)]
build.sh: Check for lex and yacc.

Warn the user, if lex(1) and yacc(1) cannot be found. This is not
necessarily an error, as flex(1) or bison(1) might be available.

As suggested by Kevin Trumbull (onebinary) on IRC.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/liboconfig/oconfig.c: Declare "c_file" as "const char *".
Sebastian Harl [Sat, 24 May 2008 18:32:43 +0000 (20:32 +0200)]
src/liboconfig/oconfig.c: Declare "c_file" as "const char *".

This fixes an "assignment discards qualifiers from pointer target type"
warning. That string stores the name of the config file which is not
going to be modified by liboconfig.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/utils_llist.c: Improved robustness against NULL pointers.
Sebastian Harl [Thu, 22 May 2008 11:36:00 +0000 (13:36 +0200)]
src/utils_llist.c: Improved robustness against NULL pointers.

All functions searching for some list entry now return NULL if the given
list equals NULL. Imho, that's the expected behavior. Also, it removes the
need to check the lists from the calling function while that function
usually checks the returned list entry anyway.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocontrib/cussh.pl: Remove left over merge stuff..
Florian Forster [Tue, 13 May 2008 14:56:17 +0000 (16:56 +0200)]
contrib/cussh.pl: Remove left over merge stuff..

How the hell did that get there..?

16 years agocontrib/cussh.pl: Improve parsing of identifiers.
Florian Forster [Tue, 13 May 2008 14:51:26 +0000 (16:51 +0200)]
contrib/cussh.pl: Improve parsing of identifiers.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 6 May 2008 14:13:35 +0000 (16:13 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in

16 years agoconfigure.in: Don't use `test -a'.
Florian Forster [Tue, 6 May 2008 12:29:56 +0000 (14:29 +0200)]
configure.in: Don't use `test -a'.

Some old/weird versions of sh and/or test don't support the `-a' (`and')
argument.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 6 May 2008 11:44:46 +0000 (13:44 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agosrc/collectd.h: Check for `_BYTE_ORDER', too.
Florian Forster [Thu, 1 May 2008 09:59:33 +0000 (11:59 +0200)]
src/collectd.h: Check for `_BYTE_ORDER', too.

Apparently Solaris uses that name..

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 30 Apr 2008 08:59:19 +0000 (10:59 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in
src/perl.c

16 years agoload plugin: Use #if rather than #ifdef.
Florian Forster [Wed, 30 Apr 2008 08:57:51 +0000 (10:57 +0200)]
load plugin: Use #if rather than #ifdef.

16 years agobuild system: Remove the COLLECT_LIBIOKIT define.
Florian Forster [Wed, 30 Apr 2008 08:57:22 +0000 (10:57 +0200)]
build system: Remove the COLLECT_LIBIOKIT define.

It isn't used anywhere, so remove it.

16 years agobuild system: Define HAVE_LIBSTATGRAB if the statgrab library is available.
Florian Forster [Wed, 30 Apr 2008 08:52:27 +0000 (10:52 +0200)]
build system: Define HAVE_LIBSTATGRAB if the statgrab library is available.

This define is used in some plugins. Thanks to Oleg King for noticing and
pointing this out and thanks to Sebastian Harl for a first patch which,
unfortunately, doesn't work anymore after changing the configure script.

16 years agoperl plugin: Work around a compiler warning on FreeBSD.
Sebastian Harl [Mon, 28 Apr 2008 14:53:57 +0000 (16:53 +0200)]
perl plugin: Work around a compiler warning on FreeBSD.

On FreeBSD, PERL_SYS_INIT3 expands to some expression which triggers a "value
computed is not used" warning by gcc. By telling the compiler to ignore this
value, we can work around this issue. In the long run, this should imho be
fixed in Perl though.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoCollectd.pm: Fixed the check for complete function names in plugin_register.
Sebastian Harl [Sun, 20 Apr 2008 21:21:50 +0000 (23:21 +0200)]
Collectd.pm: Fixed the check for complete function names in plugin_register.

plugin_register() checks if the registered function includes the plugin's
package name. Up to now, this check would also have succeeded if the
function name itself would be prepended by the package name. Now, the
check looks for the separator "::".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 30 Apr 2008 08:26:28 +0000 (10:26 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoMoved <statgrab.h> out of "collectd.h" and into the plugins that actually use the...
Florian Forster [Wed, 30 Apr 2008 08:25:15 +0000 (10:25 +0200)]
Moved <statgrab.h> out of "collectd.h" and into the plugins that actually use the library.

The libstatgrab specific CFLAGS are only passed to these plugins, so that other
plugins may fail if libstatgrab is in a non-standard path.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 30 Apr 2008 06:18:21 +0000 (08:18 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoMerge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2
Florian Forster [Wed, 30 Apr 2008 06:18:08 +0000 (08:18 +0200)]
Merge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2

16 years agobuild system: Fix another bug in the detection of the statgrab library.
Florian Forster [Wed, 30 Apr 2008 06:17:21 +0000 (08:17 +0200)]
build system: Fix another bug in the detection of the statgrab library.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoMerge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2
Florian Forster [Tue, 29 Apr 2008 15:43:19 +0000 (17:43 +0200)]
Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2

16 years agoMerge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 15:43:04 +0000 (17:43 +0200)]
Merge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 14:52:08 +0000 (16:52 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

src/Makefile.am

16 years agobuild system: Use pkg-config to determine flags for the statgrab library.
Florian Forster [Tue, 29 Apr 2008 09:34:22 +0000 (11:34 +0200)]
build system: Use pkg-config to determine flags for the statgrab library.

16 years agobuild system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or...
Florian Forster [Tue, 29 Apr 2008 08:27:38 +0000 (10:27 +0200)]
build system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or libvirt.

16 years agoBumped version to 4.3.3; Updated ChangeLog. collectd-4.3.3
Florian Forster [Tue, 22 Apr 2008 11:18:21 +0000 (13:18 +0200)]
Bumped version to 4.3.3; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoChangeLog: Add missing notes about _REENTRANT and the sensors plugin. collectd-4.2.7
Florian Forster [Tue, 22 Apr 2008 11:16:34 +0000 (13:16 +0200)]
ChangeLog: Add missing notes about _REENTRANT and the sensors plugin.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 22 Apr 2008 11:11:46 +0000 (13:11 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

ChangeLog
version-gen.sh

16 years agoBumped version to 4.2.7; Updated ChangeLog.
Florian Forster [Tue, 22 Apr 2008 08:28:20 +0000 (10:28 +0200)]
Bumped version to 4.2.7; Updated ChangeLog.

16 years agomigrate-3-4.px: Rename vs_processes's data source from "total" to "value".
Sebastian Harl [Fri, 18 Apr 2008 12:54:50 +0000 (14:54 +0200)]
migrate-3-4.px: Rename vs_processes's data source from "total" to "value".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
16 years agocollection.cgi: Updated "vserver" graph definitions to version 4.
Sebastian Harl [Fri, 18 Apr 2008 12:53:50 +0000 (14:53 +0200)]
collection.cgi: Updated "vserver" graph definitions to version 4.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
16 years agosensors plugin: Fix the return status of `sensors_snprintf_chip_name'.
Florian Forster [Fri, 18 Apr 2008 05:23:48 +0000 (07:23 +0200)]
sensors plugin: Fix the return status of `sensors_snprintf_chip_name'.

The function should return <0 only if an error occured, but in two out of three
branches the initial status of -1 was not modified. This may have rendered the
sensors plugin unusable for some people.

16 years agoconfigure: Build perl bindings only if a perl interpreter is available.
Sebastian Harl [Wed, 16 Apr 2008 16:53:30 +0000 (18:53 +0200)]
configure: Build perl bindings only if a perl interpreter is available.

For this purpose a check for the perl interpreter has been added. As the
check for libperl requires a perl interpreter as well (to get the compiler
and linker flags) the perl module will be disabled as well if a perl
interpreter is not available.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 15 Apr 2008 12:04:47 +0000 (14:04 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agobuild system: Check if strtok_r needs _REENTRANT
Florian Forster [Mon, 14 Apr 2008 10:26:08 +0000 (12:26 +0200)]
build system: Check if strtok_r needs _REENTRANT

Resolves: #8

16 years agoMerge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
Florian Forster [Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200)]
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 9 Apr 2008 16:34:48 +0000 (18:34 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

src/exec.c

16 years agoexec plugin: Close all file descriptors but the one connected to the pipe.
Florian Forster [Wed, 9 Apr 2008 16:32:14 +0000 (18:32 +0200)]
exec plugin: Close all file descriptors but the one connected to the pipe.

16 years agoCOPYING: Switched to a version with the new address of the FSF.
Florian Forster [Thu, 3 Apr 2008 08:11:57 +0000 (10:11 +0200)]
COPYING: Switched to a version with the new address of the FSF.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Thu, 3 Apr 2008 07:38:56 +0000 (09:38 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoCOPYING: Added the file (including the GPLv2).
Florian Forster [Thu, 3 Apr 2008 07:35:28 +0000 (09:35 +0200)]
COPYING: Added the file (including the GPLv2).

Newer versions of automake copy the GPLv3 when invoked with ``--add-missing''
which is not what we want.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 1 Apr 2008 13:05:45 +0000 (15:05 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in
src/plugin.c

16 years agounixsock plugin: Do not unregister a write-callback in us_shutdown().
Sebastian Harl [Mon, 31 Mar 2008 09:31:38 +0000 (11:31 +0200)]
unixsock plugin: Do not unregister a write-callback in us_shutdown().

The unixsock plugin no longer registers a write-callback. Basically,
unregistering a non-existent callback does not do any harm, However, if no
write-callback has been registered at all, the appropriate linked list has
never been created and the process will segfault when trying to access it.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoconfigure.in: Set CPPFLAGS when checking headers.
Florian Forster [Tue, 1 Apr 2008 12:11:35 +0000 (14:11 +0200)]
configure.in: Set CPPFLAGS when checking headers.

When checking for <upsclient.h> (and the headers of a few other libraries) the
library specific CFLAGS were added to the global CFLAGS variable. This variable
is used when checking for ``header usability'', but not when checking for
``header presence'' for some reason.

This commit uses the global CPPFLAGS variable instead, which is used in both
checks. Libraries that benefit from this commit are:
- libcurl,
- libmysql(client),
- libnetsnmp,
- libupsclient.

Resolves #6

16 years agoapache plugin: Increase the size of the read-buffer dynamically.
Florian Forster [Tue, 1 Apr 2008 08:40:39 +0000 (10:40 +0200)]
apache plugin: Increase the size of the read-buffer dynamically.

Why guess the size if you can just adapt to whatever comes in? The memory isn't
freed ever, though.

16 years agosrc/plugin.c: plugin_dispatch_values: Improve the error messages.
Florian Forster [Mon, 31 Mar 2008 15:03:56 +0000 (17:03 +0200)]
src/plugin.c: plugin_dispatch_values: Improve the error messages.

If no write plugin was loaded or no DS was defined, the
`plugin_dispatch_values' used to fail silently. This is of course not good, so
this commit introduces error messages for this case, so that users can see why
their setup is not working properly.

Also, the ``no such DS type'' message was promoted from DEBUG to INFO.

16 years agosrc/common.c: Make really sure BYTE_ORDER and BIG_ENDIAN are defined.
Florian Forster [Mon, 31 Mar 2008 13:51:13 +0000 (15:51 +0200)]
src/common.c: Make really sure BYTE_ORDER and BIG_ENDIAN are defined.

If both, BYTE_ORDER and BIG_ENDIAN, are undefined, the statement
  #if BYTE_ORDER == BIG_ENDIAN
will be evaluated to `true', which may cause `ntohll' and `htonll' to behave
weird.

16 years agoplugin.c: Tell the user if a plugin could not be found.
Sebastian Harl [Mon, 31 Mar 2008 08:46:42 +0000 (10:46 +0200)]
plugin.c: Tell the user if a plugin could not be found.

Up to now this error was silently ignored, letting the user believe that
everything went fine.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollection.cgi: Make sure to pass valid variable names to rrdgraph.
Sebastian Harl [Sun, 30 Mar 2008 18:00:45 +0000 (20:00 +0200)]
collection.cgi: Make sure to pass valid variable names to rrdgraph.

Variable names used with DEF, VDEF, etc. must be made up of the
characters "A-Z, a-z, 0-9, -, _". In meta_graph_generic_stack() variable
names have been generated from the instance name which may, however,
contain illegal characters. Now, all illegal characters will be replaced
with "_" and a number will be prepended to the variable name to make
sure the name is still unique.

Thanks to Joerg Jaspert for pointing this out and helpful debugging
information.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agohddtemp plugin: Prefix all messages with "hddtemp plugin:".
Florian Forster [Mon, 31 Mar 2008 06:29:25 +0000 (08:29 +0200)]
hddtemp plugin: Prefix all messages with "hddtemp plugin:".

16 years agocollection.cgi: Added "meta graph" for "dns_qtype" and "dns_rcode".
Sebastian Harl [Sun, 30 Mar 2008 15:25:16 +0000 (17:25 +0200)]
collection.cgi: Added "meta graph" for "dns_qtype" and "dns_rcode".

This will merge all query types and return codes into a single graph each.

get_n_colors() has been taken from the version 3 script to get the colors for
the graphs. get_random_color() imho is not suitable for that purpose as it can
return colors that are hardly different - which would result in graphs that
are hard to read. get_n_colors() now returns a hash-ref suitable to be passed
to meta_graph_generic_stack().

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollection.cgi: Added support for "wireless" values.
Sebastian Harl [Sun, 30 Mar 2008 17:35:14 +0000 (19:35 +0200)]
collection.cgi: Added support for "wireless" values.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollection.cgi: Updated "dns" types to version 4.x.
Sebastian Harl [Sun, 30 Mar 2008 13:45:04 +0000 (15:45 +0200)]
collection.cgi: Updated "dns" types to version 4.x.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoBumped version to 4.3.2; Updated ChangeLog. collectd-4.3.2
Florian Forster [Sat, 29 Mar 2008 10:07:13 +0000 (11:07 +0100)]
Bumped version to 4.3.2; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Sat, 29 Mar 2008 09:52:45 +0000 (10:52 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

ChangeLog
version-gen.sh

16 years agoBumped version to 4.2.6 collectd-4.2.6
Florian Forster [Sat, 29 Mar 2008 09:34:46 +0000 (10:34 +0100)]
Bumped version to 4.2.6

16 years agoChangeLog: Added changes since 4.2.5.
Florian Forster [Thu, 27 Mar 2008 16:52:53 +0000 (17:52 +0100)]
ChangeLog: Added changes since 4.2.5.

16 years agosensors plugin: Simple fix for temperature sensors.
Peter Holik [Wed, 26 Mar 2008 12:48:09 +0000 (13:48 +0100)]
sensors plugin: Simple fix for temperature sensors.

Hi everybody!

While playing with sensors i missed temperature rrd files:

--- sensors.c.orig      2008-03-25 14:58:21.000000000 +0100
+++ sensors.c   2008-03-25 14:58:27.000000000 +0100
@@ -580,7 +580,7 @@
                        type = "fanspeed";
                else if (fl->feature->type
                                == SENSORS_FEATURE_TEMP)
-                       type = "input";
+                       type = "temperature";
                else
                        continue;

because this type got registered as input and "input" is not in types.db

after configuring with --enable-debug i saw a log:

No such dataset registered: input

should that be also without --enable-debug in my syslog?

cu Peter

16 years agoMerge branch 'pull/collectd-4.3' into collectd-4.3
Florian Forster [Wed, 26 Mar 2008 08:56:22 +0000 (09:56 +0100)]
Merge branch 'pull/collectd-4.3' into collectd-4.3

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

src/unixsock.c