Sebastian Harl [Thu, 26 Jul 2007 16:13:18 +0000 (18:13 +0200)]
configure.in: Generate version dynamically using version-gen.sh.
This dynamically creates the version string when the configure script is
created. If run from within a repository the output of "git describe" is
used to create the version string. Else it defaults to a hardcoded value
which should be something like "$latest_version.git".
The idea is to update the default version to the new version (without
".git" appended) as the last commit of a release cycle. This commit is
tagged as the new version. The next commit after the release will set the
default version to "$new_version.git".
The benefit is that a pre-release with a quite well defined and unique
version can be easily created at any time.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 26 Jul 2007 16:12:01 +0000 (18:12 +0200)]
Updated .gitignore.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 30 Jul 2007 17:38:36 +0000 (19:38 +0200)]
ChangeLog: A first draft of the changes that were made for 4.1.
Bruno Prémont [Tue, 10 Jul 2007 21:30:57 +0000 (23:30 +0200)]
configure.in: Use the custom CFLAGS and LDFLAGS when testing for the upsclient library.
Sebastian Harl [Mon, 9 Jul 2007 14:25:02 +0000 (16:25 +0200)]
Added a sample collection.conf to contrib/.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 10 Jul 2007 13:53:29 +0000 (15:53 +0200)]
Changed the test for the `libupsclient' to it uses `libupsclient-config'.
Apparently it's linked against libssl on some systems, so getting the LDFLAGS
right is important.
Florian Forster [Thu, 5 Jul 2007 20:16:17 +0000 (22:16 +0200)]
Merge branch 'collectd-4.0'
Conflicts:
configure.in
Florian Forster [Thu, 5 Jul 2007 20:02:48 +0000 (22:02 +0200)]
Bumped version to 4.0.5; Updated ChangeLog.
Florian Forster [Wed, 4 Jul 2007 21:06:24 +0000 (23:06 +0200)]
collectd-nagios: Display performance data and generally be more verbose.
Florian Forster [Wed, 4 Jul 2007 21:05:37 +0000 (23:05 +0200)]
src/collectd.conf.in: s/_MODULE_/_PLUGIN_/g
Florian Forster [Mon, 2 Jul 2007 14:00:23 +0000 (16:00 +0200)]
Merge branch 'pull/master'
Conflicts:
src/memory.c
Florian Forster [Mon, 2 Jul 2007 13:59:21 +0000 (15:59 +0200)]
memory plugin: Check for `HAVE_HOST_STATISTICS' rather than `HOST_VM_INFO'.
Florian Forster [Mon, 2 Jul 2007 13:46:31 +0000 (15:46 +0200)]
Removed the `XXX_HAVE_READ' defines from all plugins.
Florian Forster [Mon, 2 Jul 2007 09:59:46 +0000 (11:59 +0200)]
collectd-nagios(1): Fix typo.
Florian Forster [Sun, 1 Jul 2007 15:28:26 +0000 (17:28 +0200)]
build system: Do dependency checking in the configure script.
The plan is to remove the dependency defines from the plugins and do all that
in the configure script from now on.
Florian Forster [Sun, 1 Jul 2007 07:50:43 +0000 (09:50 +0200)]
dns plugin: Added support for the old bind-interface.
Apparently it is still in use, even in new distributions:
-- 8< --
bsbuild>uname -a
OpenBSD bsbuild 4.1 GENERIC#1435 i386
bsbuild>/usr/sbin/named -v
BIND 9.3.4
-- >8 --
Florian Forster [Sun, 1 Jul 2007 06:53:18 +0000 (08:53 +0200)]
src/common.c: Allow the `pwbufp' argument to `getpwnam_r' to be NULL.
Florian Forster [Sat, 30 Jun 2007 21:22:41 +0000 (23:22 +0200)]
Impelemt an own version of `getpwnam_r'.
Since OpenBSD doesn't provide a threadsafe version itself, we need to provide
it in this case.. :/
Florian Forster [Sat, 30 Jun 2007 15:01:04 +0000 (17:01 +0200)]
{hddtemp,mbmon,ntpd} plugins: Only use the `AI_ADDRCONFIG' if it's defined.
Florian Forster [Sat, 30 Jun 2007 14:04:26 +0000 (16:04 +0200)]
configure.in: Include `sys/types.h' and `sys/param.h' before other `sys/*.h' includes.
This fixes build problems under OpenBSD.
Florian Forster [Sun, 24 Jun 2007 20:42:09 +0000 (22:42 +0200)]
Merge branch 'collectd-4.0'
Florian Forster [Sun, 24 Jun 2007 20:41:17 +0000 (22:41 +0200)]
Bumped version to 4.0.4; Updated ChangeLog.
Florian Forster [Sun, 24 Jun 2007 20:40:36 +0000 (22:40 +0200)]
src/collectd-nagios.c: Copy the NAN-defines from `collectd.h'.
This should fix the bug reported by Daniel Leite.
Florian Forster [Sat, 23 Jun 2007 17:45:27 +0000 (19:45 +0200)]
snmp plugin: Use several reading threads to parallelize the reading of SNMP hosts.
Florian Forster [Sat, 23 Jun 2007 09:48:18 +0000 (11:48 +0200)]
snmp plugin: Use the `snmp_sess_*' interface.
Apparently that's thread safe..
Florian Forster [Sat, 23 Jun 2007 07:02:13 +0000 (09:02 +0200)]
dns plugin: Check for `net/ppp_defs.h' and include it before `net/if_ppp.h' if it exists.
This hopefully solves build problems under OpenBSD.
Florian Forster [Thu, 21 Jun 2007 17:50:03 +0000 (19:50 +0200)]
snmp plugin: Many important bugfixes.
It workes a lot better now :)
Daniel Leite [Thu, 21 Jun 2007 08:45:18 +0000 (10:45 +0200)]
memory plugin: Fix a typo in the Solaris code.
Florian Forster [Thu, 21 Jun 2007 08:40:49 +0000 (10:40 +0200)]
liboconfig: Added `%option noyywrap' to the scanner.
This should solve the link issues when collectd is built without flex being
installed.
Florian Forster [Thu, 21 Jun 2007 08:39:39 +0000 (10:39 +0200)]
load plugin: Fix the Linux code that reads `/proc/loadavg'.
Daniel Leite [Thu, 21 Jun 2007 08:38:24 +0000 (10:38 +0200)]
cpu, interface plugin: Fix compilation issues under Solaris.
Florian Forster [Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)]
Merge branch 'collectd-4.0'
Florian Forster [Tue, 19 Jun 2007 19:31:07 +0000 (21:31 +0200)]
Bumped version to 4.0.3.
Florian Forster [Tue, 19 Jun 2007 19:29:25 +0000 (21:29 +0200)]
ChangeLog, README: Documented the `--with-nan-emulation' option.
Florian Forster [Tue, 19 Jun 2007 18:48:15 +0000 (20:48 +0200)]
configure: Implemented `--with-nan-emulation' for crosscompiling.
When crosscompiling you cannot do the runtime checks for the (0.0 / 0.0) hack.
With this option you can force this implementation if neccessary.
Ezra Peisach [Tue, 19 Jun 2007 06:10:10 +0000 (08:10 +0200)]
src/Makefile.am: When building outside the source tree, install will fail
Signed-off-by: Ezra Peisach <epeisach@med-xtal.bu.edu>
Ezra Peisach [Tue, 19 Jun 2007 06:05:47 +0000 (08:05 +0200)]
csv, rrdtool plugin: Initialize a buffer correctly.
While reading the source code, I found the following:
In csv.c (line 44) and rrdtool.c (line 363) (value_list_to_string) the
following syntax exists:
memset (buffer, '\0', sizeof (buffer_len));
The sizeof should be removed - assuming that the desire is to zero the buffer
and not the first four (sizeof(int)) bytes.
Based on the code paths - I do not see an information leak - or any security
implications...
Florian Forster [Mon, 18 Jun 2007 22:12:05 +0000 (00:12 +0200)]
Collectd::Unixsock: Implemented the `listval' method.
Florian Forster [Mon, 18 Jun 2007 22:08:09 +0000 (00:08 +0200)]
unixsock plugin: Implemented the `LISTVAL' command.
The LISTVAL command returnes a list of all available values and their timestamps.
Florian Forster [Mon, 18 Jun 2007 16:42:42 +0000 (18:42 +0200)]
ChangeLog: Added changes for 4.0.3.
Florian Forster [Mon, 18 Jun 2007 15:20:07 +0000 (17:20 +0200)]
snmp plugin: Implemented the host-option `Interval'.
With this option hosts can be queried in different intervals, reducing the load
on devices with little CPU power, such as switches.
Florian Forster [Mon, 18 Jun 2007 14:56:00 +0000 (16:56 +0200)]
ping plugin: Actually check the uid, not the address of `getuid'.
Florian Forster [Thu, 14 Jun 2007 16:16:17 +0000 (18:16 +0200)]
xmms plugin: Added a plugin to graph bitrate and frequencies or files played by XMMS.
Of course, this is not the most useful plugin ever.. ;)
Florian Forster [Wed, 13 Jun 2007 21:21:38 +0000 (23:21 +0200)]
cpu plugin: Submit the right values in the Darwin code.
Florian Forster [Wed, 13 Jun 2007 21:13:07 +0000 (23:13 +0200)]
configure.in, src/Makefile.am: Only link against Net-SNMP if it is found.
Florian Forster [Wed, 13 Jun 2007 11:00:17 +0000 (13:00 +0200)]
snmp plugin: Use `size_t' for the OID length to be more portable.
Sebastian Harl [Tue, 12 Jun 2007 19:18:18 +0000 (21:18 +0200)]
Added initial version off cussh.pl to contrib/.
cussh (Collectd Unix Socket SHell) is a little interactive frontend for
the unixsock plugin. It supports two commands - GETVAL and PUTVAL - just
as the unixsock plugin itself.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 12 Jun 2007 19:43:17 +0000 (21:43 +0200)]
contrib/SpamAssassin/: Set default socket path to /var/run/collectd-email.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 12 Jun 2007 16:48:52 +0000 (18:48 +0200)]
email plugin: Set default path of the UNIX socket to $localstatedir.
In addition make it configurable using the "SocketFile" config option just
as for the unixsock plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 12 Jun 2007 16:47:53 +0000 (18:47 +0200)]
unixsock plugin: Set default path of the UNIX socket to $localstatedir.
For this purpose LOCALSTATEDIR is defined to $localstatedir during
compilation.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 12 Jun 2007 06:55:29 +0000 (08:55 +0200)]
Merge branch 'collectd-4.0'
Florian Forster [Tue, 12 Jun 2007 06:01:58 +0000 (08:01 +0200)]
Bumped version to 4.0.2; Updated ChangeLog.
Florian Forster [Mon, 11 Jun 2007 10:08:57 +0000 (12:08 +0200)]
hddtemp, ntpd plugin: Allow numeric `Port' arguments.
Florian Forster [Thu, 7 Jun 2007 08:39:25 +0000 (10:39 +0200)]
Merge branch 'collectd-4.0'
Florian Forster [Thu, 7 Jun 2007 08:21:57 +0000 (10:21 +0200)]
Bumped version to 4.0.1; Updated ChangeLog.
Florian Forster [Thu, 7 Jun 2007 07:41:01 +0000 (09:41 +0200)]
contrib/collection.cgi: Added graphs for gauge, if_errors, ipt_bytes and ipt_packets.
Florian Forster [Thu, 7 Jun 2007 07:25:08 +0000 (09:25 +0200)]
Merge branch 'collectd-4.0'
Evan Miller [Thu, 7 Jun 2007 07:22:44 +0000 (09:22 +0200)]
README, collectd.conf(5): its/it's in documentation
A grammatical pet peeve of mine...
Cheers,
Evan
Sebastian Harl [Tue, 5 Jun 2007 10:57:06 +0000 (12:57 +0200)]
collectd.conf.pod: Fixed a typo.
The rrdtool plugin does not create CSV-files ;-)
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Wed, 6 Jun 2007 15:37:12 +0000 (17:37 +0200)]
Merge branch 'collectd-4.0'
Florian Forster [Wed, 6 Jun 2007 15:35:46 +0000 (17:35 +0200)]
iptables plugin: Fix a segfault when a comment is passed in the configuration.
Florian Forster [Wed, 6 Jun 2007 12:32:26 +0000 (14:32 +0200)]
rrdtool plugin: Use the interval in the value lists to calculate the RRA sizes.
Florian Forster [Wed, 6 Jun 2007 12:30:12 +0000 (14:30 +0200)]
network plugin: Send and receive the interval of value lists.
Florian Forster [Wed, 6 Jun 2007 12:29:10 +0000 (14:29 +0200)]
src/plugin.h: Include the `interval' in the value lists.
Florian Forster [Sun, 3 Jun 2007 20:44:03 +0000 (22:44 +0200)]
Merge branch 'ff/rrdqueue'
Florian Forster [Sun, 3 Jun 2007 20:43:43 +0000 (22:43 +0200)]
Merge branch 'ff/snmp'
Florian Forster [Sun, 3 Jun 2007 17:55:51 +0000 (19:55 +0200)]
Bumped version to 4.0.0; Updated ChangeLog.
Florian Forster [Sun, 3 Jun 2007 17:05:34 +0000 (19:05 +0200)]
rrdtool plugin: Fixed some bugs in the queueing-code.
Sebastian Harl [Sun, 3 Jun 2007 13:33:27 +0000 (15:33 +0200)]
Marked the perl plugin to be experimental.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Sun, 3 Jun 2007 13:32:55 +0000 (15:32 +0200)]
Added Perl module "Collectd" to contrib.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Mon, 28 May 2007 19:43:31 +0000 (21:43 +0200)]
src/configfile.c: Pass the `oconfig_item_t' types to the plugins if they request it.
Florian Forster [Mon, 28 May 2007 10:29:13 +0000 (12:29 +0200)]
rrdtool plugin: Queue values to be written, but don't write them synchronously.
Florian Forster [Sat, 2 Jun 2007 10:06:19 +0000 (12:06 +0200)]
collectd-snmp(5): Fix some errors and typos.
Florian Forster [Sat, 2 Jun 2007 07:25:42 +0000 (09:25 +0200)]
Merge branch 'pull/master'
Florian Forster [Sat, 2 Jun 2007 07:25:31 +0000 (09:25 +0200)]
collectd-unixsock(5): Corrected the information about the PUTVAL format.
Florian Forster [Fri, 1 Jun 2007 16:06:52 +0000 (18:06 +0200)]
snmp plugin: Cast the `bitstring' to (char *).
The implementation apparently differs between versions.
Florian Forster [Fri, 1 Jun 2007 16:03:45 +0000 (18:03 +0200)]
collectd-snmp(5): Added a manpage for the SNMP plugin.
Florian Forster [Thu, 31 May 2007 21:34:29 +0000 (23:34 +0200)]
collectd-exec(5): Documented the recent changes.
Florian Forster [Thu, 31 May 2007 21:16:41 +0000 (23:16 +0200)]
exec plugin: Change the input format so it's identical to the one used in unixsock.
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 [Thu, 31 May 2007 11:48:53 +0000 (13:48 +0200)]
snmp plugin: Implemented fetching of tables.
This also works with ``sparse tables'' where rows are missing or some columns
are not defined in all rows. That may be improved still, though.
Florian Forster [Thu, 31 May 2007 09:12:37 +0000 (11:12 +0200)]
snmp plugin: First experimental code to read an SNMP-table.
Florian Forster [Wed, 30 May 2007 17:25:21 +0000 (19:25 +0200)]
snmp plugin: Added the first prototype of an SNMP plugin.
Querying simple values already works.
Florian Forster [Mon, 28 May 2007 19:43:31 +0000 (21:43 +0200)]
src/configfile.c: Pass the `oconfig_item_t' types to the plugins if they request it.
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>