Code

collectd.git
15 years agoReplace dashes with underscores in python modules
Garret Heaton [Sun, 18 Oct 2009 21:06:22 +0000 (14:06 -0700)]
Replace dashes with underscores in python modules

It's not possible to import python modules with dashes in the name.
See http://bit.ly/2t7fcy for more information.

15 years agoconfigure.in: Don't use “find -L”.
Florian Forster [Thu, 8 Oct 2009 17:00:21 +0000 (19:00 +0200)]
configure.in: Don't use “find -L”.

Apparently the “-L” is a (new) GNU extension. :/

15 years agocollectd-snmp(5): Fix a typo.
Florian Forster [Thu, 8 Oct 2009 16:57:04 +0000 (18:57 +0200)]
collectd-snmp(5): Fix a typo.

Thanks to mspo.

15 years agoBumped version to 4.7.4; Updated ChangeLog. collectd-4.7.4
Florian Forster [Sat, 3 Oct 2009 15:44:24 +0000 (17:44 +0200)]
Bumped version to 4.7.4; Updated ChangeLog.

15 years agoREADME: Fix order of the curl plugin in the list.
Florian Forster [Fri, 2 Oct 2009 07:47:54 +0000 (09:47 +0200)]
README: Fix order of the curl plugin in the list.

15 years agodf plugin: Fix a typo.
Florian Forster [Fri, 2 Oct 2009 06:27:44 +0000 (08:27 +0200)]
df plugin: Fix a typo.

15 years agounixsock plugin: Fix a (well hidden) race condition.
Florian Forster [Wed, 30 Sep 2009 20:49:16 +0000 (22:49 +0200)]
unixsock plugin: Fix a (well hidden) race condition.

Within the client handling thread, fdopen is called twice on the file
descriptor passed to the thread. Later those file handles are closed like:

  fclose (fhin);
  fclose (fhout);

This is a race condition, because the first call to fclose will close the file
descriptor. The second call to fclose will try the same. Usually, it would fail
silently and all is well. On a busy machine, however, another thread may just
have opened a file or accepted a socket. In that case an arbitrary file
descriptor is closed. If the file descriptor is opened yet again fast enough,
data may even end up in a totally wrong location.

As a work-around the file descriptor is not dup'ed so each fdopen operates on
its own file descriptor. As an alternative the "r+" mode and a single file
handle may be suitable, too.

Many thanks to Sven Trenkel for pointing me into the right directioin :)

15 years agolibiptc: Comment out two unused static functions.
Florian Forster [Sat, 26 Sep 2009 08:48:50 +0000 (10:48 +0200)]
libiptc: Comment out two unused static functions.

Thanks to Sven Trenkel for noticing.

15 years agoprocesses plugin: Fix handling of Linux 2.4.
Andrés J. Díaz [Sat, 19 Sep 2009 06:45:49 +0000 (08:45 +0200)]
processes plugin: Fix handling of Linux 2.4.

Hi Florian et al

Thanks for the reply, but we detect a minor bug in the previous patch
due to kernel 2.4

The correct patch is attached. The bug is related with kernels 2.4,
where task/ directory do not exists and ps_read_task return -1, which is
catched and raise an error (breaking the ps_read_process function), so a
NaN is dispatched istead of values (number of process:1, number of
threads :1).

