collectd.git
15 years agoMerge branch 'ag/apache'
Florian Forster [Thu, 16 Apr 2009 10:45:28 +0000 (12:45 +0200)]
Merge branch 'ag/apache'

15 years agoapache plugin: Prepare for parallel reading of instances.
Amit Gupta [Thu, 16 Apr 2009 10:39:12 +0000 (12:39 +0200)]
apache plugin: Prepare for parallel reading of instances.

Do find the patch attached. I have moved apache_buffer and friends to the
apache_t structure and set the plugin_instance if there. There are other
changes as well like freeing up  the lci->values etc. Have a look at the patch
and let me know if this looks okay to you.

Regards
Amit

15 years agonetwork plugin: Updated signature handling.
Florian Forster [Thu, 16 Apr 2009 08:26:31 +0000 (10:26 +0200)]
network plugin: Updated signature handling.

This is a preparation for being able to handle mixed signed/unsigned
data in one packet. The signature verifying code uses a recursive
structure now, just like the decryption code.

15 years agonetwork plugin: Fix compile ifndef HAVE_GCRYPT_H
Doug MacEachern [Thu, 16 Apr 2009 02:32:52 +0000 (22:32 -0400)]
network plugin: Fix compile ifndef HAVE_GCRYPT_H

Signed-off-by: Doug MacEachern <Doug.MacEachern@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agouptime plugin: Removed some blank lines and reformatted some comments.
Florian Forster [Wed, 15 Apr 2009 09:58:21 +0000 (11:58 +0200)]
uptime plugin: Removed some blank lines and reformatted some comments.

15 years agouptime plugin: Calculate the boot time under Linux.
Marco Chiappero [Wed, 15 Apr 2009 09:51:11 +0000 (11:51 +0200)]
uptime plugin: Calculate the boot time under Linux.

Hi Florian,

[...]

About the uptime plugin:
New code attached, it should be fine now (different linux behaviour and some
minor changes). As soon as I can I'll send to you a plotting code sample (with
lots of stuff and RPN expressions) to be added in the contributions dir, if you
like, and edit the wiki page.

Regards,
Marco

15 years agoapache plugin: Replace C++-style comments.
Florian Forster [Wed, 15 Apr 2009 09:12:53 +0000 (11:12 +0200)]
apache plugin: Replace C++-style comments.

15 years agoapache plugin: Remove unused variables.
Florian Forster [Wed, 15 Apr 2009 08:58:37 +0000 (10:58 +0200)]
apache plugin: Remove unused variables.

15 years agoapache plugin: Fix whitespace: Indent using tab, remove trailing.
Florian Forster [Wed, 15 Apr 2009 08:46:23 +0000 (10:46 +0200)]
apache plugin: Fix whitespace: Indent using tab, remove trailing.

15 years agoapache plugin: Added Amit to list of copyright holders.
Florian Forster [Wed, 15 Apr 2009 08:42:52 +0000 (10:42 +0200)]
apache plugin: Added Amit to list of copyright holders.

15 years agoapache plugin: Add support for multiple servers.
Amit Gupta [Wed, 15 Apr 2009 08:40:26 +0000 (10:40 +0200)]
apache plugin: Add support for multiple servers.

Hi,
Based on Bruno/Florian input, I have changed the apache code to support
the following configuration structure:
<Plugin apache>
  <Instance "instance_name">
     URL ....
     Host ... # optional and defaults to hostname_g
  </Instance>
   URL ...
</Plugin>

I have defined Instance as a block and not Host because the idea here is to
monitor multiple apache instances on the same machine. For apache instances on
remote machines, one could specify Host within the Instance block (which is
optional and default is hostname_g). For legacy configuration, I am converting
the legacy block to <Instance ""> which defaults to apache.

Do find the patch attached. I am not very familiar with git format-patch
and send-email functionalities as yet, so I am attaching a diff -ur
output as mentioned in the submitting-patches.shtml page.

