Sebastian Harl [Tue, 28 Aug 2007 17:05:19 +0000 (19:05 +0200)]
utils_cmd_putval.c: Fixed a copy&paste error.
"unixsock plugin" is supposed to be "cmd putval".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Sebastian Harl [Tue, 28 Aug 2007 17:04:53 +0000 (19:04 +0200)]
src/Makefile.am: Added utils_cmd_putval to exec_la_SOURCES.
Without this, utils_cmd_putval will not be linked into the exec plugin and the
"handle_putval" symbol will not be available at runtime.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Sebastian Harl [Tue, 28 Aug 2007 17:04:19 +0000 (19:04 +0200)]
exec plugin: Fixed a "control reaches end of non-void function" warning.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Sebastian Harl [Tue, 28 Aug 2007 16:56:22 +0000 (18:56 +0200)]
[PATCH 2/2] collectd.conf.pod: Documented the exec plugin's group support.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Sebastian Harl [Tue, 28 Aug 2007 16:54:53 +0000 (18:54 +0200)]
[PATCH 1/2] exec plugin: Added support to specify a group as well.
Now, the user and group as which the process should be executed can be
specified as the first argument to the "Exec" config option. The syntax is
identical to the one used by GNU's chown(1).
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Florian Forster [Tue, 28 Aug 2007 22:02:21 +0000 (00:02 +0200)]
Merge branch 'collectd-4.0'
Conflicts:
ChangeLog
configure.in
src/Makefile.am
src/collectd-unixsock.pod
src/mysql.c
src/nut.c
Florian Forster [Tue, 28 Aug 2007 13:23:48 +0000 (15:23 +0200)]
ChangeLog: Added a short note about the fix in the processes plugin.
Florian Forster [Tue, 28 Aug 2007 13:18:27 +0000 (15:18 +0200)]
mysql plugin: Use a different define to determine if the read functionality should be enabled.
Florian Forster [Sun, 26 Aug 2007 17:40:19 +0000 (19:40 +0200)]
Bumped version to 4.0.7; Updated ChangeLog.
Florian Forster [Sun, 26 Aug 2007 17:07:46 +0000 (19:07 +0200)]
Merge branch 'collectd-3.11' into collectd-4.0
Florian Forster [Sun, 26 Aug 2007 17:07:10 +0000 (19:07 +0200)]
processes plugin: Fix a possible segfault.
Florian Forster [Sun, 26 Aug 2007 13:14:36 +0000 (15:14 +0200)]
build system: Several fixes for libcurl, libmysql, and libupsclient.
libcurl: Check for CFLAGS using `curl-config --cflags' and use these
CFLAGS when checking for <curl/curl.h> to allow for weird
locations of the library.
libmysql: Cleaned up the checking code.
libupsclient: Check if the header file provides `UPSCONN' or `UPSCONN_t' and
use the one available. This should fix compile issues with with
the nut plugin.
Florian Forster [Fri, 24 Aug 2007 11:57:19 +0000 (13:57 +0200)]
build system: Use the libs provided by `mysql_config' to check for the lib itself.
Florian Forster [Fri, 24 Aug 2007 10:12:40 +0000 (12:12 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Fri, 24 Aug 2007 10:12:23 +0000 (12:12 +0200)]
build system: Use `mysql_config' to find the appropriate flags for MySQL.
Florian Forster [Thu, 23 Aug 2007 06:05:56 +0000 (08:05 +0200)]
Merge branch 'pull/master'
Florian Forster [Thu, 23 Aug 2007 06:05:09 +0000 (08:05 +0200)]
exec and unixsock plugin: Move the shared `PUTVAL' code into src/utils_cmd_putval.[ch].
The putval code itself has been extended to allow `options' which can currently
be used to set the interval of the value-list(s) being submitted. Also,
submiting multiple value-lists in one command has been implemented. The
manpages should be up to date.
Florian Forster [Wed, 22 Aug 2007 15:22:35 +0000 (17:22 +0200)]
contrib/collectd2html.pl: Don't invoke the Perl interpreter with `-w'.
Eddy Petrișor [Wed, 22 Aug 2007 15:15:34 +0000 (17:15 +0200)]
contrib/collectd2html.pl: Allow generation of graphs from remote hosts or in an alternative directory.
In the contribs area of the package there is a nice collectd2html.pl script
which assumes that the data is present in /var/lib/collectd and infers the
hostname. All fine and dandy, but there is no way to override this. This is
useful if one generates the data on a machine, but generates the graphs on
another one.
With the attached patch now is possible to specify a different host and/or a
different directory for the data.
The added options are '--host-is' and '--data-dir'.
An invocation for a remote host whose rrd files have been placed in
/var/tmp/collectd-remoteh looks like:
collectd2html.pl --host-is=remoteh --data-dir=/var/tmp/collectd-remoteh
Florian Forster [Wed, 22 Aug 2007 14:37:29 +0000 (16:37 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200)]
Merge branch 'sh/master'
Conflicts:
configure.in
Sebastian Harl [Thu, 9 Aug 2007 21:12:54 +0000 (23:12 +0200)]
contrib/README: Updated information about collection.cgi.
The list of required Perl modules has been updated and some instructions
how to install the script have been added. Also a note about the config
file required since version 4 has been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
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, 9 Aug 2007 21:11:50 +0000 (23:11 +0200)]
Fixed some typos in the manpages.
The adjective "performant" does not seem to exist (neither in English nor
in German). I've replaced it with "efficient".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 9 Aug 2007 21:11:03 +0000 (23:11 +0200)]
README, contrib/README: Fixed some typos.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sun, 19 Aug 2007 15:19:12 +0000 (17:19 +0200)]
network plugin: Allow port arguments to be numeric.
Florian Forster [Sun, 19 Aug 2007 15:14:14 +0000 (17:14 +0200)]
README: Added a pointer to the mailinglist.
Florian Forster [Wed, 8 Aug 2007 19:43:08 +0000 (21:43 +0200)]
Merge branch 'pull/collectd-4.0'
Kjell Randa [Sun, 5 Aug 2007 21:39:09 +0000 (23:39 +0200)]
contrib/fedora/collectd.spec: Updated for 4.0.6.
Hi,
Here is an updated version of the F7 rpm spec file.
It now handles updates as well (rpm -U).
When new versions of collectd are out please bump the version tag at the top of
the spec file.
It will then build correct version of collectd.
Regards
Kjell Randa
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Michael Renzmann [Sat, 4 Aug 2007 10:22:54 +0000 (12:22 +0200)]
collectd(1): Fix typo.
Florian Forster [Fri, 3 Aug 2007 08:56:17 +0000 (10:56 +0200)]
Merge branch 'pull/master'
Florian Forster [Fri, 3 Aug 2007 08:55:03 +0000 (10:55 +0200)]
Merge branch 'collectd-4.0'
Conflicts:
ChangeLog
Florian Forster [Fri, 3 Aug 2007 08:09:47 +0000 (10:09 +0200)]
Bumped version to 4.0.6; Updated ChangeLog.
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 [Tue, 31 Jul 2007 07:29:46 +0000 (09:29 +0200)]
Merge branch 'pull/collectd-4.0' into collectd-4.0
Florian Forster [Tue, 31 Jul 2007 07:29:19 +0000 (09:29 +0200)]
src/collectd.conf.in: Added the `SocketFile' option for the email plugin.
Kjell Randa [Tue, 31 Jul 2007 07:28:38 +0000 (09:28 +0200)]
Fixed Fedora specfile for Fedora 7 and collectd 4.0.5
Hi,
Here is a working spec file for Fedora 7.
Copy the tar.gz file to /usr/src/redhat/SOURCES and run
rpmbuild -ba collectd.spec
It has only been tested on x86_64, but I well see if I can find time to test
on x86 as well.
Upgrade not tested.
The file /etc/collection.conf referenced in collection.cgi is missing in the
tar file and not installed by the spec file.
Regards
Kjell Randa
Florian Forster [Mon, 30 Jul 2007 20:43:26 +0000 (22:43 +0200)]
syslog plugin: Call `openlog' right when the plugin is loaded.
Florian Forster [Mon, 30 Jul 2007 18:15:31 +0000 (20:15 +0200)]
sensors plugin: Fix the use of the ignorelist, so it matches the documentation.
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.