Code

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Conflicts:
ChangeLog

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

Conflicts:
ChangeLog
version-gen.sh

15 years agoBumped version to 4.5.4; Updated ChangeLog. collectd-4.5.4
Florian Forster [Sat, 9 May 2009 11:56:43 +0000 (13:56 +0200)]
Bumped version to 4.5.4; Updated ChangeLog.

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

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

15 years agoconfigure.in: Hint towards the CFLAGS instead of using $CC.
Florian Forster [Sat, 9 May 2009 09:08:48 +0000 (11:08 +0200)]
configure.in: Hint towards the CFLAGS instead of using $CC.

15 years agoconfigure.in: Add hint for building solaris 64-bit binary.
Doug MacEachern [Sat, 9 May 2009 01:54:51 +0000 (18:54 -0700)]
configure.in: Add hint for building solaris 64-bit binary.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoconfigure.in: Check libgcrypt minimum version 1.2.0.
Doug MacEachern [Fri, 8 May 2009 06:13:48 +0000 (23:13 -0700)]
configure.in: Check libgcrypt minimum version 1.2.0.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoswap module: Include <vm/anon.h> on Solaris.
Doug MacEachern [Sat, 9 May 2009 00:35:03 +0000 (17:35 -0700)]
swap module: Include <vm/anon.h> on Solaris.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoconfigure.in: Check for `mysql_get_server_version' in libmyql.
Doug MacEachern [Fri, 8 May 2009 01:05:01 +0000 (18:05 -0700)]
configure.in: Check for `mysql_get_server_version' in libmyql.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoconfigure.in: Use AC_HEADER_STDBOOL
Doug MacEachern [Thu, 7 May 2009 19:50:17 +0000 (12:50 -0700)]
configure.in: Use AC_HEADER_STDBOOL

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

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

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

