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.
Florian Forster [Fri, 12 Oct 2007 07:32:23 +0000 (09:32 +0200)]
src/Makefile.am: Make manpage creation fail-safe.
Since Sebastian's patch ships the .pod files in the distribution, this may not
fail when perl-doc is not installed.
Sebastian Harl [Sun, 2 Sep 2007 10:44:41 +0000 (12:44 +0200)]
src/Makefile.am: Added all POD files to EXTRA_DIST.
Those files are basically the "sources" for the manpages and as such
should be included in a distribution.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 10 Oct 2007 14:13:28 +0000 (16:13 +0200)]
tcpconns plugin: Changed the plugin to collect all TCP states, nut just `established'.
Also the contrib/collection.cgi script has been updated.
Florian Forster [Tue, 9 Oct 2007 16:09:34 +0000 (18:09 +0200)]
ChangeLog: Documented the changes to the perl plugin..
..a little
Sebastian Harl [Sun, 7 Oct 2007 21:51:20 +0000 (23:51 +0200)]
perl plugin: Converted to use "complex" configuration.
The parsing of the syntax tree of the "Plugin perl" section is now done in
perl_config() allowing more flexible setups like passing configuration
options to Perl plugins.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 7 Oct 2007 21:50:30 +0000 (23:50 +0200)]
perl plugin: Added "EnableDebugger" config option.
This config option will pass control to the Perl debugger after the
interpreter has been initialized. This is exactly the same as invoking perl
with the "-d" command line switch.
Just as with perl's "-d" command line option you can supply an alternative
debugger. Pass the package name as an argument to the "EnableDebugger" option
See perldebug(1) for more details.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 8 Oct 2007 14:42:08 +0000 (16:42 +0200)]
perl plugin: Fixed an "unused variable" warning.
When compiling with debugging disabled, gcc complained about an unused
variable in init_pi(). -Werror thus caused the build to fail.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 7 Oct 2007 13:02:36 +0000 (15:02 +0200)]
README: Improved formatting.
Indent all paragraphs by two spaces and break lines after 79 characters.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 7 Oct 2007 13:01:50 +0000 (15:01 +0200)]
README: Added a note about collectd and chkrootkit.
chkrootkit reports collectd as a packet sniffer, which most probably is a
false positive if using the "dns" plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 9 Oct 2007 16:00:35 +0000 (18:00 +0200)]
ChangeLog: Added the change to the rrdtool build stuff..
Florian Forster [Tue, 9 Oct 2007 12:40:33 +0000 (14:40 +0200)]
tcpconns plugin: Added a new plugin that counts the number of TCP connections to specific ports.
Florian Forster [Sat, 6 Oct 2007 09:10:19 +0000 (11:10 +0200)]
collectd.conf.in: Removed advanced and possibly harmfull settings..
Users were simply un-commenting everything without knowing what the settings
did, so removing possibly harmful settings seems reasonable.
Florian Forster [Fri, 5 Oct 2007 14:09:11 +0000 (16:09 +0200)]
Merge branch 'collectd-4.1'
Florian Forster [Thu, 4 Oct 2007 13:34:57 +0000 (15:34 +0200)]
snmp plugin: Improve the timing method, so that hosts are queried more steadily.
Florian Forster [Thu, 4 Oct 2007 13:12:50 +0000 (15:12 +0200)]
rrdtool plugin: Use the right variables when calling `rrd_update'..
*argl*
Florian Forster [Thu, 4 Oct 2007 13:09:24 +0000 (15:09 +0200)]
rrdtool plugin: Removed unused variables.
Florian Forster [Thu, 4 Oct 2007 10:26:26 +0000 (12:26 +0200)]
rrdtool plugin: Use the thread-safe `librrd_th' if available.
Florian Forster [Thu, 4 Oct 2007 08:31:00 +0000 (10:31 +0200)]
collectd-snmp(5): Added a note about the interpreted environment variables.
Florian Forster [Thu, 4 Oct 2007 06:44:41 +0000 (08:44 +0200)]
snmp plugin: Print a warning if querying a host takes longer than the confiured interval.
Sebastian Harl [Mon, 3 Sep 2007 09:09:15 +0000 (11:09 +0200)]
Makefile.am: Include version-gen.sh in a distribution as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 30 Sep 2007 22:10:56 +0000 (00:10 +0200)]
bindings/perl: Removed VERSION from all Makefile.PL's.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 30 Sep 2007 22:10:21 +0000 (00:10 +0200)]
perl plugin: bootstrap Collectd when initializing Perl interpreter
This automatically makes all symbols available at (Perl) compile time,
thus making the API built into collectd.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 30 Sep 2007 22:09:50 +0000 (00:09 +0200)]
perl plugin: Reimplemented plugin_{,un}register() in plain Perl.
As this involves only Perl data structures, it makes more sense to write
the algorithms in plain Perl as well. I suppose the perl interpreter can
do a better job optimizing the code :-)
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 30 Sep 2007 22:09:15 +0000 (00:09 +0200)]
perl plugin: Do not initialize the Perl interpreter until loading a module.
This makes further and more flexible configurations possible.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 30 Sep 2007 22:08:43 +0000 (00:08 +0200)]
Moved contrib/PerlLib/ to bindings/perl/.
Added bindings/Makefile.am and bindings/perl/Collectd/Makefile.PL,
bindings/perl/Makefile.PL to integrate the Perl modules into the build
system and the official distribution.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Sat, 29 Sep 2007 11:16:56 +0000 (13:16 +0200)]
collectd-snmp(5): Documented the `InstancePrefix' option and the new `Instance' behavior.
Florian Forster [Sat, 29 Sep 2007 11:15:27 +0000 (13:15 +0200)]
snmp plugin: Added the `InstancePrefix' option.
Florian Forster [Sat, 29 Sep 2007 10:34:22 +0000 (12:34 +0200)]
snmp plugin: Changed the table code so that an `instance' is optional.
Matt Peterson [Sat, 29 Sep 2007 08:01:34 +0000 (10:01 +0200)]
collectd.conf(5): Fix some typos and mis-formulations.
Florian Forster [Fri, 28 Sep 2007 14:42:20 +0000 (16:42 +0200)]
Merge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Fri, 28 Sep 2007 14:42:13 +0000 (16:42 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Fri, 28 Sep 2007 14:40:06 +0000 (16:40 +0200)]
Merge branch 'collectd-4.1'
Conflicts:
ChangeLog
Florian Forster [Fri, 28 Sep 2007 13:55:44 +0000 (15:55 +0200)]
Bumped version to 4.1.2; Updated ChangeLog.
Florian Forster [Fri, 28 Sep 2007 13:46:46 +0000 (15:46 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
configure.in
contrib/PerlLib/Collectd.pm
Florian Forster [Fri, 28 Sep 2007 13:43:41 +0000 (15:43 +0200)]
Bumped version to 4.0.9; Updated ChangeLog.
Florian Forster [Fri, 28 Sep 2007 11:45:39 +0000 (13:45 +0200)]
Merge branch 'collectd-3.11' into collectd-4.0
Conflicts:
ChangeLog
configure.in
src/wireless.c
Florian Forster [Fri, 28 Sep 2007 11:00:23 +0000 (13:00 +0200)]
Bumped version to 3.11.7; Updated ChangeLog.
Florian Forster [Fri, 28 Sep 2007 10:41:21 +0000 (12:41 +0200)]
Merge branch 'ff/collection' into collectd-4.0
Florian Forster [Fri, 28 Sep 2007 10:41:17 +0000 (12:41 +0200)]
contrib/collection.cgi: Add a vertical legend to `meta_graph_memory'.
Florian Forster [Fri, 28 Sep 2007 10:32:28 +0000 (10:32 +0000)]
contrib/collection.cgi: Fix the `charge' and `current' graphs.
Florian Forster [Fri, 28 Sep 2007 10:19:19 +0000 (12:19 +0200)]
Merge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Fri, 28 Sep 2007 08:26:49 +0000 (10:26 +0200)]
collectd.conf(5): Make it more clear that rrdtool's `StepSize' and `HeartBeat' should not be set.
This has caused some problems with users of the snmp plugin.
Sebastian Harl [Thu, 27 Sep 2007 16:25:25 +0000 (18:25 +0200)]
Added myplugin.c to contrib/examples/.
This is a sample/template C plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 27 Sep 2007 16:24:40 +0000 (18:24 +0200)]
Added MyPlugin.pm to contrib/examples/.
This is a sample/template Perl plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Thu, 27 Sep 2007 16:12:44 +0000 (16:12 +0000)]
snmp plugin: Improved the error messages in the init code.
Florian Forster [Thu, 27 Sep 2007 15:58:41 +0000 (15:58 +0000)]
snmp plugin: Fix a segfault when a host times out but more data should be queried.
Florian Forster [Thu, 27 Sep 2007 14:13:02 +0000 (16:13 +0200)]
snmp plugin: Handle `ASN_TIMETICKS' as `counter' if it's known by the SNMP library.
Florian Forster [Thu, 27 Sep 2007 13:34:13 +0000 (15:34 +0200)]
Merge branch 'collectd-4.1'
Florian Forster [Thu, 27 Sep 2007 13:34:00 +0000 (15:34 +0200)]
Merge branch 'collectd-4.0' into collectd-4.1
Sebastian Harl [Thu, 27 Sep 2007 10:25:14 +0000 (12:25 +0200)]
perl plugin: Fixed a possible buffer overflow in get_module_name().
A '\0' might have been written above the buffer array bounds.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 26 Sep 2007 15:18:31 +0000 (17:18 +0200)]
Merge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Wed, 26 Sep 2007 15:18:13 +0000 (17:18 +0200)]
build system: Fix detection of libraries when giving a directory.