Sorry for the inconvenience :(

Regards,
  Andres

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoperl plugin: Declare the “environ” variable.
Florian Forster [Thu, 17 Sep 2009 16:26:41 +0000 (18:26 +0200)]
perl plugin: Declare the “environ” variable.

15 years agoprocesses plugin: Case argument of “isdigit” to int.
Florian Forster [Thu, 17 Sep 2009 16:02:34 +0000 (18:02 +0200)]
processes plugin: Case argument of “isdigit” to int.

On some platforms passing a char there causes problems :/

15 years agoprocesses plugin: Remove unnecessary call of realloc(3).
Andrés J. Díaz [Thu, 17 Sep 2009 11:15:02 +0000 (13:15 +0200)]
processes plugin: Remove unnecessary call of realloc(3).

Hi Florian (et al)

> you're right, the (re-)allocation of the memory can probably be avoided
> if the function is turned into one with the following prototype:
> -- 8< --
>  static int *ps_read_tasks (int pid,
>     unsigned long *ret_num_proc,
>     unsigned long *ret_num_lwp);
> -- >8 --

Mmm, why not something like: "static int ps_read_task(pid)"?
This returns the number of task for pid passed as argument.
(AFAIK the function only return the number ot threads), why
we need the ret_num_proc and the ret_num_lwp parameters?

My proposal is attached (code is always cleaner than explanations :P)

Regards,
  Andres

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoBuild system: Check for “libiptc/libip6tc.h” and “linux/netfilter/x_tables.h”, too.
Florian Forster [Thu, 17 Sep 2009 08:56:19 +0000 (10:56 +0200)]
Build system: Check for “libiptc/libip6tc.h” and “linux/netfilter/x_tables.h”, too.

Apparently “linux/netfilter/x_tables.h” is not available with older
kernels which leads to build fails there:
-- 8< --
 In file included from libiptc.c:47,
                  from libip4tc.c:136:
 xtables.h:24:38: linux/netfilter/x_tables.h: No such file or directory
-- >8 --

15 years agosrc/owniptc/Makefile.am: Don't search KERNEL_DIR for headers.
Florian Forster [Thu, 17 Sep 2009 08:12:07 +0000 (10:12 +0200)]
src/owniptc/Makefile.am: Don't search KERNEL_DIR for headers.

The iptc library is currenly only enabled, if the required headers where
found without “-I${KERNEL_DIR}”. Adding it to the CFLAGS when building
the shipped version of libiptc just breaks things, for example on
“collectd-master-amd64-linux-2.6”:
  Linux hotdamn 2.6.9-42.ELsmp #1 SMP Tue Aug 15 10:35:26 BST 2006 x86_64 x86_64 x86_64 GNU/Linux

15 years agoREADME: Document the “--with-libiptc=shipped” option.
Florian Forster [Thu, 17 Sep 2009 07:40:01 +0000 (09:40 +0200)]
README: Document the “--with-libiptc=shipped” option.

15 years agoBuild system: Further improve libiptc handling.
Florian Forster [Thu, 17 Sep 2009 07:36:35 +0000 (09:36 +0200)]
Build system: Further improve libiptc handling.

Only check for “iptc_handle_t” and “ip6tc_handle_t” if using a
system-wide version of libiptc. If we use the shipped version, we *know*
it provides these types.

15 years agoBuild system: Improve detection of the iptc library.
Florian Forster [Thu, 17 Sep 2009 06:44:07 +0000 (08:44 +0200)]
Build system: Improve detection of the iptc library.

When checking for the iptc headers and data types, the configure script
added the kernel directory to the CFLAGS. Later, when actually building
the iptables plugin, the CFLAGS were left untouched.

At least on Debian, the “real” kernel headers are not required – the
libc versions in /usr/include/linux are sufficient. The usage of
KERNEL_DIR has therefore been removed from the iptc checks.

In addition, an directory specified by “--with-libiptc=/path” is no
longer added to the global CFLAGS but rather to the iptables specific
CPPFLAGS.

Hopefully this resolved build problems on various platforms.

15 years agocontrib/collection3: skip host dirs without read access.
Marc Fournier [Wed, 16 Sep 2009 10:17:28 +0000 (12:17 +0200)]
contrib/collection3: skip host dirs without read access.

This patch prevents get_files_from_directory() from
failing when DataDir contains directories which we
don't have access to.

An example would be "lost+found" directories, on
ext2/ext3 filesystems, which belong to root and have
0700 filemode.

Signed-off-by: Marc Fournier <marc.fournier@camptocamp.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agocontrib/collection3: “Invokations” → “Invocations”.
Florian Forster [Wed, 16 Sep 2009 11:02:40 +0000 (13:02 +0200)]
contrib/collection3: “Invokations” → “Invocations”.

D'oh!

15 years agocontrib/collection3: Add a vertical label to the “java_memory” type.
Florian Forster [Wed, 16 Sep 2009 11:00:41 +0000 (13:00 +0200)]
contrib/collection3: Add a vertical label to the “java_memory” type.

15 years agocontrib/collection3: Added the “invokations” type.
Florian Forster [Wed, 16 Sep 2009 11:00:19 +0000 (13:00 +0200)]
contrib/collection3: Added the “invokations” type.

15 years agocontrib/collection3: Use “{plugin_inst}/{type_inst}” for “{instance}”
Florian Forster [Wed, 16 Sep 2009 09:47:42 +0000 (11:47 +0200)]
contrib/collection3: Use “{plugin_inst}/{type_inst}” for “{instance}”

… if both are present. Otherwise, use just the one that is available.

15 years agocontrib/collection3: Add support for the “threads” and “total_requests” types.
Florian Forster [Wed, 16 Sep 2009 09:43:57 +0000 (11:43 +0200)]
contrib/collection3: Add support for the “threads” and “total_requests” types.

15 years agoexec plugin: Clear the signal block mask before calling exec(2).
Florian Forster [Tue, 15 Sep 2009 13:40:47 +0000 (15:40 +0200)]
exec plugin: Clear the signal block mask before calling exec(2).

15 years agoexec plugin: Avoid a warning when freeing meta data.
Florian Forster [Mon, 14 Sep 2009 14:01:48 +0000 (16:01 +0200)]
exec plugin: Avoid a warning when freeing meta data.

15 years agocontrib/collection3: Suppress warnings about non-existent classes.
Florian Forster [Mon, 14 Sep 2009 13:41:07 +0000 (15:41 +0200)]
contrib/collection3: Suppress warnings about non-existent classes.

15 years agoconfigure.in: Make it possible to force the shipped version of libiptc.
Florian Forster [Sun, 13 Sep 2009 20:20:48 +0000 (22:20 +0200)]
configure.in: Make it possible to force the shipped version of libiptc.

You can force the shipped version of libiptc using:
  --with-libiptc=shipped

Apparently enough systems include broken versions of that library :/

15 years agoconfigure.in: Quote $CFLAGS when assigning to another variable.
Florian Forster [Sun, 13 Sep 2009 20:05:21 +0000 (22:05 +0200)]
configure.in: Quote $CFLAGS when assigning to another variable.

15 years agoBumped version to 4.7.3; Updated ChangeLog. collectd-4.7.3
Florian Forster [Sun, 13 Sep 2009 10:36:33 +0000 (12:36 +0200)]
Bumped version to 4.7.3; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sun, 13 Sep 2009 10:24:20 +0000 (12:24 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
version-gen.sh

15 years agoBump version to 4.6.5. collectd-4.6.5
Florian Forster [Thu, 10 Sep 2009 18:19:24 +0000 (20:19 +0200)]
Bump version to 4.6.5.

15 years agocollection3: Added some more metrics.
Florian Forster [Wed, 26 Aug 2009 13:09:47 +0000 (15:09 +0200)]
collection3: Added some more metrics.

15 years agoFixed the year of the first three entries.
Florian Forster [Wed, 9 Sep 2009 16:37:25 +0000 (18:37 +0200)]
Fixed the year of the first three entries.

They say it was 2004, but in fact they were released in 2005.

15 years agoChangeLog: Add entries for release 4.6.5.
Florian Forster [Wed, 9 Sep 2009 16:36:45 +0000 (18:36 +0200)]
ChangeLog: Add entries for release 4.6.5.

15 years agopowerdns plugin: Use the “ipt_packets” type rather than “io_packets”.
Florian Forster [Tue, 8 Sep 2009 15:45:56 +0000 (17:45 +0200)]
powerdns plugin: Use the “ipt_packets” type rather than “io_packets”.

“io_packets”, as the name suggests, requires incoming *and* outgoing
packets. The infrastructure of the powerdns plugin uses only value lists
with one data source though.

Thanks to Luke for noticing!

15 years agocontrib/collectd_unix_sock.rb: Ruby class which abstracts the plain text protocol.
Duncan Mac-Vicar P [Sun, 6 Sep 2009 15:22:37 +0000 (17:22 +0200)]
contrib/collectd_unix_sock.rb: Ruby class which abstracts the plain text protocol.

Used to talk to the unixsock plugin.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoMerged branch 'sh/collectd-4.6' into sh/collectd-4.7.
Sebastian Harl [Sun, 6 Sep 2009 12:52:15 +0000 (12:52 +0000)]
Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.

Conflicts:
src/iptables.c

To resolve the conflict, the changes to the iptables plugin have been updated
to support ip6tc as well.

15 years agoiptables plugin: Support the new libiptc API.
Sebastian Harl [Sun, 6 Sep 2009 12:14:55 +0000 (12:14 +0000)]
iptables plugin: Support the new libiptc API.

When libiptc has been officially made available as a shared library, the API
and ABI have been changed slightly. By checking for the existance of a type
that has been removed in that course, configure now checks which version is
available. This is quite error prone (the type might be re-introduced any
time), so this should be improved some time - currently, I do not have an idea
how to do so, though :-/

15 years agoconfigure: Replaced src/libiptc/ with src/owniptc/.
Sebastian Harl [Sun, 6 Sep 2009 10:36:10 +0000 (10:36 +0000)]
configure: Replaced src/libiptc/ with src/owniptc/.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sun, 6 Sep 2009 10:15:06 +0000 (12:15 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
configure.in
src/iptables.c

15 years agosrc/owniptc: Moved the “src/libiptc” directory to “src/owniptc” to avoid build issues.
Florian Forster [Sun, 6 Sep 2009 10:06:12 +0000 (12:06 +0200)]
src/owniptc: Moved the “src/libiptc” directory to “src/owniptc” to avoid build issues.

If there is a system-wide version of this library available, the “-I.”
argument (added automatically by automake :() will lead to the shipped
header files being used. Later, the binary is linked with the
system-wide library, which leads to severe problems when API/ABI
incompatibilities have been introduced in other versions.

15 years agomysql plugin: Improve the `mysql_ping' warning.
Florian Forster [Tue, 1 Sep 2009 20:49:47 +0000 (22:49 +0200)]
mysql plugin: Improve the `mysql_ping' warning.

15 years agonetwork plugin: Move the gcrypt initialization into “network_init”.
Florian Forster [Mon, 31 Aug 2009 18:30:23 +0000 (20:30 +0200)]
network plugin: Move the gcrypt initialization into “network_init”.

15 years agonetwork plugin: Fix initialization of the gcrypt library.
Luke Heberling [Mon, 31 Aug 2009 17:31:30 +0000 (10:31 -0700)]
network plugin: Fix initialization of the gcrypt library.

Subject: Ohhhh jeeee, libgcrypt 1.4.1 + collectd 4.7.2

On Monday 31 August 2009 09:03:37 Sebastian Harl wrote:
> Hrm … from a quick look at the libcrypt documentation I suppose we need
> to call gcry_control() using the 'GCRYCTL_INIT_SECMEM' command to
> explicitly initialize the secure memory. Sounds like this was required
> in libgcrypt 1.4.1 but is handled automatically in later versions.
>

also looks like there's some special initialization necessary for threads. I
doubt that this is handled by the new default behavior in 1.4.4. Don't know
that it's truly necessary if the network plugin is the only plugin using
gcrypt.

Here's a patch that works for me with 1.4.1.
I followed an example for pthread initialization and  initialized gcry to 32k,
only since that's apparently the default that's used in 1.4.3. I did it in
network.c's module_register function. Kind of an abuse, I know.

Luke Heberling

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agocontrib/collection3: Allow numbers in type names.
Anthony Dewhurst [Sun, 30 Aug 2009 21:32:55 +0000 (22:32 +0100)]
contrib/collection3: Allow numbers in type names.

When converting the on-disk type name to the displayed name,
do not strip numbers out.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocontrib/collection3: GenericStacked: Use stacking by default.
Florian Forster [Mon, 31 Aug 2009 15:16:40 +0000 (17:16 +0200)]
contrib/collection3: GenericStacked: Use stacking by default.

15 years agocontrib/collection3: Option to turn stacking off in GenericStacking
Anthony Dewhurst [Sun, 2 Aug 2009 22:25:45 +0000 (23:25 +0100)]
contrib/collection3: Option to turn stacking off in GenericStacking

CDEFs are not stacked and AREAs are not added when "Stacking" is set to off.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agosrc/plugin.c: unregister_read: llist_search may return NULL.
Florian Forster [Sat, 29 Aug 2009 11:58:56 +0000 (13:58 +0200)]
src/plugin.c: unregister_read: llist_search may return NULL.

Handle these cases gracefully.

15 years agocontrib/collection.cgi: Fix spam_check graph for email plugin.
Brad Fritz [Mon, 24 Aug 2009 17:25:37 +0000 (13:25 -0400)]
contrib/collection.cgi: Fix spam_check graph for email plugin.

Corrects DS name to fix email plugin's spam_check graph.

Signed-off-by: Brad Fritz <brad@fewerhassles.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agocollection3: Add a module for the “java_memory” type.
Florian Forster [Wed, 26 Aug 2009 11:47:47 +0000 (13:47 +0200)]
collection3: Add a module for the “java_memory” type.

15 years agocollection3: Add the possibility to scale generic graphs.
Florian Forster [Wed, 26 Aug 2009 11:46:36 +0000 (13:46 +0200)]
collection3: Add the possibility to scale generic graphs.

15 years agocontrib/cussh.pl: Add synopsis for specific commands.
Florian Forster [Wed, 26 Aug 2009 09:31:24 +0000 (11:31 +0200)]
contrib/cussh.pl: Add synopsis for specific commands.

You can now do
  HELP FLUSH
to get information about the FLUSH command.

15 years agocontrib/cussh.pl: Fix a typo in the `FLUSH' command.
Florian Forster [Wed, 26 Aug 2009 08:34:08 +0000 (10:34 +0200)]
contrib/cussh.pl: Fix a typo in the `FLUSH' command.

15 years agoREADME: liboping is no longer shipped.
Florian Forster [Sun, 23 Aug 2009 08:54:22 +0000 (10:54 +0200)]
README: liboping is no longer shipped.

15 years agocontrib/collection3: Common.pm: Sort identifiers by filename.
Aman Gupta [Sat, 22 Aug 2009 12:07:26 +0000 (14:07 +0200)]
contrib/collection3: Common.pm: Sort identifiers by filename.

15 years agodf plugin: Check ignorelists before stat'ing the filesystem.
Florian Forster [Thu, 20 Aug 2009 12:10:37 +0000 (14:10 +0200)]
df plugin: Check ignorelists before stat'ing the filesystem.

 → See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542859

15 years agopowerdns plugin: Fix handling of the “LocalSocket” config option.
Luke Heberling [Thu, 20 Aug 2009 12:10:37 +0000 (14:10 +0200)]
powerdns plugin: Fix handling of the “LocalSocket” config option.

 → See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535787

15 years agopowerdns plugin: Set a timeout for the datagram socket.
Luke Heberling [Thu, 20 Aug 2009 12:08:53 +0000 (14:08 +0200)]
powerdns plugin: Set a timeout for the datagram socket.

 → See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535787

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Thu, 20 Aug 2009 11:52:34 +0000 (13:52 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
src/apache.c

15 years agoPlugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option.
Florian Forster [Thu, 20 Aug 2009 11:48:23 +0000 (13:48 +0200)]
Plugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option.

This hopefully fixes Debian#541953.

15 years agoRemoved remaining traces of the "main" chain.
Sebastian Harl [Tue, 18 Aug 2009 07:55:42 +0000 (09:55 +0200)]
Removed remaining traces of the "main" chain.

The chains are called "PreCache" and "PostCache" now.

15 years agojava plugin: Fix configuration with multiple blocks.
Florian Forster [Mon, 17 Aug 2009 08:52:16 +0000 (10:52 +0200)]
java plugin: Fix configuration with multiple blocks.

The number of children was not updated.

15 years agojava plugin: Wait with the configuration until the daemon has forked.
Florian Forster [Mon, 17 Aug 2009 08:39:55 +0000 (10:39 +0200)]
java plugin: Wait with the configuration until the daemon has forked.

Passing the configuration to Java-based plugins requires the JVM to be
active and running. However, the JVM starts some threads that are lost
when the daemon forks to the background.

This patch changes the behavior of the Java plugin to copy the
configuration blocks found to a local variable and run the configuration
of the Java-based plugins from the `init' callback, because it is
invoked after the daemon has forked to the background.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 17 Aug 2009 07:48:43 +0000 (09:48 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agocontrib/fedora/init.d-collectd: Fix condrestart.
Alan Pevec [Tue, 11 Aug 2009 22:52:47 +0000 (00:52 +0200)]
contrib/fedora/init.d-collectd: Fix condrestart.

on upgrade collectd is not restarted
https://bugzilla.redhat.com/show_bug.cgi?id=516273

Signed-off-by: Alan Pevec <apevec@redhat.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/utils_cache.c: Update GETVAL output when missing state.
Andrés J. Díaz [Tue, 11 Aug 2009 19:57:34 +0000 (21:57 +0200)]
src/utils_cache.c: Update GETVAL output when missing state.

Hi

I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.

I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.

BTW a GETSTATE command will be an useful feature too :P

Regards,
  Andres

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/utils_cache.c: Update GETVAL output when missing state.
Andrés J. Díaz [Tue, 11 Aug 2009 19:57:34 +0000 (21:57 +0200)]
src/utils_cache.c: Update GETVAL output when missing state.

Hi

I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.

I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.

BTW a GETSTATE command will be an useful feature too :P

Regards,
  Andres

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/plugin.c: Make `plugin_unregister_read' functional again.
Florian Forster [Thu, 13 Aug 2009 10:37:20 +0000 (12:37 +0200)]
src/plugin.c: Make `plugin_unregister_read' functional again.

15 years agolibvirt plugin: Further improve the connection handling.
Florian Forster [Wed, 12 Aug 2009 13:08:40 +0000 (15:08 +0200)]
libvirt plugin: Further improve the connection handling.

Use the complaint mechanism for failed connection attempts and handle multiple
`Connection' configuration options like other options in other plugins (i. e.
later options overwrite earlier settings of the same name).

15 years agolibvirt plugin: Re-connect to libvirtd if connecting fails.
Alan Pevec [Tue, 11 Aug 2009 22:53:00 +0000 (00:53 +0200)]
libvirt plugin: Re-connect to libvirtd if connecting fails.

https://bugzilla.redhat.com/show_bug.cgi?id=480997

Signed-off-by: Alan Pevec <apevec@redhat.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/meta_data.c: Fix a typo.
Florian Forster [Wed, 22 Jul 2009 08:20:59 +0000 (10:20 +0200)]
src/meta_data.c: Fix a typo.

15 years agocollectd.conf(5): Fix two minor typos.
Florian Forster [Tue, 4 Aug 2009 15:37:25 +0000 (17:37 +0200)]
collectd.conf(5): Fix two minor typos.

15 years agonetwork plugin: Fix an incorrectly used configuration variable.
Florian Forster [Tue, 4 Aug 2009 10:13:41 +0000 (12:13 +0200)]
network plugin: Fix an incorrectly used configuration variable.

The `CacheFlush' option was assigned to the `TTL' variable. Ouch.

Version 4.6 and earlier are not effected.

15 years agoMerge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
Florian Forster [Sun, 2 Aug 2009 10:22:20 +0000 (12:22 +0200)]
Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6

15 years agocontrib/collection3: Don't use SI prefix for number of processes
Anthony Dewhurst [Thu, 30 Jul 2009 20:42:07 +0000 (21:42 +0100)]
contrib/collection3: Don't use SI prefix for number of processes

I, at least, don't normally measure processes in "milliprocesses".

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocollection3/etc/collection.conf: Reencoded in UTF-8.
Sebastian Harl [Sun, 26 Jul 2009 13:01:53 +0000 (15:01 +0200)]
collection3/etc/collection.conf: Reencoded in UTF-8.

Depending on the locale settings, RRDtool might fail to handle "special
characters" correctly. Using UTF-8 is a way to work around that issue.

Thanks to Daniel Danner for reporting and testing this.

15 years agosrc/utils_cache.c: Make really sure to free the right cache entry.
Sebastian Harl [Wed, 8 Jul 2009 11:19:57 +0000 (13:19 +0200)]
src/utils_cache.c: Make really sure to free the right cache entry.

Make sure we do not try to free a (possibly some random) cache entry after
removing it from the AVL tree. Potentially, this might have caused invalid
free()s in some rare situations.

15 years agosrc/collectd.conf.in: Fix a typo.
Florian Forster [Tue, 21 Jul 2009 06:46:49 +0000 (08:46 +0200)]
src/collectd.conf.in: Fix a typo.

15 years agoChangeLog: Fix a typo.
Florian Forster [Sun, 19 Jul 2009 15:38:55 +0000 (17:38 +0200)]
ChangeLog: Fix a typo.

15 years agoChangeLog: Fix a typo.
Florian Forster [Sun, 19 Jul 2009 15:38:08 +0000 (17:38 +0200)]
ChangeLog: Fix a typo.

15 years agoBumped version to 4.7.2; Updated ChangeLog. collectd-4.7.2
Florian Forster [Sun, 19 Jul 2009 11:04:20 +0000 (13:04 +0200)]
Bumped version to 4.7.2; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sun, 19 Jul 2009 11:00:20 +0000 (13:00 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
version-gen.sh

15 years agoBumped version to 4.6.4; Updated ChangeLog. collectd-4.6.4
Florian Forster [Sat, 18 Jul 2009 14:36:44 +0000 (16:36 +0200)]
Bumped version to 4.6.4; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 15 Jul 2009 09:10:19 +0000 (11:10 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:

src/memcached.c

15 years agosrc/configfile.c: Warn if an unexpected block is found.
Florian Forster [Wed, 15 Jul 2009 08:09:48 +0000 (10:09 +0200)]
src/configfile.c: Warn if an unexpected block is found.

If the `snmp' plugin isn't loaded (but a configuration exists), no
warning is printed because there are only blocks in the SNMP
configuration..

15 years agobuild.sh, version-gen.sh: Remove bashisms.
Florian Forster [Sun, 12 Jul 2009 09:03:07 +0000 (11:03 +0200)]
build.sh, version-gen.sh: Remove bashisms.

Thanks to Peter Bray for pointing them out.

15 years agosrc/utils_cache.c: `ce' *is* written to in `c_avl_remove'.
Florian Forster [Wed, 8 Jul 2009 09:55:33 +0000 (11:55 +0200)]
src/utils_cache.c: `ce' *is* written to in `c_avl_remove'.

Therefore we should definitely free it.

15 years agosrc/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.
Florian Forster [Wed, 8 Jul 2009 08:51:28 +0000 (10:51 +0200)]
src/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.

This may habe been a cause of the reported assertion failure, too.

15 years agosrc/utils_cache.c: Add a missing `continue'.
Paul Sadauskas [Wed, 8 Jul 2009 08:49:23 +0000 (10:49 +0200)]
src/utils_cache.c: Add a missing `continue'.

tokkee on IRC & I think we found a bug with utils_cache.c. The uc_check_timeout
function is missing a continue after the "uninteresting" service check, that
causes a key to be null.

This probably caused an assertion failure in cache_compare as reported by
Mariusz.

15 years agocpu plugin: Fix a typo.
Florian Forster [Mon, 6 Jul 2009 20:31:28 +0000 (22:31 +0200)]
cpu plugin: Fix a typo.

15 years agomemcached plugin: Pass `ai_hints' to `getaddrinfo'.
Amit Gupta [Mon, 6 Jul 2009 11:07:00 +0000 (13:07 +0200)]
memcached plugin: Pass `ai_hints' to `getaddrinfo'.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 6 Jul 2009 11:45:32 +0000 (13:45 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agobindings/java/Makefile.am: Fully support $DESTDIR.
Sebastian Harl [Mon, 22 Jun 2009 18:24:20 +0000 (20:24 +0200)]
bindings/java/Makefile.am: Fully support $DESTDIR.

15 years agosrc/Makefile: Link the ping plugin against libm.
Sebastian Harl [Sat, 6 Jun 2009 20:13:03 +0000 (22:13 +0200)]
src/Makefile: Link the ping plugin against libm.

The plugin now uses sqrt() which is provided by the math lib.

15 years agocollectd2html.pl: Added --recursive command line option.
Sebastian Harl [Mon, 22 Jun 2009 14:02:24 +0000 (16:02 +0200)]
collectd2html.pl: Added --recursive command line option.

This option may be used to recursively scan the specified directory for RRD
files. This way, the script works reasonably well with collectd 4.

Thanks to 'ABL <abl@xxx.lt>' for providing an initial patch in Debian bug
 #482185.

15 years agocollectd2html.pl: Allow for --imgformat to be passed to rrdtool.
Ivan Shmakov [Wed, 21 May 2008 10:40:04 +0000 (17:40 +0700)]
collectd2html.pl: Allow for --imgformat to be passed to rrdtool.

This was reported as Debian bug #482185.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
15 years agogmond plugin: Use `strtoull' to parse counter values.
Florian Forster [Wed, 1 Jul 2009 13:39:11 +0000 (15:39 +0200)]
gmond plugin: Use `strtoull' to parse counter values.

Instead of `strtoll'.

15 years agosrc/common.c: More reliable error reporting in `parse_values'.
Florian Forster [Wed, 1 Jul 2009 12:56:17 +0000 (14:56 +0200)]
src/common.c: More reliable error reporting in `parse_values'.

15 years agoconfigure.in: Add -rpath to JAVA_LDFLAGS.
Florian Forster [Sat, 27 Jun 2009 11:19:53 +0000 (13:19 +0200)]
configure.in: Add -rpath to JAVA_LDFLAGS.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7