Florian Forster [Sun, 13 Jun 2010 19:44:09 +0000 (21:44 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Sun, 13 Jun 2010 13:50:48 +0000 (15:50 +0200)]
bind plugin: Fix building with --enable-standards.
Florian Forster [Wed, 9 Jun 2010 08:38:55 +0000 (10:38 +0200)]
Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9
Florian Forster [Wed, 9 Jun 2010 08:38:11 +0000 (10:38 +0200)]
contrib/GenericJMX.conf: Use the "jmx_memory" type.
Sebastian Harl [Mon, 7 Jun 2010 22:55:32 +0000 (00:55 +0200)]
collectd.conf(5): Fixed some typos.
Thanks to lintian for reporting one of them ;-)
Timur Kirilichev [Fri, 7 May 2010 02:31:26 +0000 (06:31 +0400)]
collectd2html.pl: Further improvements to the XHTML support.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Max Henkel [Thu, 8 Apr 2010 10:06:29 +0000 (12:06 +0200)]
collectd2html.pl: Produce XHTML output.
… as requested in Debian bug #575029.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Yuri D'Elia [Fri, 18 Dec 2009 11:33:31 +0000 (12:33 +0100)]
collectd2html: Fixed recursive mode.
Also, improved default settings to match the collectd4 series.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Luke Heberling [Sun, 30 Aug 2009 19:41:13 +0000 (12:41 -0700)]
powerdns plugin: Fixed communication when talking to pdns 2.9.22.
powerdns version 2.9.22 (and above) require a newline at the end of
commands sent to the server.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Sebastian Harl [Thu, 3 Jun 2010 12:35:45 +0000 (14:35 +0200)]
collectd.conf.in: Added further sample config options.
Sebastian Harl [Thu, 3 Jun 2010 11:57:35 +0000 (13:57 +0200)]
collectd.conf.in: Added a sample config for the “modbus” plugin.
… copied from the plugin sources.
Florian Forster [Wed, 19 May 2010 14:23:55 +0000 (16:23 +0200)]
collectd.conf(5): Added documentation for the pinba plugin.
Aurelien Reynaud [Wed, 12 May 2010 09:55:05 +0000 (11:55 +0200)]
snmp.c: compilation fixes for AIX
The C and C++ standards allows the character type char to be signed or
unsigned, depending on the platform and compiler. Most systems,
including x86 GNU/Linux and Microsoft Windows, use signed char, but
those based on PowerPC and ARM processors typically use unsigned char.
This patch fixes a "comparison is always true" warning on AIX (powerpc)
which leads the compilation to abort because of the -Werror flag.
Being unsigned by default, a char is always >0.
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Aurelien Reynaud [Wed, 12 May 2010 09:55:04 +0000 (11:55 +0200)]
processes.c: fix uninitialized variables warnings
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Johan Van den Brande [Wed, 19 May 2010 10:23:23 +0000 (12:23 +0200)]
Bugfix for libcollectdclient lcc_putval.
Hello,
I'm using collectd to monitor system and process parameters of our code under
test running on a cluster. The test processes communicate to collectd via the
unixsock plugin, but there was a small error in the client library which I had
to fix first.
The wire format of the putval command is missing a space behind the closing
double quote of the identifier. As I said, it is a small fix, but nevertheless
I attached the patch for client.c. The bug is present in 4.6 (that is the
version I'm using in production), but I fixed it against 4.10.0.
Cheers,
Johan
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 19 May 2010 10:14:46 +0000 (12:14 +0200)]
snmp plugin: csnmp_value_list_to_value: Include the OID in the log message.
Florian Forster [Wed, 19 May 2010 09:47:45 +0000 (11:47 +0200)]
snmp plugin: Don't print a warning if the ASN type is "ASN_NULL".
Thanks to "Flyinvap" for pointing this out.
Sven Trenkel [Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/python.c
Florian Forster [Wed, 19 May 2010 08:47:58 +0000 (10:47 +0200)]
Merge remote branch 'origin/collectd-4.9' into collectd-4.9
Max Henkel [Tue, 4 May 2010 21:39:18 +0000 (23:39 +0200)]
configure.in: htonll check depends on linker
Fixing a cross-compile issue by depending only on a linker check.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sven Trenkel [Sat, 15 May 2010 20:36:25 +0000 (22:36 +0200)]
python: Fixed some memory leaks in the write and notification callbacks.
Thanks to Volkmar Uhlig for the hint.
Sven Trenkel [Mon, 3 May 2010 13:01:56 +0000 (15:01 +0200)]
python: Fixed a crash if the plugin was loaded but not configured.
Florian Forster [Mon, 3 May 2010 07:47:42 +0000 (09:47 +0200)]
src/Makefile.am: Fix building / packaging without the Pinba plugin.
Getting the dependency right on generated sources wasn't quite as easy as I
hoped.
Florian Forster [Mon, 3 May 2010 07:34:27 +0000 (09:34 +0200)]
collectd-python(5): Fix POD syntax error.
Florian Forster [Mon, 3 May 2010 07:23:55 +0000 (09:23 +0200)]
rrdtool plugin: Degrade a less than helpful warning to a debug message.
Florian Forster [Mon, 3 May 2010 07:22:39 +0000 (09:22 +0200)]
python plugin: Disable strict aliasing.
"Py_True" and "Py_False" have some weird implementation that GCC can't cope
with. Disable strict aliasing (and warnings relating to it) in order to avoid
those problems at the cost of optimization.
Florian Forster [Mon, 3 May 2010 07:21:45 +0000 (09:21 +0200)]
python plugin: Remove "const" of usage strings.
The struct member isn't const, resulting in a warning.
Florian Forster [Sat, 1 May 2010 13:17:52 +0000 (15:17 +0200)]
ChangeLog: Add attribution for the Pinba plugin.
Florian Forster [Sat, 1 May 2010 09:14:32 +0000 (11:14 +0200)]
src/Makefile.am: Fix build-dependencies for the pinba plugin.
Using BUILT_SOURCES, pinba.pb-c.[ch] are built *before* the regular
build step.
Florian Forster [Sat, 1 May 2010 09:03:47 +0000 (11:03 +0200)]
version-gen.sh: Bump version to 4.10.0.
Florian Forster [Sat, 1 May 2010 09:02:57 +0000 (11:02 +0200)]
Merge remote branch 'powdahound/master'
Florian Forster [Sat, 1 May 2010 09:00:26 +0000 (11:00 +0200)]
Merge branch 'collectd-4.9'
Florian Forster [Sat, 1 May 2010 09:00:22 +0000 (11:00 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Sat, 1 May 2010 08:56:29 +0000 (10:56 +0200)]
ChangeLog: Add the pinba plugin.
Florian Forster [Sat, 1 May 2010 08:55:22 +0000 (10:55 +0200)]
README: Added the pinba plugin and its dependency.
Florian Forster [Sat, 1 May 2010 08:55:10 +0000 (10:55 +0200)]
AUTHORS: Added "Phoenix Kayo".
Florian Forster [Sat, 1 May 2010 08:49:45 +0000 (10:49 +0200)]
Merge branch 'ka/pinba'
Florian Forster [Sat, 1 May 2010 08:47:05 +0000 (10:47 +0200)]
ChangeLog: Updated for version 4.10.0.
Florian Forster [Sat, 1 May 2010 08:12:43 +0000 (10:12 +0200)]
routeros plugin: Removed some "FIXME"s that no longer need fixing.
Thorsten von Eicken [Sat, 1 May 2010 08:03:15 +0000 (10:03 +0200)]
rrdcached.c needs to include rrd.h
Florian Forster [Sat, 1 May 2010 07:53:12 +0000 (09:53 +0200)]
Build system: Check for "strtok_r" availability with "-Wall -Werror" when using GCC.
Previously, the check was done without "-Werror" which resulted in a
warning and success. When the daemon was later built with "-Werror" set,
that warning would result in an error and abort the build.
Thanks to Aurélien Reynaud for reporting the problem.
Florian Forster [Sat, 1 May 2010 07:36:08 +0000 (09:36 +0200)]
Merge branch 'collectd-4.9'
Conflicts:
configure.in
Florian Forster [Sat, 1 May 2010 07:35:01 +0000 (09:35 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Thu, 29 Apr 2010 07:57:18 +0000 (09:57 +0200)]
configure.in: Put conditionals around <inttypes.h>, too, for consistency's sake.
Aurélien Reynaud [Thu, 29 Apr 2010 07:39:48 +0000 (09:39 +0200)]
Solaris 8 fixes: Check for <stdint.h> before inclusion.
Aurélien Reynaud [Thu, 29 Apr 2010 07:37:57 +0000 (09:37 +0200)]
Solaris 8 fixes: Fall back to putenv(3).
Florian Forster [Sun, 25 Apr 2010 13:32:50 +0000 (15:32 +0200)]
collectd-nagios.c: Output performance data with the "%f" format string.
Apparently the parser used by nagios is dumb as bread. Thanks to Lao Wai
for pointing this out. For more information, see:
<http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201>
Florian Forster [Sun, 25 Apr 2010 12:46:44 +0000 (14:46 +0200)]
src/collectd.c: Fix initialization of the "timeout_g" variable.
The default value is "2", not "10".
Florian Forster [Sun, 25 Apr 2010 12:45:05 +0000 (14:45 +0200)]
collectd.conf(5): Document the "Timeout" option.
Andrés J. Díaz [Thu, 17 Dec 2009 22:21:14 +0000 (23:21 +0100)]
Timeout for missing values
Hi!
I attach here a patch which adds Timeout option in configuration file.
This option is global (i.e. at the same level as Interval) and it's
the max number of intervals that a package can be missed before a
missing notification would be raised. By dafault collectd wait 2
intervals and it's a hardcoded value AFAIK, if plugin cannot get data
for more than 2 intervals, then (if it's an interesting value),
collectd send a missing notification. Setting Timeout to an high value
you can be more tolerant with that missing.
It's usefull on large networks. In my case, the company LAN is
distributed on distant locations and sometimes (due to network issues)
UDP packages are lost, I use the Timeout to be more tolerant to this
networks fails. For example setting Internval to 10 and Timeout to 6,
a missing notification will be raised only if none data was reported
in last 60s.
I hope that things explained well enough, and (who knows!) maybe this
could be usefull to anybody ;)
Regards,
Andrés
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 23 Apr 2010 07:44:44 +0000 (09:44 +0200)]
python plugin: Try to work around a "dereferencing type-punned pointer" warning.
Florian Forster [Thu, 22 Apr 2010 09:29:19 +0000 (11:29 +0200)]
Merge branch 'collectd-4.9'
Florian Forster [Thu, 22 Apr 2010 09:28:19 +0000 (11:28 +0200)]
Bumped version to 4.9.2; Updated ChangeLog.
Florian Forster [Thu, 22 Apr 2010 09:14:25 +0000 (11:14 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Florian Forster [Thu, 22 Apr 2010 09:06:16 +0000 (11:06 +0200)]
Bumped version to 4.8.5; Updated ChangeLog.
Florian Forster [Thu, 22 Apr 2010 08:45:58 +0000 (10:45 +0200)]
Merge remote branch 'trenkel/st/python'
Florian Forster [Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)]
Merge branch 'collectd-4.9'
Florian Forster [Wed, 21 Apr 2010 17:04:01 +0000 (19:04 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Sven Trenkel [Wed, 21 Apr 2010 16:26:55 +0000 (18:26 +0200)]
python: Added documentation and an example on how to handle SIGCHLD.
Sven Trenkel [Wed, 21 Apr 2010 16:12:19 +0000 (18:12 +0200)]
python: Fix a metadata memleak and a missing include (for some versions of python)
Florian Forster [Wed, 21 Apr 2010 14:23:46 +0000 (16:23 +0200)]
src/plugin.c: plugin_log: Append newline to message …
… even when no log-plugin was loaded.
Florian Forster [Wed, 21 Apr 2010 14:22:42 +0000 (16:22 +0200)]
modbus plugin: Adapt for the new "plugin_register_complex_read" interface.
Florian Forster [Wed, 21 Apr 2010 14:19:53 +0000 (16:19 +0200)]
network plugin: Don't access values in an already freed array.
Florian Forster [Mon, 19 Apr 2010 11:05:15 +0000 (13:05 +0200)]
contrib/exec-nagios.px: Whitespace and POD fixes.
Florian Forster [Mon, 12 Apr 2010 12:08:33 +0000 (14:08 +0200)]
pinba plugin: Fix the "request" type and dispatch the document size data.
Florian Forster [Sat, 10 Apr 2010 10:25:24 +0000 (12:25 +0200)]
pinba plugin: Multiply the derive data sources by a factor.
Otherwise the change is too slow to be really useful.
Florian Forster [Sat, 10 Apr 2010 10:15:00 +0000 (12:15 +0200)]
pinba plugin: Fix a sever typo.
Florian Forster [Sat, 10 Apr 2010 10:14:44 +0000 (12:14 +0200)]
src/collectd.conf.in: Add the Pinba plugin.
Florian Forster [Sat, 10 Apr 2010 10:14:30 +0000 (12:14 +0200)]
Build system: Link the pinba plugin with "protobuf-c".
Configure checks are still missing.
Florian Forster [Fri, 9 Apr 2010 20:24:31 +0000 (22:24 +0200)]
pinba plugin: Looked up the default port on the Pinba homepage.
Florian Forster [Fri, 9 Apr 2010 20:20:42 +0000 (22:20 +0200)]
pinba plugin: Coding style changes.
Florian Forster [Fri, 9 Apr 2010 20:20:21 +0000 (22:20 +0200)]
pinba plugin: Remove unused type definitions.
Florian Forster [Fri, 9 Apr 2010 20:12:35 +0000 (22:12 +0200)]
pinba plugin: Fix a folding marker.
Florian Forster [Fri, 9 Apr 2010 20:10:24 +0000 (22:10 +0200)]
pinba plugin: Make the config parsing easier to read ...
... by using "cf_util_get_string".
Florian Forster [Fri, 9 Apr 2010 19:57:57 +0000 (21:57 +0200)]
pinba plugin: Turn most metrics into DERIVEs.
This way we don't need to keep track of the time ourselves. The new type
"float_counter_t" is used to convert floats into derive_ts.
Florian Forster [Fri, 9 Apr 2010 18:39:09 +0000 (20:39 +0200)]
pinba plugin: Remove the "NI_MAXSERV" define.
Florian Forster [Fri, 9 Apr 2010 18:36:48 +0000 (20:36 +0200)]
pinba plugin: Turn the "Port" config option into a string.
This way service names can be used, too.
Florian Forster [Fri, 9 Apr 2010 14:52:00 +0000 (16:52 +0200)]
pinba plugin: Added folding markers to all functions.
Florian Forster [Fri, 9 Apr 2010 14:21:23 +0000 (16:21 +0200)]
pinba plugin: Removed the dependency to libevent.
The filedescriptors are now watched using poll(2).
Florian Forster [Fri, 9 Apr 2010 13:31:55 +0000 (15:31 +0200)]
pinba plugin: Use mutexes rather than R/W-locks.
Mutexes are more portable and since only write locks were used they
act exactly the same way.
Florian Forster [Fri, 9 Apr 2010 13:25:36 +0000 (15:25 +0200)]
pinba plugin: pinba_socket_open: Rewrote the function ...
... with protocol independence (IPv6 support).
Florian Forster [Fri, 9 Apr 2010 13:00:03 +0000 (15:00 +0200)]
pinba plugin: Rename custom types to follow the "*_t" convention.
Florian Forster [Fri, 9 Apr 2010 12:53:52 +0000 (14:53 +0200)]
pinba plugin: pinba_udp_read_callback_fn: Streamlined the function a bit.
Florian Forster [Fri, 9 Apr 2010 12:50:58 +0000 (14:50 +0200)]
pinba plugin: service_statnode_collect: Coding style changes.
Florian Forster [Fri, 9 Apr 2010 12:50:16 +0000 (14:50 +0200)]
pinba plugin: Add temporary defines for default address and port.
Florian Forster [Thu, 8 Apr 2010 21:21:52 +0000 (23:21 +0200)]
Pinba plugin: Add Antony Dovgal as copyright holder.
A note stating where the original code was taken from has been added,
too.
Florian Forster [Thu, 8 Apr 2010 21:09:36 +0000 (23:09 +0200)]
Pinba plugin: Reorder the functions to get the callgraph right.
This fixes build issues introduced by removing the forward declarations.
Florian Forster [Thu, 8 Apr 2010 20:39:09 +0000 (22:39 +0200)]
Pinba plugin: Picked some low-hanging fruit.
Removed includes already included via "collectd.h", moved variable
declarations before function declarations, fixed missing return
statements, and removed void statements.
Florian Forster [Thu, 8 Apr 2010 20:38:11 +0000 (22:38 +0200)]
Build system: Make it possible to (conditionally) build the protobuf stuff.
The dependency for the module is still missing, but I don't know how to
specify that from the top of my head.
Florian Forster [Thu, 8 Apr 2010 19:52:56 +0000 (21:52 +0200)]
src/Makefile.am: Order the plugins alphabetically.
And add "pinba.proto" to the distribution.
Florian Forster [Thu, 8 Apr 2010 19:50:21 +0000 (21:50 +0200)]
Build system: Check for protoc-c and enable the Pinba plugin if it is found.
Florian Forster [Thu, 8 Apr 2010 19:36:06 +0000 (21:36 +0200)]
network plugin: Add the "network:username" meta data.
Phoenix Kayo [Thu, 8 Apr 2010 07:44:49 +0000 (13:44 +0600)]
Writing autotools rules for pinba.
Phoenix Kayo [Thu, 8 Apr 2010 06:35:09 +0000 (12:35 +0600)]
Add pinba plugin.
Florian Forster [Wed, 7 Apr 2010 10:55:03 +0000 (12:55 +0200)]
Bumped version to 4.8.2; Updated ChangeLog.
Florian Forster [Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)]
Merge branch 'collectd-4.9'
Florian Forster [Wed, 7 Apr 2010 09:55:15 +0000 (11:55 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 7 Apr 2010 09:53:32 +0000 (11:53 +0200)]
network plugin: Fix a severe memory leak.
A couple of bytes were leaked with every encrypted packet received.
Florian Forster [Wed, 7 Apr 2010 09:41:41 +0000 (11:41 +0200)]
rrdtool plugin: Correctly free the cache when shutting down.
Florian Forster [Mon, 5 Apr 2010 14:32:45 +0000 (16:32 +0200)]
network plugin: Be more strict when checking the return value of "setsockopt".