15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Wed, 6 May 2009 14:37:18 +0000 (16:37 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:

src/Makefile.am

15 years agoBuild system: Straighten up building of the DF plugin.
Florian Forster [Wed, 6 May 2009 14:28:27 +0000 (16:28 +0200)]
Build system: Straighten up building of the DF plugin.

In rare cases, e. g. Solaris, getmntent is available but neither the one nor
the two argument version could be recognized. This lead to `cu_mount_getlist'
returning NULL without an error, leading to the df plugin fail without notice.

While at it I re-implemented the dependency checking of the DF plugin to match
the proprocessor logic in utils_mount.c.

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

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

This only happened if debugging was enabled.

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

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

15 years agouuid plugin: Pass `int' to `isxdigit'.
Doug MacEachern [Wed, 6 May 2009 08:42:01 +0000 (10:42 +0200)]
uuid plugin: Pass `int' to `isxdigit'.

Fixes compilation on NetBSD and possibly other systems.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agotcpconns plugin: Compilation fixes for NetBSD.
Doug MacEachern [Wed, 6 May 2009 08:41:08 +0000 (10:41 +0200)]
tcpconns plugin: Compilation fixes for NetBSD.

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Tue, 5 May 2009 18:30:10 +0000 (20:30 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agolibcollectdclient: Copy `sstrerror' from src/common.c.
Florian Forster [Tue, 5 May 2009 18:29:08 +0000 (20:29 +0200)]
libcollectdclient: Copy `sstrerror' from src/common.c.

I don't want to simply include common.h, since that pulls in a lot of
other daemon-related headers..

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

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

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

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

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

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

15 years agoSet process vmem_size and stack_size on FreeBSD
Doug MacEachern [Mon, 4 May 2009 17:22:43 +0000 (19:22 +0200)]
Set process vmem_size and stack_size on FreeBSD

   Fixes:
   processes.c: In function 'ps_read':
   processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
   processes.c:1300: note: 'pse.vmem_size' was declared here
   processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
   processes.c:1300: note: 'pse.stack_size' was declared here

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.

Conflicts:

src/processes.c

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

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

15 years agoprocesses plugin: Fix compilation issues under OpenBSD.
Florian Forster [Mon, 4 May 2009 16:51:51 +0000 (18:51 +0200)]
processes plugin: Fix compilation issues under OpenBSD.

Unfortunately OpenBSD support is non-trivial to add, so we'll keep that for
later.

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

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

15 years agorrdtool plugin: Make absolutely sure two local variables are initialized.
Florian Forster [Mon, 4 May 2009 15:08:22 +0000 (17:08 +0200)]
rrdtool plugin: Make absolutely sure two local variables are initialized.

To make the compiler happy.

15 years agoBuild system: Add the --enable-standards configure option.
Florian Forster [Mon, 4 May 2009 15:02:59 +0000 (17:02 +0200)]
Build system: Add the --enable-standards configure option.

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

Conflicts:
src/filter_chain.c
src/meta_data.c
src/target_notification.c
src/target_replace.c
src/target_set.c

15 years agobind plugin: Fixes for FreeBSD 7.1
Florian Forster [Mon, 4 May 2009 14:48:58 +0000 (16:48 +0200)]
bind plugin: Fixes for FreeBSD 7.1

X/Open is needed for strptime,
sys/select.h is needed for some libcurl versions, and
mktime is the POSIX variant of timegm (+ localization).

15 years agoVarious: Remove strict standards compliance defines.
Florian Forster [Mon, 4 May 2009 14:46:02 +0000 (16:46 +0200)]
Various: Remove strict standards compliance defines.

15 years agontpd plugin: Fix dereference of type-punned pointer.
Florian Forster [Sun, 3 May 2009 21:45:16 +0000 (23:45 +0200)]
ntpd plugin: Fix dereference of type-punned pointer.

15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

15 years agoprocesses plugin: Comment out nonexistent struct members.
Florian Forster [Sat, 2 May 2009 08:49:35 +0000 (10:49 +0200)]
processes plugin: Comment out nonexistent struct members.

We should reintroduce those values eventually.

15 years agomemory plugin: Fix a formatstring error.
Florian Forster [Sat, 2 May 2009 08:45:51 +0000 (10:45 +0200)]
memory plugin: Fix a formatstring error.

15 years agoemail plugin: Don't assume `pthread_t' is a `unsigned long'.
Florian Forster [Sat, 2 May 2009 08:29:14 +0000 (10:29 +0200)]
email plugin: Don't assume `pthread_t' is a `unsigned long'.

15 years agoChangeLog: Added information about mysql lock statistics.
Florian Forster [Sat, 2 May 2009 07:51:52 +0000 (09:51 +0200)]
ChangeLog: Added information about mysql lock statistics.

15 years agoAUTHORS: Added Rodolphe.
Florian Forster [Sat, 2 May 2009 07:51:43 +0000 (09:51 +0200)]
AUTHORS: Added Rodolphe.

15 years agoAUTHORS: Added Marco.
Florian Forster [Sat, 2 May 2009 07:39:08 +0000 (09:39 +0200)]
AUTHORS: Added Marco.

15 years agoiptables plugin: Use the same enum everywhere.
Florian Forster [Sat, 2 May 2009 07:37:20 +0000 (09:37 +0200)]
iptables plugin: Use the same enum everywhere.

15 years agoiptables plugin: Add support for ip6tables.
Marco Chiappero [Fri, 1 May 2009 15:22:52 +0000 (17:22 +0200)]
iptables plugin: Add support for ip6tables.

Here is a stub but I have some trouble in making it work with "Chain6"
rules, maybe I don't know exactely how to deal with configuration keys.
I get "collectd[4887]: Plugin `iptables' did not register for value
`Chain6'". Is there something I'm forgetting?

There is another issue, the naming shema. I temporally changed the ipv6
vl.plugin to "ip6tables" in the meantime. Options are:
- different vl.plugin if possible (backward compatible)
- new vl.plugin_instance name schema with ip protocol (not backward
  compatible)
- new vl.type "ip6t_packets" and "ip6t_bytes" (backward compatible but
  taints the types.db with useless data)

A note about the code: I created two different submit_chain and
submit_match because using void pointers (and casting them afterwards)
in a single function it's a little bit obscure and complicated with no
real advantage. Sorry for some code duplication but in my opinion this
is smartest way.

Let me know your opinion, thank you.

Regards,
Marco

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoChangeLog: Updated the change log for 4.7.
Florian Forster [Fri, 1 May 2009 15:17:08 +0000 (17:17 +0200)]
ChangeLog: Updated the change log for 4.7.

15 years agoMerge branch 'collectd-4.6'
Florian Forster [Fri, 1 May 2009 14:38:47 +0000 (16:38 +0200)]
Merge branch 'collectd-4.6'

Conflicts:
src/memcached.c

15 years agoMerge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Fri, 1 May 2009 14:34:51 +0000 (16:34 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6

15 years agoirq plugin: Force 32bit wrap-around.
Florian Forster [Fri, 1 May 2009 14:34:30 +0000 (16:34 +0200)]
irq plugin: Force 32bit wrap-around.

15 years agobattery plugin: Fix a typo.
Florian Forster [Fri, 1 May 2009 14:34:15 +0000 (16:34 +0200)]
battery plugin: Fix a typo.

15 years agoMerge branch 'ek/fscache'
Florian Forster [Fri, 1 May 2009 14:11:09 +0000 (16:11 +0200)]
Merge branch 'ek/fscache'

15 years agoAUTHORS: Added Edward “Koko” Konetzko.
Florian Forster [Fri, 1 May 2009 14:10:28 +0000 (16:10 +0200)]
AUTHORS: Added Edward “Koko” Konetzko.

15 years agofscache plugin: Simplyfied the parsing code.
Florian Forster [Fri, 1 May 2009 14:06:09 +0000 (16:06 +0200)]
fscache plugin: Simplyfied the parsing code.

15 years agoconfigure: Fixed the check for broken Perl_load_module().
Sebastian Harl [Fri, 1 May 2009 13:40:02 +0000 (15:40 +0200)]
configure: Fixed the check for broken Perl_load_module().

Do not initialize AC_CACHE_CHECK cache-id's - that'd be the same as having the
initial value in the cache. This was introduced in commit 61c19cc1.

15 years agofscache plugin: Add new plugin for Linux' file-system based caching framework.
Edward Koko Konetzko [Thu, 30 Apr 2009 03:26:52 +0000 (22:26 -0500)]
fscache plugin: Add new plugin for Linux' file-system based caching framework.

Tried to submit the patch via "git send-mail" but I don't think it worked if
you already have the patch disregard the attachment.

Looking forward to your feedback, I am sure there are a few issues its been a
few years since I programmed in C. I have been running this in my test lab at
work for a few days now with no issues.

With 62 metrics I would like to modify the code to group them by their
classification and possibly add configuration support. If the changes are
finished this weekend is it ok to send an updated patch?

Thanks
Edward

Signed-off-by: Edward "Koko" Konetzko <konetzed@quixoticagony.com>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoMerge branch 'ag/apache'
Florian Forster [Fri, 1 May 2009 13:07:04 +0000 (15:07 +0200)]
Merge branch 'ag/apache'

15 years agoapache plugin: Be more verbose when automatically determine the server software.
Florian Forster [Fri, 1 May 2009 12:59:32 +0000 (14:59 +0200)]
apache plugin: Be more verbose when automatically determine the server software.

15 years agoapache plugin: Replace C++-style comments.
Florian Forster [Fri, 1 May 2009 12:43:08 +0000 (14:43 +0200)]
apache plugin: Replace C++-style comments.

15 years agoapache plugin: Use the HTTP header to determine the server software.
Amit Gupta [Fri, 1 May 2009 12:38:50 +0000 (14:38 +0200)]
apache plugin: Use the HTTP header to determine the server software.

On Wed, Apr 22, 2009 at 1:53 PM, Florian Forster <octo@verplant.org> wrote:
> I think we have two options left:
>
>  - Set a header callback using the CURLOPT_HEADERFUNCTION option and
>   look for the <91>Server<92> header field. If it contains <93>lighttpd<94>, assume
>   lighttpd, Apache otherwise.
>
>  - Let the user configure which server software he's using.
>
> The two could be combined, of course: Use the user's setting if he has
> given one, (try to) determine the server software automatically if not.
>
> What do you think?
yeah this sounds good. While I thought about parsing the headers
initially but then the server headers can easily be changed, so I
wasn't sure about this approach earlier. Combing this with the user
specified server configuration value seems like the best solution.

Do find the patch attached. I am using st->server_type variable which
will be set to APACHE or LIGHTTPD based on the following logic:
- If the user has specified Server element in the conf file and it is
"apache" or "lighttpd", then set  st->server_type variable
appropriately, otherwise ignore the Server value
- Parse the headers (only if the Server element is NULL or invalid) to
determine the type and set the st->server_type variable accordingly
- if  st->server_type is not set as yet, then default it to apache

Regards
Amit

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoAdd _XOPEN_SOURCE=600 to all .c files with standards compliance defines.
Florian Forster [Sat, 25 Apr 2009 22:33:09 +0000 (00:33 +0200)]
Add _XOPEN_SOURCE=600 to all .c files with standards compliance defines.

This should hopefully give us strerror_r and strdup and similar neat
functions.

15 years agoMerge branch 'ff/auth'
Florian Forster [Sat, 25 Apr 2009 21:58:23 +0000 (23:58 +0200)]
Merge branch 'ff/auth'

15 years agocollectd.conf(5): Add some information about the AuthFile format.
Florian Forster [Sat, 25 Apr 2009 21:56:27 +0000 (23:56 +0200)]
collectd.conf(5): Add some information about the AuthFile format.

15 years agonetwork plugin: Defines for non-gcrypt-code.
Florian Forster [Sat, 25 Apr 2009 21:33:42 +0000 (23:33 +0200)]
network plugin: Defines for non-gcrypt-code.

15 years agocollectd.conf(5): Document the new authentication stuff.
Florian Forster [Sat, 25 Apr 2009 21:27:49 +0000 (23:27 +0200)]
collectd.conf(5): Document the new authentication stuff.

15 years agonetwork plugin: Some fixed to get encryption up and running again.
Florian Forster [Sat, 25 Apr 2009 13:39:11 +0000 (15:39 +0200)]
network plugin: Some fixed to get encryption up and running again.

Wow, that was easy!

15 years agoMerge branch 'master' into ff/auth
Florian Forster [Sat, 25 Apr 2009 13:29:08 +0000 (15:29 +0200)]
Merge branch 'master' into ff/auth

Conflicts:
src/network.c

15 years agonetwork plugin: Move towards a user/password based solution.
Florian Forster [Sat, 25 Apr 2009 13:16:32 +0000 (15:16 +0200)]
network plugin: Move towards a user/password based solution.

15 years agosrc/utils_fbhash.c: Implementation of a file-backed hash.
Florian Forster [Sat, 25 Apr 2009 13:16:01 +0000 (15:16 +0200)]
src/utils_fbhash.c: Implementation of a file-backed hash.

This is going to be used for password files on the server.

15 years agophp-collection: add basic support for meta-selections
Bruno Prémont [Mon, 20 Apr 2009 20:37:42 +0000 (22:37 +0200)]
php-collection: add basic support for meta-selections

Add support for new meta selections allowing addition of graphs
with wildcard behavior.
This adds support for @all selection which matches any values
for the given identifier part.
In addition those types for which meta graphs exist now also list the
individual type instances in addition to the meta graph key for separate
graphing.

In order to support such new groups the lookup code has been refactored
to use a single scanning function which recursively traveses the
collectd RRD output directory for hosts, plugins, types and passing the
discovered data to callback functions for use. The callbacks returns
true to indicate traversal should continue on to next depth level and
false to tell it to continue with next element.
e.g. true on a host means it should look for plugins for given host,
false to continue with next host.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agophp-collection: graph definition improvements for bind plugin
Bruno Prémont [Mon, 20 Apr 2009 20:36:12 +0000 (22:36 +0200)]
php-collection: graph definition improvements for bind plugin

Add new dns_qtype_cached type for metagraph and switch memory metagraph
to line-based for bind plugin as the values from bind plugin are not
cumulative.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agophp-collection: New graph toolbox
Bruno Prémont [Mon, 20 Apr 2009 20:35:25 +0000 (22:35 +0200)]
php-collection: New graph toolbox

This patch creates a new toolbox which can be show on a per-graph base
by clicking on a graph.

This box allows changing the displayed period of the selected graph
as well as toggle the logarithmic scale and legend details flags.

The graph reordering, refresh and delete tools have been moved from
right graph edge to this new toolbox.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agomysql plugin: Replace all `magic numbers' (static string lengths).
Rodolphe Quiédeville [Thu, 23 Apr 2009 09:33:54 +0000 (11:33 +0200)]
mysql plugin: Replace all `magic numbers' (static string lengths).

I saw you correct my patch to suppress 'magic numbers', as I copy/paste another
part I suppose you want to supress all off them, I dit it in this patch. This
patch correct the typo I made on my name.

Regards

--
Rodolphe Quiedeville
www.bearstech.com

15 years agoconfigure.in, network plugin: Use all tests to decide about gcrypt support.
Florian Forster [Thu, 23 Apr 2009 09:10:26 +0000 (11:10 +0200)]
configure.in, network plugin: Use all tests to decide about gcrypt support.

On Doug's OpenBSD machine I've seen:
 configure: gcrypt CPPFLAGS: -I/usr/local/include  -I/usr/local/include
 checking gcrypt.h usability... yes
 checking gcrypt.h presence... yes
 checking for gcrypt.h... yes
 configure: gcrypt LDFLAGS: -L/usr/local/lib
 checking for gcry_md_hash_buffer in -lgcrypt... no

Because so far the network plugin only used the existence of the header
file to determine whether or not to enable `gcrypt' support, the build
fails. With this patch, the plugin will use a define that's only
available if *all* tests were successful.

15 years agomysql plugin: Use `strlen ("Table_locks_")' rather than `12'.
Florian Forster [Thu, 23 Apr 2009 07:35:46 +0000 (09:35 +0200)]
mysql plugin: Use `strlen ("Table_locks_")' rather than `12'.

15 years agomysql plugin: Add `lock' statistics.
Rodolphe Quiédevillel [Thu, 23 Apr 2009 07:16:08 +0000 (09:16 +0200)]
mysql plugin: Add `lock' statistics.

Hi,

We evaluate collectd for internal use in our global monitoring system. For that
we need to monitor mysql locks, so as collectd doesn't do this I wrote a little
patch. This patch is based on 4.6.2 version and modify only src/mysql.c, hope
you'll find it usefull. If this patch is acceptable please feel free to
integrate it in your next release.

Regards,

--
Rodolphe Quiedeville
www.bearstech.com

15 years agosrc/libcollectdclient/: Specify _XOPEN_SOURCE=600.
Florian Forster [Mon, 20 Apr 2009 20:04:28 +0000 (22:04 +0200)]
src/libcollectdclient/: Specify _XOPEN_SOURCE=600.

15 years agoirq plugin: Parse interrupt counters as unsigned long long.
Tomasz Pala [Sat, 18 Apr 2009 15:45:01 +0000 (17:45 +0200)]
irq plugin: Parse interrupt counters as unsigned long long.

Hello,

attached patch fixes accounting of most frequent interrupts (like NICs
on routers). E.g. in my case:

213:      76266      76357      76250      76397 2408617852 2411844062 2411642538 2411814531   PCI-MSI-edge      eth1
214: 2621368360 2621463385 2621343444 2621386931    2349184         28         35         32   PCI-MSI-edge      eth0

Here LONG_MAX (2147483647L) overflows in 10 days uptime and strtol()
returns the same value.

As all the values (including counter_t) are unsigned long long int, the
fix is trivial (for now there's no need to check for irq_value overflow;>).

--
Tomasz Pala <gotar@pld-linux.org>

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoirq plugin: Parse interrupt counters as unsigned long long.
Tomasz Pala [Sat, 18 Apr 2009 15:45:01 +0000 (17:45 +0200)]
irq plugin: Parse interrupt counters as unsigned long long.

Hello,

attached patch fixes accounting of most frequent interrupts (like NICs
on routers). E.g. in my case:

213:      76266      76357      76250      76397 2408617852 2411844062 2411642538 2411814531   PCI-MSI-edge      eth1
214: 2621368360 2621463385 2621343444 2621386931    2349184         28         35         32   PCI-MSI-edge      eth0

Here LONG_MAX (2147483647L) overflows in 10 days uptime and strtol()
returns the same value.

As all the values (including counter_t) are unsigned long long int, the
fix is trivial (for now there's no need to check for irq_value overflow;>).

--
Tomasz Pala <gotar@pld-linux.org>

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoMerge branch 'master' into ag/apache
Florian Forster [Mon, 20 Apr 2009 18:41:55 +0000 (20:41 +0200)]
Merge branch 'master' into ag/apache

Conflicts:
src/apache.c

15 years agoapache plugin: Remove the `connect' variable: It wasn't really being used.
Florian Forster [Mon, 20 Apr 2009 18:39:27 +0000 (20:39 +0200)]
apache plugin: Remove the `connect' variable: It wasn't really being used.

15 years agoapache plugin: Replace C++-style comments.
Florian Forster [Mon, 20 Apr 2009 18:26:44 +0000 (20:26 +0200)]
apache plugin: Replace C++-style comments.

15 years agoapache plugin: Add support for lighttpd's scoreboard metrics.
Amit Gupta [Mon, 20 Apr 2009 16:40:49 +0000 (22:10 +0530)]
apache plugin: Add support for lighttpd's scoreboard metrics.

Hi,

Do find the patch for lighttpd scoreboard attached. Let me know if
this patch looks okay.

Regards
Amit

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoapache plugin: Check if an URL was given at configuration time.
Florian Forster [Mon, 20 Apr 2009 18:12:53 +0000 (20:12 +0200)]
apache plugin: Check if an URL was given at configuration time.

15 years agoapache plugin: Use boolean members for "verify_{peer,host}".
Florian Forster [Mon, 20 Apr 2009 18:10:26 +0000 (20:10 +0200)]
apache plugin: Use boolean members for "verify_{peer,host}".

15 years agoapache plugin: Use the "complex read" interface.
Florian Forster [Mon, 20 Apr 2009 17:52:19 +0000 (19:52 +0200)]
apache plugin: Use the "complex read" interface.