The things which haven't been done as yet:
- I haven't used plugin_register_complex_read as yet. The main reason
  being I am working on 4.6.1 version and I can't seem to find the
  function plugin_register_complex_read in the code base. I believe it
  is being added only in 4.6.2
- lighttpd scoreboard is not yet handled. This would probably be my next
  task.

Question:
Given that this plugin can be used by both apache and lighttpd, how do
we find out if the server is lighttpd or apache?. It will be good to
have different rrd file names for apache and lighttpd which could only
be done if we set different vl.type for both the servers. One way I can
think of is to rely on the differences of the mod_status output of the
two servers or perhaps we could have a generic type as "httpd". (which
can be done only in the next major release if you folks are planning to
change the plugin name to httpd in the next major release)

Regards
Amit

15 years agonetwork plugin: Enable mixing encrypted and unencrypted data.
Florian Forster [Mon, 13 Apr 2009 17:51:56 +0000 (19:51 +0200)]
network plugin: Enable mixing encrypted and unencrypted data.

Unencrypted stuff may now follow encrypted blocks. They are only
handled, if ‘SecurityLevel’ ist set to ‘None’, of course.

Also, use ‘size_t’ for the buffer size.

15 years agonetwork plugin: Use an initialization vector when encrypting packets.
Florian Forster [Sun, 12 Apr 2009 20:24:20 +0000 (22:24 +0200)]
network plugin: Use an initialization vector when encrypting packets.

15 years agonetwork plugin: Talk about “HMAC-SHA-256” in the documentation and error messages.
Florian Forster [Sat, 11 Apr 2009 14:59:46 +0000 (16:59 +0200)]
network plugin: Talk about “HMAC-SHA-256” in the documentation and error messages.

15 years agonetwork plugin: Use libgcrypt's HMAC implementation rather than rolling our own.
Florian Forster [Sat, 11 Apr 2009 14:44:05 +0000 (16:44 +0200)]
network plugin: Use libgcrypt's HMAC implementation rather than rolling our own.

The previously implemented method is simple enough, but apparently pront
to attacks.

15 years agonetwork plugin: Use SHA-1 instead of SHA-224 to check integrity.
Florian Forster [Sat, 11 Apr 2009 12:08:30 +0000 (14:08 +0200)]
network plugin: Use SHA-1 instead of SHA-224 to check integrity.

SHA-224 is not supported by older versions of libgcrypt (i. e. the
version included in Debian Etch), so lets take this more conservative
alternative instead.

Also, the padding bytes have been moved to the beginning of the packet
and will be filled with randomness, so they serve as some kind of IV.
It is, however, not guaranteed that any padding bytes exist at all, so
in theory two identical packets could be encrypted in the same way.

15 years agoMerge branch 'collectd-4.6'
Florian Forster [Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)]
Merge branch 'collectd-4.6'

