Florian Forster [Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Sebastian Harl [Fri, 18 Jan 2008 11:29:19 +0000 (12:29 +0100)]
collectd-exec(5): Improved description of the value-list identifier.
A short note about valid values for the plugin and type names and the
respective instance names as well as a pointer to types.db has been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 20 Jan 2008 22:11:53 +0000 (23:11 +0100)]
network plugin: Made network_receive() static.
This function is not exported to any other module.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 20 Jan 2008 21:54:55 +0000 (22:54 +0100)]
logfile plugin: Added Florian to the list of copyright holders.
Most of the current version has been written by him.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 09:41:29 +0000 (10:41 +0100)]
Bumped version to 4.2.4; Updated ChangeLog.
Florian Forster [Mon, 21 Jan 2008 09:40:33 +0000 (10:40 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
Florian Forster [Mon, 21 Jan 2008 09:39:50 +0000 (10:39 +0100)]
ChangeLog: Fixed the date of the 4.1.6 release.
Florian Forster [Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Fri, 11 Jan 2008 10:24:19 +0000 (11:24 +0100)]
Bumped version to 4.1.6; Updated ChangeLog.
Florian Forster [Thu, 10 Jan 2008 08:48:52 +0000 (09:48 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Thu, 10 Jan 2008 08:48:24 +0000 (09:48 +0100)]
src/configfile.c: Updated the copyright notice for 2008.
Sebastian Harl [Wed, 9 Jan 2008 07:33:52 +0000 (08:33 +0100)]
bindings/Makefile.am: Replaced "make -C" with "cd && make".
BSD make does not support "make -C".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 6 Jan 2008 19:11:29 +0000 (20:11 +0100)]
bindings/Makefile.am: Removed a bashism.
Brace expansion using { and } is not defined by POSIX but rather a bash
extension and should thus not be used for portability reasons.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 9 Jan 2008 07:29:36 +0000 (08:29 +0100)]
collectd.conf(5): Added a note about the availability of the "debug" loglevel.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 8 Jan 2008 10:25:20 +0000 (11:25 +0100)]
collectd.conf(5): Fix a messed up merge.
Florian Forster [Tue, 8 Jan 2008 10:23:28 +0000 (11:23 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
src/collectd.conf.pod
Florian Forster [Tue, 8 Jan 2008 10:08:41 +0000 (11:08 +0100)]
collectd.conf(5): Documented the fact that the configuration is processes from top to bottom.
Luke Heberling [Thu, 13 Dec 2007 07:03:03 +0000 (08:03 +0100)]
collectd.conf(5): Added a note about plugin loading order.
Florian Forster [Tue, 8 Jan 2008 09:52:44 +0000 (10:52 +0100)]
src/configfile.c: Improve the "Plugin `%s' did not register a callback." warning.
Evgeny Chukreev [Sun, 6 Jan 2008 09:00:06 +0000 (10:00 +0100)]
unixsock plugin: Actually set the permissions for the socket.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 28 Dec 2007 17:33:54 +0000 (18:33 +0100)]
Bumped version to 4.2.3; Updated ChangeLog.
Florian Forster [Fri, 28 Dec 2007 17:21:01 +0000 (18:21 +0100)]
build system: Yet another way to solve the src-dir vs. build-dir issue.
Sebastian Harl [Thu, 27 Dec 2007 15:40:30 +0000 (16:40 +0100)]
configure.in: Copy sources of the Perl bindings to the build directory.
As the Perl build system around ExtUtils::MakeMaker doesn't know how to
separate source and build directories, all relevant source files have to be
available in the build directory.
This is an alternative patch for the problem reported by Michael Tiernan.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 27 Dec 2007 15:39:46 +0000 (16:39 +0100)]
Revert "bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same."
This reverts commit
61f5c1a972626212aab60c4d50f45097485b8e51 which had the
following problems:
* parts of the build process took place in the source directory (which should
be read-only though)
* the "perl" target should not be renamed - the name is used in
@PERL_BINDINGS@ to identify the bindings that are supposed to be built
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 19 Dec 2007 19:37:30 +0000 (20:37 +0100)]
utils_mount.c: Fixed an unused variable warning on some systems.
This warning appeared on systems using listmntent() or getv?fsstat() when
compiling with debugging disabled only. It was caused by the declaration of a
character array for use with sstrerror() inside a call to DEBUG().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 19 Dec 2007 19:36:40 +0000 (20:36 +0100)]
src/Makefile.am: Use curl CFLAGS when building the nginx plugin.
Else curl/curl.h cannot be found in non-standard places at build time.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Thu, 27 Dec 2007 10:17:46 +0000 (11:17 +0100)]
Updated the changelog.
Florian Forster [Thu, 27 Dec 2007 10:15:30 +0000 (11:15 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Thu, 27 Dec 2007 09:34:39 +0000 (10:34 +0100)]
Bumped version to 4.1.5; Updated ChangeLog.
Florian Forster [Wed, 26 Dec 2007 14:34:18 +0000 (15:34 +0100)]
sensors plugin: While I was at it I reorganized the code a little so it's easier to read.
For instance I moved the name to type conversion out of the main loop and into
a separate function, likewise the chip to string representation conversion. The
`submit' function is now very careful that all strings are null terminated and
that no buffer overflow may occur.
Florian Forster [Tue, 25 Dec 2007 17:11:47 +0000 (18:11 +0100)]
sensors plugin: Implemented support for libsensors3.
Florian Forster [Wed, 19 Dec 2007 13:33:39 +0000 (14:33 +0100)]
bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same.
Thanks to Michael Tiernan for reporting this bug.
Florian Forster [Sat, 15 Dec 2007 11:25:51 +0000 (12:25 +0100)]
Bumped version to 4.2.2; Updated ChangeLog.
Florian Forster [Sat, 15 Dec 2007 11:15:37 +0000 (12:15 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Luke Heberling [Thu, 13 Dec 2007 07:09:16 +0000 (08:09 +0100)]
src/utils_avltree.c: Fix avl_get to work as documented.
The documentation in the header file for avl_get states that value may be null,
but the code in the source file asserts otherwise. This patch changes the code
to reflect the documentation.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Luke Heberling [Thu, 13 Dec 2007 07:06:26 +0000 (08:06 +0100)]
rc/utils_llist.c: Fix a bug in llist_prepend.
Copy the element to the tail if it's the first element.
Luke Heberling [Thu, 13 Dec 2007 07:03:03 +0000 (08:03 +0100)]
collectd.conf(5): Added a note about plugin loading order.
Luke Heberling [Thu, 13 Dec 2007 07:01:16 +0000 (08:01 +0100)]
logfile plugin: fix the `Timestamp' configuration option.
Saulius Grigaliunas [Thu, 13 Dec 2007 06:58:51 +0000 (07:58 +0100)]
nginx plugin: Use strcmp rather than strcpy to compare strings.
I believe I found a typo in nginx.c which prevents collectd with nginx plugin
from working. Collectd segfaults at startup. Here is a tiny patch to correct
the issue. When applied, everything works as expected.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 12 Nov 2007 15:38:13 +0000 (16:38 +0100)]
collectd-perl(5): Fixed a typo.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 12 Nov 2007 12:05:54 +0000 (13:05 +0100)]
collectd2html.pl: Cleaned up Eddy's patch.
* Use Perl's undef to identify invalid values.
* Renamed the "host-is" command line option to "host".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 14 Nov 2007 10:37:00 +0000 (11:37 +0100)]
rrdtool plugin: Fix a memory leak..
..in a VERY uncommon/rare case.
Florian Forster [Fri, 12 Oct 2007 08:13:11 +0000 (10:13 +0200)]
src/utils_avltree.[ch]: Rename all types and functions to use the prefix `c_avl_'.
The prefix `avl_' clashed with an AVL implementation on Solaris 10..
Florian Forster [Thu, 8 Nov 2007 20:55:13 +0000 (21:55 +0100)]
Bumped version to 4.2.1; Updated ChangeLog.
Florian Forster [Thu, 8 Nov 2007 18:49:17 +0000 (19:49 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
contrib/PerlLib/Collectd.pm
version-gen.sh
Florian Forster [Thu, 8 Nov 2007 09:49:54 +0000 (10:49 +0100)]
Bumped version to 4.1.4; Updated ChangeLog
Florian Forster [Wed, 7 Nov 2007 16:52:01 +0000 (16:52 +0000)]
contrib/collection.cgi: Fix the types related to the processes plugin.
Florian Forster [Wed, 7 Nov 2007 09:33:51 +0000 (09:33 +0000)]
contrib/collection.cgi: Fix the ps_rss graph.
Florian Forster [Wed, 7 Nov 2007 09:29:23 +0000 (09:29 +0000)]
contrib/collection.cgi: Add some missing types and labels.
Florian Forster [Tue, 6 Nov 2007 16:40:35 +0000 (16:40 +0000)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
contrib/README
src/snmp.c
src/types.db
Florian Forster [Tue, 6 Nov 2007 16:37:53 +0000 (16:37 +0000)]
snmp plugin: Don't try to free the request PDU - it segfaults for some reason.
According to other code I've seen this is never done by anyone else, so this
must mean that the snmp library takes care of this somehow. Man, I love well
documented libraries!
Florian Forster [Tue, 6 Nov 2007 16:20:29 +0000 (16:20 +0000)]
snmp plugin: Be even more eager to free PDU structures.
Florian Forster [Tue, 6 Nov 2007 15:53:49 +0000 (15:53 +0000)]
snmp plugin: (Hopefully) fix a memory leak.
Florian Forster [Tue, 6 Nov 2007 15:33:58 +0000 (15:33 +0000)]
contrib/snmp-data.conf: Added even more UPS stuff.
Iain Lea [Tue, 6 Nov 2007 07:17:15 +0000 (08:17 +0100)]
contrib/fedora/collectd.spec: Updated for version 4.2.0
Florian Forster [Sun, 4 Nov 2007 13:20:43 +0000 (14:20 +0100)]
exec plugin: Set PID of failed programs back to zero.
Otherwise the program will not be executed ever again after it failed once.
Florian Forster [Sat, 3 Nov 2007 15:28:35 +0000 (16:28 +0100)]
contrib/exec-munin.px: Added a simple Perl script which makes it possible to use Munin plugins in collectd.
The script has an embedded POD documentation.
Florian Forster [Thu, 1 Nov 2007 09:07:03 +0000 (10:07 +0100)]
Merge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Thu, 1 Nov 2007 09:06:52 +0000 (10:06 +0100)]
tcpconns plugin: Done complain when reading one of the files fails.
This should remove an error message on non-IPv6-enabled hosts..
Florian Forster [Tue, 30 Oct 2007 17:15:58 +0000 (17:15 +0000)]
contrib/snmp-data.conf: Added some more RMSes and UPS stuff.
Florian Forster [Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
src/collectd-snmp.pod
Florian Forster [Tue, 30 Oct 2007 16:17:43 +0000 (16:17 +0000)]
types.db: Fix a typo: s/humitidy/humidity/
Florian Forster [Tue, 30 Oct 2007 08:50:01 +0000 (09:50 +0100)]
types.db: Ordered the entries alphabetically and added `voltage_threshold'.
Florian Forster [Fri, 12 Oct 2007 20:59:15 +0000 (22:59 +0200)]
rrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..
Florian Forster [Mon, 29 Oct 2007 16:42:13 +0000 (17:42 +0100)]
collectd-snmp(5): Fix typos.
Sebastian Harl [Sun, 28 Oct 2007 14:40:28 +0000 (15:40 +0100)]
collectd.conf: Added nginx module.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 28 Oct 2007 09:50:24 +0000 (10:50 +0100)]
perl plugin: Set $0 to "collectd".
perl_parse() has to set it to "-e" which is not very meaningful. It would
be even nicer to set it to argv[0] but this is not available from inside
the plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 28 Oct 2007 08:58:18 +0000 (09:58 +0100)]
collectd.h: Removed legacy definition of operation modes.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 28 Oct 2007 08:57:17 +0000 (09:57 +0100)]
plugin.h: Make DEBUG() a noop when compiling without debugging support.
This saves a couple of useless calls to plugin_log() which the compiler
does not detect and remove itself.
A couple of DEBUG()'s in the apcups, hddtemp, mbmon and ntpd plugins have
been upgraded to INFO()'s. All of them provide error messages of failed
system / libc calls which should be available to the user somehow.
Besides, they use a local string buffer which generates an "unused
variable" warning if DEBUG() expands to a noop.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 27 Oct 2007 10:00:18 +0000 (12:00 +0200)]
ChangeLog: Fix some spelling errors.
Florian Forster [Sat, 27 Oct 2007 09:21:52 +0000 (11:21 +0200)]
Build system: Removed the check for `libm'.
It didn't work (there's no `ext' function) and wasn't used anywhere..
Florian Forster [Sat, 27 Oct 2007 09:09:25 +0000 (11:09 +0200)]
Merge branch 'collectd-4.1'
Florian Forster [Sat, 27 Oct 2007 09:02:03 +0000 (11:02 +0200)]
Bumped version to 4.2.0; Updated ChangeLog.
Florian Forster [Sat, 27 Oct 2007 08:52:38 +0000 (10:52 +0200)]
Build system: Changed the detection of the sensors library to work like other libraries.
Sebastian Harl [Fri, 26 Oct 2007 13:07:50 +0000 (15:07 +0200)]
README: Added section about configuring, building and installing collectd.
This section contains basic information about the "--enabled-<plugin>"
configuration option as well as adopting the installation target.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 26 Oct 2007 12:39:27 +0000 (14:39 +0200)]
collectd.conf(5): Fix a typo.
Florian Forster [Fri, 26 Oct 2007 08:52:48 +0000 (10:52 +0200)]
ChangeLog: Added a note about the new nginx plugin.
Florian Forster [Fri, 26 Oct 2007 08:50:43 +0000 (10:50 +0200)]
src/common.c: Serialize access to `strerror' if `strerror_r' doesn't exist.
Apparently this is a problem under Solaris 9..
Ronan Cadet [Fri, 26 Oct 2007 08:28:37 +0000 (10:28 +0200)]
Build system: Fixed a bug in the detection of the snmp library.
Hello,
During the creation of a rpm on Mandriva 2007.1 from tar.bz2 sources, and by
activate almost all options, I found something that seems a bug to me in the
configure file, line 33251 (concerning the snmp plugin)
Florian Forster [Fri, 26 Oct 2007 08:08:28 +0000 (10:08 +0200)]
Merge branch 'collectd-4.1'
Florian Forster [Fri, 26 Oct 2007 08:07:58 +0000 (10:07 +0200)]
logfile plugin: Implemented an option to prefix logged lines with a timestamp.
Florian Forster [Thu, 25 Oct 2007 21:13:27 +0000 (23:13 +0200)]
Build system: Set the appropriate CPPFLAGS and LDFLAGS when checking for librrd and it's header.
Florian Forster [Thu, 25 Oct 2007 21:11:54 +0000 (23:11 +0200)]
rrdtool plugin: Include the `rrd.h' header file in `rrdtool.c', not `collectd.h'.
This caused an error when --with-rrdtool was used to have the header file in a
non-standard directory, because the appropriate CFLAGS were not passed to all
plugins.
Florian Forster [Thu, 25 Oct 2007 18:05:08 +0000 (20:05 +0200)]
types.db: Raise the maximum value of `ps_cputime' from 1s/1s to 16s/1s..
This should work with machines with up to 16 processors..
Florian Forster [Thu, 25 Oct 2007 13:32:26 +0000 (15:32 +0200)]
ChangeLog: Documented the new tcpconns plugin and the changes to the snmp plugin.
Florian Forster [Thu, 25 Oct 2007 09:42:37 +0000 (11:42 +0200)]
README: Improved the dependency list a little.
Florian Forster [Thu, 25 Oct 2007 09:36:00 +0000 (11:36 +0200)]
ChangeLog: Fixed many many typos.
Sebastian Harl [Wed, 24 Oct 2007 22:29:28 +0000 (00:29 +0200)]
Fixed some typos in the manpages.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 24 Oct 2007 19:36:44 +0000 (21:36 +0200)]
Merge branch 'collectd-4.1'
Conflicts:
ChangeLog
contrib/PerlLib/Collectd.pm
Florian Forster [Wed, 24 Oct 2007 18:51:51 +0000 (20:51 +0200)]
Bumped version to 4.1.3; Updated ChangeLog.
Florian Forster [Wed, 24 Oct 2007 18:49:33 +0000 (20:49 +0200)]
contrib/PerlLib/Collectd.pm: Bumped version to 4.1.3.
Florian Forster [Wed, 24 Oct 2007 18:11:05 +0000 (20:11 +0200)]
Merge branch 'collectd-4.1'
Sebastian Harl [Mon, 22 Oct 2007 22:05:17 +0000 (00:05 +0200)]
configure.in: Added "rrdtool" to the module summary.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 22 Oct 2007 22:04:38 +0000 (00:04 +0200)]
collectd-perl(5): Added note about multi-threading.
A new section "BUGS" has been added to the manpage with a short note about
Perl and multithreading.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 20 Oct 2007 13:42:33 +0000 (15:42 +0200)]
perl plugin: Improved value list conversion.
The perl plugin used to store an internal list of data-source types for
each data-set registered by Perl plugins to get fast access to this
information (which is required to correctly convert a Perl data-set to a
data_set_t struct). However, this prevented Perl plugins to use data-sets
defined in types.db. This patch fixes this issue by requesting the
data-set definition from collectd.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 16 Oct 2007 23:14:18 +0000 (01:14 +0200)]
perl plugin: Fixed handling of erroneous configuration options.
An empty block was used instead of returning from the perl_config_*()
functions in case of an error. I wonder how that has happened... :-/
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 16 Oct 2007 23:13:35 +0000 (01:13 +0200)]
perl plugin: Improved "IncludeDir" configuration option.
The "Do not initialize the Perl interpreter until loading a module."
commit removed support for adding include directories after the Perl
interpreter has been initialized. This patch re-enables it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 16 Oct 2007 23:12:37 +0000 (01:12 +0200)]
collectd-perl(5): Updated documentation.
* moved configuration documentation from collectd.conf(5) to
collectd-perl(5)
* added documentation for the EnableDebugger configuration option
* added documentation about how to write own plugins
* added exports and examples section
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 24 Oct 2007 17:59:22 +0000 (19:59 +0200)]
collectd.conf.in: Fixed some missing quotes and words..
Florian Forster [Wed, 24 Oct 2007 17:57:56 +0000 (19:57 +0200)]
Merge branch 'ad/memcached'
projects / collectd.git / log