Florian Forster [Thu, 31 May 2007 21:16:06 +0000 (23:16 +0200)]
unixsock plugin: Moved the `parse_identifier' code to `common.c'
The new function `parse_values' in `common.c' can be used to parse
`time:value0:value1:...', as used by RRDTool, the unixsock plugin and, in the
very near future, the exec plugin.
Florian Forster [Wed, 30 May 2007 06:08:04 +0000 (08:08 +0200)]
ntpd plugin: Replace `syslog (LOG_ERR, ...)' with `ERROR (...)'.
Florian Forster [Wed, 30 May 2007 06:06:48 +0000 (08:06 +0200)]
Merge branch 'collectd-3.11'
Conflicts:
ChangeLog
configure.in
Florian Forster [Tue, 29 May 2007 20:51:49 +0000 (22:51 +0200)]
Bumped version to 3.11.5; Updated ChangeLog.
Florian Forster [Tue, 29 May 2007 19:40:07 +0000 (21:40 +0200)]
ntpd plugin: Fix a possible buffer overflow.
Florian Forster [Fri, 25 May 2007 17:51:59 +0000 (19:51 +0200)]
Merge branch 'pull/master'
Florian Forster [Fri, 25 May 2007 17:49:24 +0000 (19:49 +0200)]
network plugin: Prepend the plugin's name to debug messages.
Florian Forster [Fri, 25 May 2007 17:48:56 +0000 (19:48 +0200)]
exec plugin: Print a warning when the returned string is incorrect.
Also the debug messages have been beautified.
Florian Forster [Fri, 25 May 2007 17:47:04 +0000 (19:47 +0200)]
contrib/migrate-3-4.px: Added usage information.
Sebastian Harl [Wed, 23 May 2007 12:21:19 +0000 (14:21 +0200)]
collectd.c: Added '-t' command line option.
This option allows to test the configuration only. The program immediately
exits after parsing the config file. A return code not equal to zero indicates
an error.
Some typos have been fixed as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Wed, 23 May 2007 15:52:00 +0000 (17:52 +0200)]
memory plugin: Fix unused variable warning under FreeBSD.
Florian Forster [Tue, 22 May 2007 15:54:54 +0000 (17:54 +0200)]
Merge branch 'collectd-3.11'
Conflicts:
src/processes.c
Florian Forster [Tue, 22 May 2007 15:53:23 +0000 (17:53 +0200)]
processes plugin: ps_read_tasks will fail under Linux 2.4.
Take this into account and don't report all processes without tasks as zombies.
Florian Forster [Tue, 22 May 2007 09:44:51 +0000 (11:44 +0200)]
sensors plugin: Let the read-function fail if something isn't right..
..so it gets suspended as it should be.
Florian Forster [Mon, 21 May 2007 05:21:28 +0000 (07:21 +0200)]
plugin.c: Added a comment that explains why the order of the linked list and callback are important.
Sebastian Harl [Sun, 20 May 2007 20:59:21 +0000 (22:59 +0200)]
plugin.c: Advance the llentry_t pointer before calling the shutdown callback.
> Important note: Unregistering the shutdown callback during shutdown is
> somewhat tricky. Doing that frees the llist_t entry in plugin.c:list_shutdown.
> This might cause a segfault in plugin_shutdown_all () when it tries to access
> the next pointer of that entry. If plugin_unregister_shutdown () is the last
> statement before the return from the shutdown callback this should be save in
> about 99% of all cases. Still there should be some better way to handle this.
This is an imho nice way to fix it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 20 May 2007 20:58:03 +0000 (22:58 +0200)]
perl plugin: Unregister all callbacks from collectd when shutting down.
If we do not unregister the callbacks there is still an entry point into the
plugin after Perl has been shut down and its memory has been freed. This will
cause segmentation faults if collectd tries to call any of the registered
callbacks, e.g. by some plugin calling plugin_log () during shutdown.
Important note: Unregistering the shutdown callback during shutdown is
somewhat tricky. Doing that frees the llist_t entry in plugin.c:list_shutdown.
This might cause a segfault in plugin_shutdown_all () when it tries to access
the next pointer of that entry. If plugin_unregister_shutdown () is the last
statement before the return from the shutdown callback this should be save in
about 99% of all cases. Still there should be some better way to handle this.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Sun, 20 May 2007 07:55:54 +0000 (09:55 +0200)]
src/plugin.c: Remove slashed from host, {plugin,type}{,-instance} here.
A fix in the disk plugin has been removed again.
Sebastian Harl [Sat, 19 May 2007 21:38:12 +0000 (23:38 +0200)]
email, users and vserver plugins: Changed license to GPL v2 only.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sat, 19 May 2007 21:37:27 +0000 (23:37 +0200)]
README: Fixed a typo.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Sat, 19 May 2007 15:20:11 +0000 (17:20 +0200)]
configure.in: Bumped version to 4.0.0-rc10
Florian Forster [Sat, 19 May 2007 15:19:31 +0000 (17:19 +0200)]
collectd-nagios(1) and collectd-unixsock(5): Reference one another.
Florian Forster [Sat, 19 May 2007 15:13:55 +0000 (17:13 +0200)]
collectd-unixsock(5): Added a note about Collectd::Unixsock.
Florian Forster [Sat, 19 May 2007 15:09:18 +0000 (17:09 +0200)]
README: Cleaned up the description of plugins and added information about new plugins.
Florian Forster [Sat, 19 May 2007 14:18:06 +0000 (16:18 +0200)]
collectd-perl(5): Moved information about the `perl plugin' into an own manpage.
Florian Forster [Sat, 19 May 2007 13:58:14 +0000 (15:58 +0200)]
collectd-email(5): Moved information about the `email plugin' into an own manpage.
Florian Forster [Sat, 19 May 2007 13:42:55 +0000 (15:42 +0200)]
collectd.conf(5): Moved information about ``special'' plugins from collectd(1) to here.
Florian Forster [Sat, 19 May 2007 13:21:10 +0000 (15:21 +0200)]
collectd.conf(5): Documented `PluginDir' and `TypesDB'.
Florian Forster [Sat, 19 May 2007 12:57:01 +0000 (14:57 +0200)]
unixsock plugin: Return a message in any case.
This removes a fair amount of `FIXME's :)
Florian Forster [Sat, 19 May 2007 11:59:10 +0000 (13:59 +0200)]
Collectd::Unixsock: Handle instance `0' and interpret a returned `NaN' correctly.
Florian Forster [Sat, 19 May 2007 11:57:52 +0000 (13:57 +0200)]
collectd-exec(5): Corrected/added some information.
Florian Forster [Sat, 19 May 2007 11:57:02 +0000 (13:57 +0200)]
collectd-unixsock(5): Moved information about the `unixsock plugin' into an own manpage.
Florian Forster [Sat, 19 May 2007 10:36:41 +0000 (12:36 +0200)]
collectd-exec(5): Moved information about the `exec plugin' into an own manpage.
Florian Forster [Sat, 19 May 2007 10:06:35 +0000 (12:06 +0200)]
contrib/collection.cgi: Improved some more graphs.
Florian Forster [Sat, 19 May 2007 09:49:12 +0000 (11:49 +0200)]
contrib/collection.cgi: Include `back'-links and more vertical labels.
Florian Forster [Sat, 19 May 2007 08:57:55 +0000 (10:57 +0200)]
contrib/collection.cgi: Print proper HTML-header.
Florian Forster [Sat, 19 May 2007 08:04:25 +0000 (10:04 +0200)]
contrib/collection.cgi: Included a completely new version with hardly any functionality.
Florian Forster [Sat, 19 May 2007 08:03:02 +0000 (10:03 +0200)]
contrib/migrate-3-4.px: Create (sub)directories for the disk plugin.
Florian Forster [Fri, 18 May 2007 17:34:43 +0000 (19:34 +0200)]
contrib/{extractDS,migrate-3-4}.px: Don't use XML::Simple and don't check for the output directory.
Florian Forster [Fri, 18 May 2007 15:11:30 +0000 (17:11 +0200)]
rrdtool plugin: Assure that values, that are older then the newest value in the cache, are rejected.
Otherwise there might be gaps in the graphs.
Florian Forster [Fri, 18 May 2007 15:10:35 +0000 (17:10 +0200)]
dns plugin: Only submit dns-traffic if either counter is non-zero.
Florian Forster [Fri, 18 May 2007 15:08:19 +0000 (17:08 +0200)]
email plugin: Only submit `spam_score' if any mails have been processed.
Florian Forster [Thu, 17 May 2007 21:00:18 +0000 (23:00 +0200)]
disk plugin: Remove slashed from disk-names.
Florian Forster [Thu, 17 May 2007 20:59:51 +0000 (22:59 +0200)]
contrib/extractDS.px: Create RRD file instead of writing to STDOUT.
This was changed in order to debug new code and then forgotten..
Florian Forster [Thu, 17 May 2007 20:59:04 +0000 (22:59 +0200)]
contrib/migrate-3-4.px: Handle `disk' and `partition' files correctly.
Florian Forster [Thu, 17 May 2007 13:11:17 +0000 (15:11 +0200)]
contrib/extractDS.px: Allow extration of multiple DSes into one file with multiple DSes.
This is needed to migrate the old disk-RRD-files.
Florian Forster [Thu, 17 May 2007 12:08:43 +0000 (14:08 +0200)]
collectd(1): Changed plugin information for v4.
Also removed information about the `modes' and RRD-file definitions.
Florian Forster [Thu, 17 May 2007 11:09:08 +0000 (13:09 +0200)]
Include `config.h' from all files.
Either directly or indirectly via `collectd.h'.
Florian Forster [Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)]
Merge branch 'pull/collectd-4' into collectd-4
Florian Forster [Tue, 15 May 2007 17:27:31 +0000 (19:27 +0200)]
Merge branch 'master' into collectd-4
Conflicts:
src/multimeter.c
src/network.c
src/utils_debug.c
Florian Forster [Tue, 15 May 2007 17:22:25 +0000 (19:22 +0200)]
Merge branch 'collectd-3.11'
Florian Forster [Tue, 15 May 2007 17:20:27 +0000 (19:20 +0200)]
Include "config.h" rather than <config.h>.
Sebastian Harl [Mon, 14 May 2007 18:57:03 +0000 (20:57 +0200)]
[PATCH] Added large file support ("backported" to collectd-3).
This adds large file support to collectd by using the AC_SYS_LARGEFILE macro
in configure.in. In order to apply any necessary options to all parts of
collectd, we have to make sure config.h is included in all source files
(either directly or by including collectd.h) and before any other header files
are included.
This should fix http://bugs.debian.org/422212.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Tue, 15 May 2007 13:30:42 +0000 (15:30 +0200)]
src/plugin.c: assert (ds->ds_num == vl->values_len); when debug is enabled.
Florian Forster [Sun, 13 May 2007 16:20:57 +0000 (18:20 +0200)]
configure.in: Don't check for grp.h twice.
Sebastian Harl [Sat, 12 May 2007 11:47:19 +0000 (13:47 +0200)]
perl plugin: Work around a redefinition of DEBUG in perl.h.
Some versions of Perl define their own verion of DEBUG in perl.h overwriting
the definition found in plugin.h. This works around this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Sat, 12 May 2007 18:00:16 +0000 (20:00 +0200)]
unixsock plugin: Don't assert that `ds->ds_num == vl->values_num' when not built with debugging enabled.
Florian Forster [Fri, 11 May 2007 19:16:14 +0000 (21:16 +0200)]
disk plugin: Correct the collection of {read,write}-time.
It's actually `average time an IO-operation needs'.
Florian Forster [Thu, 10 May 2007 07:51:04 +0000 (09:51 +0200)]
Merge branch 'pull/collectd-4' into collectd-4
Florian Forster [Thu, 10 May 2007 07:50:50 +0000 (09:50 +0200)]
unixsock plugin: Don't include <sys/poll.h> since it's not used.
Florian Forster [Thu, 10 May 2007 07:50:32 +0000 (09:50 +0200)]
email plugin: Include <sys/un.h> rather than <linux/un.h>.
Florian Forster [Wed, 9 May 2007 06:45:33 +0000 (08:45 +0200)]
apple_sensors plugin: Fix the `module_register' function.
Florian Forster [Tue, 8 May 2007 21:07:23 +0000 (23:07 +0200)]
configure.in: Bumped version to 4.0.0-rc9
Florian Forster [Tue, 8 May 2007 21:06:44 +0000 (23:06 +0200)]
unixsock plugin: Remove the socket-file after closing the socket.
Florian Forster [Tue, 8 May 2007 21:06:20 +0000 (23:06 +0200)]
iptables plugin: Fix a segfault in the shutdown code.
That's the problem with macros: `for (...) sfree (ptr);' doesn't work.
Florian Forster [Tue, 8 May 2007 20:44:51 +0000 (22:44 +0200)]
src/types_list.c: Strip newlines from the end of the line.
Florian Forster [Tue, 8 May 2007 20:09:37 +0000 (22:09 +0200)]
memory plugin: Bugfix: values_len is one now, not four.
Marius Rieder [Sun, 6 May 2007 14:43:26 +0000 (16:43 +0200)]
memory plugin: Fix the Linux-code: It submitted the same value for all RRD-files.
Marius Rieder [Sun, 6 May 2007 14:41:45 +0000 (16:41 +0200)]
src/plugin.c: Check `list_data_set' to be non-NULL before querying it.
Florian Forster [Sat, 5 May 2007 06:19:31 +0000 (08:19 +0200)]
configure.in: Bumped version to 4.0.0-rc8
Florian Forster [Sat, 5 May 2007 06:18:41 +0000 (08:18 +0200)]
src/Makefile.am: Include `types.db' in the tarballs.
Marius Rieder [Sat, 5 May 2007 06:00:55 +0000 (08:00 +0200)]
types.db: Reverse the order of the `df'-DSes.
Marius Rieder [Sat, 5 May 2007 05:58:47 +0000 (07:58 +0200)]
memory plugin: Fix the `sysctl'-code which submitted the same values for all instances.
Florian Forster [Fri, 4 May 2007 07:24:07 +0000 (09:24 +0200)]
src/plugin.c: Copy the data-sets before inserting them in the list.
Thus memory management is done by `plugin.c' and overwritten DSes can be freed.
Florian Forster [Thu, 3 May 2007 19:42:10 +0000 (21:42 +0200)]
configure.in: Bumped version to 4.0.0-rc7
Florian Forster [Thu, 3 May 2007 19:38:55 +0000 (21:38 +0200)]
Merge branch 'ff/types' into collectd-4
Florian Forster [Thu, 3 May 2007 19:38:39 +0000 (21:38 +0200)]
src/configfile.c: s/TypesDS/TypesDB/;
Florian Forster [Thu, 3 May 2007 16:31:49 +0000 (18:31 +0200)]
Removed the config-option `LoadDS' and the passing of the `modreg_e' enum to `module_register' again.
Florian Forster [Thu, 3 May 2007 09:16:29 +0000 (11:16 +0200)]
types_list: Do not free `ds' and `dsrc' because it's not copied in `plugin_register_data_set'.
This is a TODO.
Florian Forster [Thu, 3 May 2007 09:09:02 +0000 (11:09 +0200)]
types_list: More error-messages when something cannot be parsed.
Florian Forster [Thu, 3 May 2007 09:08:24 +0000 (11:08 +0200)]
types_list: Added `types.db'.
Florian Forster [Thu, 3 May 2007 08:49:16 +0000 (10:49 +0200)]
src/types_list.c: Added a function to parse a generic list of `types'.
It's not yet tested, but it compiles ;)
Florian Forster [Sun, 29 Apr 2007 07:59:44 +0000 (09:59 +0200)]
liboconfig/Makefile.am: Don't remove `parser.[ch]' and `scanner.c' when making `clean'.
Sebastian Harl [Tue, 24 Apr 2007 08:13:42 +0000 (10:13 +0200)]
Fixed Shebang line in contrib/iptables/accounting.sh.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Sun, 29 Apr 2007 07:54:58 +0000 (09:54 +0200)]
configure.in: Check for `libgen.h'.
Florian Forster [Mon, 23 Apr 2007 18:22:39 +0000 (20:22 +0200)]
rrdtool plugin: Updated copyright notice.
Florian Forster [Mon, 23 Apr 2007 14:00:22 +0000 (16:00 +0200)]
configure.in: Bumped version to 4.0.0-rc6
Florian Forster [Mon, 23 Apr 2007 13:56:12 +0000 (15:56 +0200)]
liboconfig, liboping: Set version information.
Sebastian Harl [Sun, 22 Apr 2007 13:48:20 +0000 (15:48 +0200)]
Link against liboconfig statically or use external shared library.
There is no point in linking against liboconfig dynamically if it is only used
in one place.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 22 Apr 2007 20:57:43 +0000 (22:57 +0200)]
perl plugin: Added the "IncludeDir" config option.
"IncludeDir <Dir>" adds <Dir> to the @INC array.
A segfault when parsing unknown config options has been fixed and documentation
about the perl plugin has been added to collectd.conf.pod.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 22 Apr 2007 13:47:38 +0000 (15:47 +0200)]
perl plugin: Respect the modreg flags in module_register ().
TODO: Pass on MR_DATASETS to perl plugins.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Mon, 23 Apr 2007 05:43:07 +0000 (07:43 +0200)]
src/Makefile.am: Define `PREFIX' for the unixsock plugin.
Florian Forster [Sun, 22 Apr 2007 08:24:37 +0000 (10:24 +0200)]
migrate-3-4.px: Split up the memory.rrd file.
Florian Forster [Sun, 22 Apr 2007 08:18:22 +0000 (10:18 +0200)]
memory plugin: Split up the memory data-sources into several data-sets.
Florian Forster [Sat, 21 Apr 2007 09:55:20 +0000 (11:55 +0200)]
src/liboconfig: Imported liboconfig 0.1.2.
Florian Forster [Sat, 21 Apr 2007 09:39:33 +0000 (11:39 +0200)]
Merge branch 'pull/collectd-4' into collectd-4
Florian Forster [Sat, 21 Apr 2007 09:38:29 +0000 (11:38 +0200)]
email plugin: Fix a segfault in the shutdown routine.
It was only caused when run in DS-only-mode.
Florian Forster [Sat, 21 Apr 2007 09:17:56 +0000 (11:17 +0200)]
email plugin: Only kill threads/close sockets that exist/are opened.
Florian Forster [Sat, 21 Apr 2007 09:17:28 +0000 (11:17 +0200)]
collectd.conf.in: Added the `Hostname' option to the sample config file.
Florian Forster [Fri, 20 Apr 2007 14:16:27 +0000 (16:16 +0200)]
Merge branch 'pull/collectd-4' into collectd-4