15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 11 Apr 2009 07:34:32 +0000 (09:34 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

15 years agoRestore BYTE_ORDER on DARWIN The files matching grep "define _POSIX_C_SOURCE" src...
Doug MacEachern [Fri, 10 Apr 2009 21:54:11 +0000 (14:54 -0700)]
Restore BYTE_ORDER on DARWIN The files matching grep "define _POSIX_C_SOURCE" src/*.c on MacOSX do not compile: In file included from target_notification.c:60: collectd.h:172:3: error: #error "Cannot determine byte order"

See /usr/include/i386/endian.h:
 #if defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))

 #define LITTLE_ENDIAN   __DARWIN_LITTLE_ENDIAN
 #define BIG_ENDIAN      __DARWIN_BIG_ENDIAN
 #define BYTE_ORDER      __DARWIN_BYTE_ORDER

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoDisable disable multi -arch flags to perl.c on OSX Compilation of perl.c fails with:
Doug MacEachern [Fri, 10 Apr 2009 21:38:33 +0000 (14:38 -0700)]
Disable disable multi -arch flags to perl.c on OSX Compilation of perl.c fails with:

gcc ... -Wall -Werror -arch i386 -arch ppc -g -pipe -fno-common -DPERL_DARWIN ... -MT perl_la-perl.lo -MD -MP -MF ...
...
gcc-4.0: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags

See Config_heavy.pl:
$archflags = exists($ENV{ARCHFLAGS}) ? $ENV{ARCHFLAGS} : '-arch i386 -arch ppc';

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agonetwork plugin: Use CBC rather than ECB.
Florian Forster [Sat, 11 Apr 2009 00:02:33 +0000 (02:02 +0200)]
network plugin: Use CBC rather than ECB.

15 years agonetwork plugin: Implement signing and encryption of network traffic.
Florian Forster [Fri, 10 Apr 2009 23:08:40 +0000 (01:08 +0200)]
network plugin: Implement signing and encryption of network traffic.

The patch adds shared secret signing and encryption of network traffic.
Currently, there are three “security levels”:

 - Encrypt
   Encrypt outgoing data and only accept encrypted data when receiving.

 - Sign
   Outgoing data is signed; signed and encrypted data is accepted when
   receiving.

 - None
   Send without any cryptography and accept anything when receiving.

The security level and shared secret can be set per-socket, so that
forwarding instances can re-encrypt and similar goodies.

The libgcrypt library is used to calculate hashes, encrypt and decrypt,
see <http://www.gnu.org/software/libgcrypt/>. I tested compiling the
`network' plugin without libgcrypt afterwards, but haven't tested this
much yet.

Algorithms used are SHA-256 for signing and AES-256 in ECB mode /
SHA-224 when encrypting. Also, SHA-256 is used to get the 32 byte key
for AES-256 from the user-supplied secret.

15 years agosrc/plugin.c: Emit warning in load_plugin if !S_ISREG
Doug MacEachern [Fri, 12 Dec 2008 20:52:04 +0000 (12:52 -0800)]
src/plugin.c: Emit warning in load_plugin if !S_ISREG

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'dm/misc'
Florian Forster [Wed, 8 Apr 2009 14:47:49 +0000 (16:47 +0200)]
Merge branch 'dm/misc'

15 years agoclean.sh: Clean up `src/libcollectdclient/'.
Doug MacEachern [Thu, 1 Jan 2009 18:04:15 +0000 (10:04 -0800)]
clean.sh: Clean up `src/libcollectdclient/'.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoconfigure.in: Check for libpq for function `PQserverVersion'.
Doug MacEachern [Thu, 1 Jan 2009 17:33:42 +0000 (09:33 -0800)]
configure.in: Check for libpq for function `PQserverVersion'.

It does not exist in 7.x.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/plugin.c: Emit warning in load_plugin if !S_ISREG
Doug MacEachern [Fri, 12 Dec 2008 20:52:04 +0000 (12:52 -0800)]
src/plugin.c: Emit warning in load_plugin if !S_ISREG

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agocontrib/collection3/: Add plugin_instance to MySQL RRDTitle
Doug MacEachern [Fri, 3 Apr 2009 15:50:43 +0000 (08:50 -0700)]
contrib/collection3/: Add plugin_instance to MySQL RRDTitle

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agobindings/java/: Fix a reference in a JavaDoc comment.
Florian Forster [Sat, 4 Apr 2009 06:44:37 +0000 (08:44 +0200)]
bindings/java/: Fix a reference in a JavaDoc comment.

15 years agosrc/liboping: Remove the shipped version of the ‘oping’ library.
Florian Forster [Tue, 7 Apr 2009 08:43:32 +0000 (10:43 +0200)]
src/liboping: Remove the shipped version of the ‘oping’ library.

There's no real reason for this special handling, since liboping is
developed separately now.

15 years agoMerge branch 'ff/memcachec'
Florian Forster [Tue, 7 Apr 2009 07:38:47 +0000 (09:38 +0200)]
Merge branch 'ff/memcachec'

15 years agodbi plugin: Be more specific about unknown field types.
Florian Forster [Tue, 7 Apr 2009 07:37:09 +0000 (09:37 +0200)]
dbi plugin: Be more specific about unknown field types.

Especially print the name of the field.

15 years agojava plugin: Use `void *' to pass arguments of varying type.
Florian Forster [Tue, 7 Apr 2009 07:35:36 +0000 (09:35 +0200)]
java plugin: Use `void *' to pass arguments of varying type.

The types passed at VM creation time differ from Java implementation to the
next and/or only certain compiler complain. This way we should be on the safe
side.

15 years agomemcachec plugin: Add a plugin to fetch data from the memcache daemon.
Florian Forster [Fri, 27 Feb 2009 12:24:23 +0000 (13:24 +0100)]
memcachec plugin: Add a plugin to fetch data from the memcache daemon.

Based on Doug MacEachern's modification to the cURL plugin.

15 years agoMerge branch 'er/ted'
Florian Forster [Tue, 31 Mar 2009 07:45:33 +0000 (09:45 +0200)]
Merge branch 'er/ted'

15 years agoREADME: Added the `ted' plugin.
Florian Forster [Tue, 31 Mar 2009 07:45:19 +0000 (09:45 +0200)]
README: Added the `ted' plugin.

15 years agobindings/java/: JMXMemory: Add GPL and copyright header.
Florian Forster [Sun, 29 Mar 2009 12:53:21 +0000 (14:53 +0200)]
bindings/java/: JMXMemory: Add GPL and copyright header.

15 years agondings/java/: Add `JMXMemory' example plugin.
Florian Forster [Sun, 29 Mar 2009 12:50:39 +0000 (14:50 +0200)]
ndings/java/: Add `JMXMemory' example plugin.

15 years agojava plugin: Fix a typo in the oconfig_item conversion function.
Florian Forster [Sun, 29 Mar 2009 12:36:26 +0000 (14:36 +0200)]
java plugin: Fix a typo in the oconfig_item conversion function.

15 years agosrc/plugin.c: Automatically set vl->interval to interval_g if (vl->interval <= 0).
Florian Forster [Sun, 29 Mar 2009 12:35:53 +0000 (14:35 +0200)]
src/plugin.c: Automatically set vl->interval to interval_g if (vl->interval <= 0).

15 years agojava plugin: Honor the return value of `NewGlobalRef'.
Florian Forster [Sun, 29 Mar 2009 12:00:46 +0000 (14:00 +0200)]
java plugin: Honor the return value of `NewGlobalRef'.

Apparently GCJ used to modify it's argument, but the spec apparently says
that the return value is important.

15 years agobindings/java/: Initialize `time' and `interval' to zero.
Florian Forster [Sun, 29 Mar 2009 11:55:32 +0000 (13:55 +0200)]
bindings/java/: Initialize `time' and `interval' to zero.

They will be replaced by the correct values automatically, so it's better
to initialize the members to those ``magic'' values..

15 years agojava plugin: Use slashes, not dots, in absulte object names.
Florian Forster [Sun, 29 Mar 2009 11:54:31 +0000 (13:54 +0200)]
java plugin: Use slashes, not dots, in absulte object names.

Dots workes for GCJ but not with Sun's Java. I haven't tested if GCJ likes
this too, but I strongly suspect it.

15 years agomysql plugin: Make the `Database' option optional again.
Florian Forster [Sat, 28 Mar 2009 08:42:23 +0000 (09:42 +0100)]
mysql plugin: Make the `Database' option optional again.

15 years agocontrib/collectd-network.py: Add pure-Python implementation of collectd's network...
Adrian Perez [Fri, 27 Mar 2009 21:23:51 +0000 (22:23 +0100)]
contrib/collectd-network.py: Add pure-Python implementation of collectd's network protocol.

Announcement can be found here:
 <http://blogs.igalia.com/aperez/?p=38>

15 years agosrc/configfile.c: Improve a debugging message.
Florian Forster [Fri, 27 Mar 2009 21:25:25 +0000 (22:25 +0100)]
src/configfile.c: Improve a debugging message.

15 years agocontrib/collectd-network.py: Add pure-Python implementation of collectd's network...
Adrian Perez [Fri, 27 Mar 2009 21:23:51 +0000 (22:23 +0100)]
contrib/collectd-network.py: Add pure-Python implementation of collectd's network protocol.

Announcement can be found here:
 <http://blogs.igalia.com/aperez/?p=38>

15 years agosrc/Makefile.am: Use `LIBADD' instead of `LDFLAGS' when linking.
Florian Forster [Mon, 23 Mar 2009 20:55:28 +0000 (21:55 +0100)]
src/Makefile.am: Use `LIBADD' instead of `LDFLAGS' when linking.

15 years agocontrib/collectd-unixsock.py: Add Python module to talk to the UnixSock plugin.
Clay Loveless [Mon, 23 Mar 2009 09:18:06 +0000 (10:18 +0100)]
contrib/collectd-unixsock.py: Add Python module to talk to the UnixSock plugin.

15 years agosrc/utils_cmd_putval.c: Add a missing newline ...
Florian Forster [Sun, 22 Mar 2009 10:42:31 +0000 (11:42 +0100)]
src/utils_cmd_putval.c: Add a missing newline ...

... when printing to the socket.

15 years agocollectd-unixsock(5): Fix two typos.
Florian Forster [Sun, 22 Mar 2009 10:40:14 +0000 (11:40 +0100)]
collectd-unixsock(5): Fix two typos.

15 years agomysql plugin: Log an info message after connecting to a server.
Sebastian Harl [Fri, 20 Mar 2009 21:10:18 +0000 (22:10 +0100)]
mysql plugin: Log an info message after connecting to a server.

Also, improved the error message logged if the connection failed.

15 years agocollectd.conf(5): Documented support for the master / slave statistics.
Sebastian Harl [Fri, 20 Mar 2009 20:49:33 +0000 (21:49 +0100)]
collectd.conf(5): Documented support for the master / slave statistics.

Also, the sample configuration in collectd.conf.in has been updated.

15 years agocollectd.conf(5): Documented the <Database> blocks.
Sebastian Harl [Fri, 20 Mar 2009 20:36:01 +0000 (21:36 +0100)]
collectd.conf(5): Documented the <Database> blocks.

Also, updated the sample configuration in collectd.conf.in.

15 years agomysql plugin: Added support for "slave notifications".
Sebastian Harl [Fri, 20 Mar 2009 18:32:57 +0000 (19:32 +0100)]
mysql plugin: Added support for "slave notifications".

The new boolean config option "SlaveNotifications" may be used to enable
notifications if the replication slave I/O and / or SQL threads are not
running (and the respective OKAY notifications). Since this is somewhat
related to the time offset between master and slave, "time_offset" is used for
the type information stored in the notification.

15 years agomysql plugin: Updated copyright and authors information.
Sebastian Harl [Fri, 20 Mar 2009 17:36:11 +0000 (18:36 +0100)]
mysql plugin: Updated copyright and authors information.

Added Doug MacEachern to the list of copyright holders and Mirko Buffoni to
the list of authors.

15 years agomysql plugin: Added support for master/slave statistics.
Sebastian Harl [Fri, 20 Mar 2009 17:23:51 +0000 (18:23 +0100)]
mysql plugin: Added support for master/slave statistics.

MySQL replication master and slave statistics may be enabled using the newly
added boolean config options "MasterStats" and "SlaveStats". In the first
case, the position in the binlog is collected while in the later case the
read and exec positions in the master log as well as the value of the
Seconds_Behind_Master variable are collected.

For the log positions, the counter type "mysql_log_position" has been
introduced while "time_offset" is used for the Seconds_Behind_Master values.

15 years agosrc/plugin.c: Fixed a typo.
Sebastian Harl [Wed, 18 Mar 2009 10:11:35 +0000 (11:11 +0100)]
src/plugin.c: Fixed a typo.

15 years agoexec plugin: Allow executed programs to close STDERR.
Florian Forster [Thu, 19 Mar 2009 18:46:01 +0000 (19:46 +0100)]
exec plugin: Allow executed programs to close STDERR.

When an executed program is closing STDERR but continues running, the
daemon will wait for the child to exit and the child will eventually
block because the pipe is filled up, resulting in no statistics being
collected.

Thanks to Thorsten von Eicken for finding this problem :)

15 years agoonewire plugin: Make use of the `complex read' callbacks.
Florian Forster [Thu, 19 Mar 2009 16:40:46 +0000 (17:40 +0100)]
onewire plugin: Make use of the `complex read' callbacks.

The `Interval' option is not honored and can be used to set an arbitrary
interval for this plugin.

15 years agouptime plugin: Shuffle some preprocessor stuff around.
Florian Forster [Thu, 19 Mar 2009 13:21:16 +0000 (14:21 +0100)]
uptime plugin: Shuffle some preprocessor stuff around.

Fix some comments and possibly a Solaris bug, too.

15 years agobuild system: Add the new `uptime' plugin.
Florian Forster [Thu, 19 Mar 2009 12:51:50 +0000 (13:51 +0100)]
build system: Add the new `uptime' plugin.

15 years agouptime plugin: Add a plugin to measure the time a system has been running.
Marco Chiappero [Thu, 19 Mar 2009 12:30:32 +0000 (13:30 +0100)]
uptime plugin: Add a plugin to measure the time a system has been running.

Florian Forster ha scritto:
>Hi Marco,

Hi Florian,

> Checking the KSTAT_TYPE_NAMED twice (three times if you count the
> assertion) is of course not necessary. I suspect a copy'n'paste error ;)

Me too. Please remove the second one at least, kstat_read do not change
ks_type.

>A quick `grep' revealed that `get_kstat' is only used in two places, the
>memory and the swap plugin - both trying to figure out the pagesize. If
>you need something else than `KSTAT_TYPE_NAMED', I'd suggest to move the
>checks to a new function `get_kstat_pagesize' and use that function in
>the two plugins.

I went for the kstat.h only solution.
Ok, I'm attaching the code, please check the preprocessor directives for
the includes section, I don't much about defines created by the build
system and its names.
I'm using it right now on a linux machine, but I haven't tested yet on
Solaris and BSDs. Today I tried to compile it on OpenSolaris, but after
fighting with the packaging system and many other things I gave up and
decided I won't try anymore. So, since I'd like to say the plugin is
done after testing it, Solaris testers are wanted :P
As soon as I can I will edit the wiki page, but first I want to have a
closer look to the iptable plugin and see how many modifications are
needed for IPv6 and then have an opinion about the single vs. double
plugin approach.
See you soon :)

Regars,
Marco

15 years agonetwork plugin: Improve a debugging message.
Florian Forster [Thu, 19 Mar 2009 08:40:29 +0000 (09:40 +0100)]
network plugin: Improve a debugging message.

15 years agoMerge branch 'collectd-4.6'
Florian Forster [Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)]
Merge branch 'collectd-4.6'

15 years agosnmp plugin: Use `complex reads', one for each host.
Florian Forster [Wed, 18 Mar 2009 17:39:57 +0000 (18:39 +0100)]
snmp plugin: Use `complex reads', one for each host.

This way the reads are sheduled by the global read threads, thread
handling can be removed completely and intervals which are not a
multiple of the global interval are possible.

15 years agomysql plugin: Use "mysql-$db" when registering a read callback.
Florian Forster [Wed, 18 Mar 2009 17:22:36 +0000 (18:22 +0100)]
mysql plugin: Use "mysql-$db" when registering a read callback.

15 years agomysql plugin: use plugin_register_complex_read
Doug MacEachern [Tue, 17 Mar 2009 20:44:08 +0000 (13:44 -0700)]
mysql plugin: use plugin_register_complex_read

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Florian Forster [Wed, 18 Mar 2009 10:54:48 +0000 (11:54 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd

15 years agoconfigure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_". collectd-4.6.2
Florian Forster [Wed, 18 Mar 2009 10:11:18 +0000 (11:11 +0100)]
configure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_".

autoconf requires the string "_cv_" to be present in cache-ids.

This patch adds/changes `have_broken_perl_load_module' which was added
after 4.5.

15 years agoBumped version to 4.6.2; Updated ChangeLog.
Florian Forster [Wed, 18 Mar 2009 10:07:30 +0000 (11:07 +0100)]
Bumped version to 4.6.2; Updated ChangeLog.

15 years agomysql plugin: un-static-ize mysql connections
Doug MacEachern [Tue, 17 Mar 2009 15:12:56 +0000 (08:12 -0700)]
mysql plugin: un-static-ize mysql connections

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)]
Merge branch 'collectd-4.5' into collectd-4.6

15 years agosrc/plugin.c: Fix an error message.
Florian Forster [Tue, 17 Mar 2009 13:41:45 +0000 (14:41 +0100)]
src/plugin.c: Fix an error message.

15 years agomysql plugin: Some changes to the configuration handling.
Florian Forster [Tue, 17 Mar 2009 13:30:02 +0000 (14:30 +0100)]
mysql plugin: Some changes to the configuration handling.

The member `instance' is used to determine whether or not to use ``legacy
mode'':
- If it is NULL, legacy mode is in action
- Otherwise, non-legacy mode should be used.

``legacy mode'' and ``non-legacy mode'' cannot be mixed: If at least one
database is defined in the ``new'' way, all options that'd be valid in
legacy mode will only trigger a warning.

15 years agoconfigure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_".
Sebastian Harl [Tue, 10 Mar 2009 20:26:51 +0000 (21:26 +0100)]
configure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_".

autoconf requires the string "_cv_" to be present in cache-ids.

15 years agoconfigfile, types_list: Improved error messages when handling "TypesDB".
Sebastian Harl [Tue, 10 Mar 2009 19:48:54 +0000 (20:48 +0100)]
configfile, types_list: Improved error messages when handling "TypesDB".

15 years agoMerge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6
Florian Forster [Tue, 17 Mar 2009 08:29:06 +0000 (09:29 +0100)]
Merge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6

15 years agomysql plugin: add support for multiple databases
Doug MacEachern [Mon, 16 Mar 2009 22:17:09 +0000 (15:17 -0700)]
mysql plugin: add support for multiple databases

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoted plugin: Fix some minor issues with Eric's patch.
Florian Forster [Tue, 17 Mar 2009 08:22:11 +0000 (09:22 +0100)]
ted plugin: Fix some minor issues with Eric's patch.

Remove trailing whitespace, for example.

15 years agoted plugin: Some nondescript fixes.
Eric Reed [Tue, 17 Mar 2009 08:02:18 +0000 (09:02 +0100)]
ted plugin: Some nondescript fixes.

15 years agosrc/plugin.[ch]: Pass an interval to `plugin_register_complex_read'.
Florian Forster [Mon, 16 Mar 2009 15:15:11 +0000 (16:15 +0100)]
src/plugin.[ch]: Pass an interval to `plugin_register_complex_read'.

15 years agosrc/plugin.c: Remove an unused variable.
Florian Forster [Mon, 16 Mar 2009 14:01:39 +0000 (15:01 +0100)]
src/plugin.c: Remove an unused variable.

15 years agosrc/liboping/liboping.c: Fix a problem with strict aliasing.
Florian Forster [Mon, 16 Mar 2009 08:38:42 +0000 (09:38 +0100)]
src/liboping/liboping.c: Fix a problem with strict aliasing.

Just remove the code since it's dead anyway.

Thanks to Alan Pevec <apevec at gmail.com> for pointing this out :)

15 years agosrc/filter_chain.c: Allow chains without a default target.
Florian Forster [Mon, 16 Mar 2009 08:31:04 +0000 (09:31 +0100)]
src/filter_chain.c: Allow chains without a default target.

This is how it's documented.

15 years agotimediff match: Register the correct match name.
Bruno Prémont [Mon, 16 Mar 2009 08:18:42 +0000 (09:18 +0100)]
timediff match: Register the correct match name.

15 years agosrc/utils_cache.c: Fix an error message.
Florian Forster [Mon, 16 Mar 2009 08:07:12 +0000 (09:07 +0100)]
src/utils_cache.c: Fix an error message.

15 years agosrc/plugin.c: Use a heap to schedule reads.
Florian Forster [Sun, 15 Mar 2009 23:02:55 +0000 (00:02 +0100)]
src/plugin.c: Use a heap to schedule reads.

With this change basically only timeout checks are triggered from the
global "read loop". This will allow each read function to be queried at
a different interval. This is currently not used, but will come in handy
in the future.

15 years agosrc/collectd.conf.in: Add `match_timediff'.
Florian Forster [Sun, 15 Mar 2009 22:40:20 +0000 (23:40 +0100)]
src/collectd.conf.in: Add `match_timediff'.

15 years agoMerge branch 'master' into er/ted
Florian Forster [Sat, 14 Mar 2009 17:52:58 +0000 (18:52 +0100)]
Merge branch 'master' into er/ted

15 years agoMerge branch 'collectd-4.6'
Florian Forster [Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)]
Merge branch 'collectd-4.6'

15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 14 Mar 2009 17:52:19 +0000 (18:52 +0100)]
Merge branch 'collectd-4.5' into collectd-4.6

15 years agoted plugin: Don't expect a minimum length.
Florian Forster [Sat, 14 Mar 2009 17:49:52 +0000 (18:49 +0100)]
ted plugin: Don't expect a minimum length.

The serial interface apparently can only deliver 255 bytes at once, so
checking if we received ``enough'' (i. e. 278+x) bytes will never work.

15 years agoMerge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5
Florian Forster [Sat, 14 Mar 2009 17:08:10 +0000 (18:08 +0100)]
Merge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5

15 years agobind plugin: Actually handle RR cache numbers as `gauge'..
Bruno Prémont [Sat, 14 Mar 2009 17:06:58 +0000 (18:06 +0100)]
bind plugin: Actually handle RR cache numbers as `gauge'..

Hi Florian,

Well a working patch was even less trivial as the quick one from
yesterday evening.

Just using a gauge type is not sufficient (only 0 is written to RRD
files), it's also necessary to adjust the bind_xml_stats_handle_view()
as has been done for the memory statistics

Attached is a patch to bind.c (I skipped types.db) which fixes the
cache data collection.

In addition I attached a graph of the cache evolution and memory (for
memory it might be worth giving it an own type as it's not cumulative
at all)

Bruno

15 years agobind plugin: "Trivial patch" to make `rr cache' stats work.
Florian Forster [Sat, 14 Mar 2009 17:06:19 +0000 (18:06 +0100)]
bind plugin: "Trivial patch" to make `rr cache' stats work.

15 years agobind plugin: "Trivial patch" to make `rr cache' stats work.
Florian Forster [Sat, 14 Mar 2009 17:02:35 +0000 (18:02 +0100)]
bind plugin: "Trivial patch" to make `rr cache' stats work.

15 years agocontrib/collection3: Use {interface} in `if_octets' graphs.
Florian Forster [Sat, 14 Mar 2009 16:54:19 +0000 (17:54 +0100)]
contrib/collection3: Use {interface} in `if_octets' graphs.

15 years agocontrib/collection3: Add graph for `ps_cputime'.
Florian Forster [Sat, 14 Mar 2009 16:53:55 +0000 (17:53 +0100)]
contrib/collection3: Add graph for `ps_cputime'.

15 years agocontrib/collection3: Add the "height" parameter.
Florian Forster [Sat, 14 Mar 2009 12:31:00 +0000 (13:31 +0100)]
contrib/collection3: Add the "height" parameter.