Florian Forster [Tue, 13 Nov 2007 16:55:50 +0000 (16:55 +0000)]
collectd: The new `FQDNLookup' option controls whether or not the FQDN should be used.
So far the hostname as returned by `gethostname(2)' was used. This is not
practical for large setups.
To stay backwards compatible the option is disabled by default, but the sample
config file includes a line which sets this option so that (new) default
installations will have it enabled.
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'
Florian Forster [Wed, 24 Oct 2007 17:57:35 +0000 (19:57 +0200)]
AUTHORS, ChangeLog: Added notes about the memcached plugin.
Florian Forster [Wed, 24 Oct 2007 17:50:35 +0000 (19:50 +0200)]
collectd.conf.in: Added the `memcached' plugin.
Florian Forster [Wed, 24 Oct 2007 17:21:33 +0000 (19:21 +0200)]
Merge branch 'pull/master'
Florian Forster [Tue, 23 Oct 2007 15:05:55 +0000 (17:05 +0200)]
collectd.conf(5): Documented the new memcached plugin.
Florian Forster [Tue, 23 Oct 2007 14:34:17 +0000 (16:34 +0200)]
Merge branch 'master' into ad/memcached
Conflicts:
src/types.db
Florian Forster [Tue, 23 Oct 2007 14:33:49 +0000 (16:33 +0200)]
collectd.conf(5): Documented the new nginx plugin.
Florian Forster [Tue, 23 Oct 2007 14:20:09 +0000 (16:20 +0200)]
memcached plugin: Corrected the copyright notice and removed unnecessary header files.
Florian Forster [Tue, 23 Oct 2007 14:10:47 +0000 (16:10 +0200)]
email plugin: Include `stddef.h' which defines the `offsetof' macro.
Florian Forster [Tue, 23 Oct 2007 14:10:11 +0000 (16:10 +0200)]
memcached plugin: Some of the data definitions have been torn appart.
Antony Dovgal [Tue, 23 Oct 2007 12:18:16 +0000 (14:18 +0200)]
memcached plugin: Added a plugin to query stats from memcached servers.
Florian Forster [Tue, 23 Oct 2007 11:56:57 +0000 (13:56 +0200)]
nginx plugin: Changed to the version 4 plugin infrastructure.
Florian Forster [Tue, 23 Oct 2007 11:33:41 +0000 (13:33 +0200)]
Merge branch 'ff/nginx'
Conflicts:
configure.in
src/Makefile.am
Florian Forster [Mon, 22 Oct 2007 21:03:12 +0000 (23:03 +0200)]
tcpconns plugin: Added support for Mac OS X (and possibly FreeBSD).
Florian Forster [Fri, 19 Oct 2007 08:02:32 +0000 (10:02 +0200)]
nginx plugin: Added a plugin to collect `nginx' statistics.
nginx is a lightweight webserver and (reverse) proxy and apparently very
popular in Russia. This plugin queries it's status page, parses it and submits
it to collectd, very similar to the apache plugin.
Florian Forster [Fri, 19 Oct 2007 07:23:57 +0000 (09:23 +0200)]
Merge branch 'pull/master'
Florian Forster [Mon, 15 Oct 2007 15:30:18 +0000 (17:30 +0200)]
contrib/README: Documented the exec script and the SNMP config.
Florian Forster [Mon, 15 Oct 2007 15:29:56 +0000 (17:29 +0200)]
contrib/exec-smartctl: Added documentation to the script.
Florian Forster [Sat, 13 Oct 2007 15:16:32 +0000 (17:16 +0200)]
Merge branch 'pull/master'
Florian Forster [Sat, 13 Oct 2007 15:14:54 +0000 (17:14 +0200)]
contrib/exec-smartctl: Added a sample exec script which parses the hdd temperature using smartctl.
Florian Forster [Fri, 12 Oct 2007 21:16:05 +0000 (23:16 +0200)]
rrdtool plugin: Add a debugging message into the `queue thread'..
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 [Fri, 12 Oct 2007 20:33:11 +0000 (22:33 +0200)]
Merge branch 'pull/master'
Florian Forster [Fri, 12 Oct 2007 20:31:51 +0000 (22:31 +0200)]
contrib/snmp-data.conf: Added a sample data configuration for the SNMP plugin.
Florian Forster [Fri, 12 Oct 2007 17:10:19 +0000 (19:10 +0200)]
ipvs plugin: Fix a feaking stupid typo..
Florian Forster [Fri, 12 Oct 2007 16:59:29 +0000 (18:59 +0200)]
Merge branch 'collectd-4.1'
Conflicts:
ChangeLog
Florian Forster [Fri, 12 Oct 2007 16:57:51 +0000 (18:57 +0200)]
Merge branch 'ff/tcpconns'
Florian Forster [Fri, 12 Oct 2007 16:57:04 +0000 (18:57 +0200)]
collectd.conf.in: Added sample configuration for the tcpconns plugin.
Florian Forster [Fri, 12 Oct 2007 16:48:21 +0000 (18:48 +0200)]
ipvs plugin: Assurd that `sockfd >= 0'.
The init-function should return non-zero in that case and the plugin should be
disabled, but I'd rather not rely on such conventions too much..
Sebastian Harl [Fri, 12 Oct 2007 14:51:04 +0000 (16:51 +0200)]
Added documentation about ipvs to README, ChangeLog and collectd.conf.in.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Fri, 12 Oct 2007 14:14:25 +0000 (16:14 +0200)]
ipvs plugin: Check for correct IPVS version in cipvs_init().
I took over the required minimum version (1.1.4) as used in ipvsadm 1.24
for Linux kernels >= 2.6.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Fri, 12 Oct 2007 12:32:20 +0000 (14:32 +0200)]
ipvs plugin: Replaced ipvs_strerror() with sstrerror().
ipvs_strerror() handles a few special cases in libipvs which are not
relevant in this plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Fri, 12 Oct 2007 12:31:29 +0000 (14:31 +0200)]
ipvs plugin: Get IP_VS_SO_GET_INFO in ip_vs_get_services().
IP_VS_SO_GET_INFO also provides the number of services which might change after
initializing the plugin. Also, the globale variable ipvs_info could be removed
as ip_vs_get_services() is the only function using these information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 10 Oct 2007 18:37:26 +0000 (20:37 +0200)]
ipvs plugin: Fixed a memory leak in cipvs_submit_services().
The ip_vs_get_dests pointer has not been freed... :-/
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 10 Oct 2007 18:36:53 +0000 (20:36 +0200)]
ipvs plugin: Use sstrerror() instead of strerror().
D'oh...
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 10 Oct 2007 18:36:17 +0000 (20:36 +0200)]
configure, ipvs plugin: Check for ip_vs.h.
Disable the ipvs module, if neither net/ip_vs.h nor ip_vs.h could be
found. Added HAVE_*_H checks for each included system header in ipvs.c.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 10 Oct 2007 18:34:37 +0000 (20:34 +0200)]
ipvs: Added plugin to collect IPVS connection statistics.
This plugin collects detailed statistics for each IPVS service and it's
destinations. It is based on ipvsadm and libipvs by Wensong Zhang and
Peter Kese. The plugin requires a Linux (>= 2.6) kernel.
See http://www.linuxvirtualserver.org/software/index.html for more details
about IPVS.
A new DS type "connections" (value:COUNTER:0:U) has been added to
types.db.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 12 Oct 2007 16:35:10 +0000 (18:35 +0200)]
Beautifying some more debug messages..
Florian Forster [Fri, 12 Oct 2007 16:33:59 +0000 (18:33 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
src/rrdtool.c
Florian Forster [Fri, 12 Oct 2007 16:32:53 +0000 (18:32 +0200)]
Beautifying many debug messages..
Florian Forster [Fri, 12 Oct 2007 16:22:51 +0000 (18:22 +0200)]
rrdtool plugin: Wait for the `queue thread' to exit..
..before returning from the shutdown function.
Florian Forster [Fri, 12 Oct 2007 16:20:25 +0000 (18:20 +0200)]
network plugin: Flush the buffer in the `shutdown' function..
Florian Forster [Fri, 12 Oct 2007 16:09:29 +0000 (18:09 +0200)]
xmms plugin: Return `-1' when values could be read but are weird.