Sebastian Harl [Thu, 30 Nov 2006 11:02:46 +0000 (12:02 +0100)]
email plugin: Use strtok_r() instead of strtok().
strtok() internally uses a static buffer and thus is not thread-safe.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Thu, 30 Nov 2006 11:02:10 +0000 (12:02 +0100)]
email plugin: Change owner and mode of the UNIX socket if possible.
Set the owner and mode to COLLECTD_GRP_NAME (defaulting to "collectd") and 0770
respectively. A couple of different daemons running as different users might
want to connect to it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Thu, 30 Nov 2006 11:01:32 +0000 (12:01 +0100)]
email plugin: Minor code cleanup.
Removed debugging output and whitespaces at end of lines.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Sebastian Harl [Tue, 28 Nov 2006 12:39:51 +0000 (13:39 +0100)]
New plugin "email" to collectd ham, spam, ... statistics
This plugin collects email count and size for each type (e.g. ham, spam,
virus, ...) of emails, spam score values and the count of successful spam
checks (e.g. BAYES_99, SUBJECT_DRUG_GAP_C, ...).
These information are provided by external programs which communicate with the
plugin thru a UNIX socket and a simple line-based protocol:
/* e-mail type (e.g. ham, spam, virus, ...) and size */
e:<type>:<bytes>
/* spam score */
s:<value>
/* successful spam checks */
c:<type1>[,<type2>,...]
At most MAX_CONNS (currently set to 5) clients can connect to the plugin
simultaneously. Each connection is handled by a separate thread. Any input
line is limited to 256 characters (including the newline character) which
ought to be enough for anybody[tm] by definition. "c"-lines have to be split
up if they grow longer.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Mon, 20 Nov 2006 17:16:34 +0000 (18:16 +0100)]
df plugin: Make use of the new ignorelist functionality.
Florian Forster [Mon, 20 Nov 2006 17:15:39 +0000 (18:15 +0100)]
src/utils_ignorelist.c: Allow the `entry' argument to be NULL/empty.
Also assert the object to be non-empty.
Florian Forster [Mon, 20 Nov 2006 16:47:26 +0000 (17:47 +0100)]
src/utils_ignorelist.[ch]: Remove the `ignorelist_num' function and associated code.
Florian Forster [Mon, 20 Nov 2006 16:41:30 +0000 (17:41 +0100)]
src/utils_ignorelist.[ch]: Renamed some functions. Internal changes.
Mostly renamed variables, but also changed some return values and inserted
asserts where appropriate.
Florian Forster [Sat, 18 Nov 2006 12:44:23 +0000 (13:44 +0100)]
Ignorelist: Renamed `src/config_list.[ch]' to `src/utils_ignorelist.[ch]'.
The interface has been changed to use the `ignorelist'-prefix rather than
`configlist', which is a confusing term for this functionality.
Lubos Stanek [Fri, 17 Nov 2006 20:15:14 +0000 (21:15 +0100)]
More improvementa on the ignorelist functionality.
I am sending the updated version of config_list.
I repaired the error freeing unallocated memory, modified regex for dynamically
allocated error message buffer and replaced '|' with '/'.
Lubos Stanek [Fri, 17 Nov 2006 19:54:16 +0000 (20:54 +0100)]
Improve and generalize the ignorelist functionality.
Florian Forster [Wed, 8 Nov 2006 14:04:59 +0000 (15:04 +0100)]
Change contrib/init.d-rh7 to sleep for a second between restarts.
Florian Forster [Tue, 7 Nov 2006 19:52:29 +0000 (20:52 +0100)]
Break out of the `nanosleep' loop if `loop' is set to non-zero.
Florian Forster [Mon, 6 Nov 2006 18:34:53 +0000 (19:34 +0100)]
plugin_read_all: Check the `loop' variable after each iteration and return early if the daemon is shutting down.
Lubos Stanek has reported that the daemon may stop too slow, resulting in it
being killed by impatient init-scripts. With this patch `plugin_read_all'
checks the `loop' variable before entering each plugin's read-function. If the
loop-variable is set to non-zero it will return early, allowing the daemon to
shutdown more instantly.
Florian Forster [Sun, 5 Nov 2006 17:27:13 +0000 (18:27 +0100)]
sensors plugin: Improved the documentation in the sample configfile and the `collectd.conf(5)' manpage.
Florian Forster [Sun, 5 Nov 2006 14:08:34 +0000 (15:08 +0100)]
sensors plugin: Some code cleanup.
Very long lines have been broken into several shorter ones. `strncmp' has been
replaced with `strcmp' where reasonable. Variables have been renamed and all
variable declarations have been moved to the top of the block, as required by
ANSI C prior to C99.
Florian Forster [Sun, 5 Nov 2006 12:16:07 +0000 (13:16 +0100)]
Merge branch 'master' into ls/sensors
Florian Forster [Sun, 5 Nov 2006 12:15:43 +0000 (13:15 +0100)]
Merge branch 'processes'
Florian Forster [Sat, 4 Nov 2006 12:56:25 +0000 (13:56 +0100)]
Merge branch 'collectd-3.10'
Florian Forster [Sat, 4 Nov 2006 12:49:07 +0000 (13:49 +0100)]
Bumped version to 3.10.3; Updated ChangeLog.
Florian Forster [Sat, 4 Nov 2006 12:18:06 +0000 (13:18 +0100)]
Merge branch 'collectd-3.10'
Lubos Stanek [Sat, 4 Nov 2006 12:17:07 +0000 (13:17 +0100)]
ntpd plugin: Use the `NI_MAXHOST' define for the fixed-size buffer `peername'.
Lubos Stanek [Sat, 4 Nov 2006 12:14:11 +0000 (13:14 +0100)]
ntpd plugin: Fix buffer reallocation when the message is send in more than one packet.
Florian Forster [Wed, 1 Nov 2006 15:39:51 +0000 (16:39 +0100)]
Merge branch 'collectd-3.10'
Florian Forster [Wed, 1 Nov 2006 15:20:51 +0000 (16:20 +0100)]
debian/: Removed one last unneccessary file.
Florian Forster [Wed, 1 Nov 2006 15:19:41 +0000 (16:19 +0100)]
debian/: Imported the files from Sebastian's Debian package, part 2.
Florian Forster [Wed, 1 Nov 2006 15:17:53 +0000 (16:17 +0100)]
debian/: Imported the files from Sebastian's Debian package.
Florian Forster [Wed, 1 Nov 2006 15:12:14 +0000 (16:12 +0100)]
configure.in, utils_mount.c: Improved the detection of the different `getmntent' variants.
The check provided by `autoconf' has been completely removed, since it doesn't
provide the information we need and it's internals seem to change more often
than is practical.
Florian Forster [Wed, 1 Nov 2006 10:46:42 +0000 (11:46 +0100)]
Bumped version to 3.10.2; Updated ChangeLog.
Florian Forster [Wed, 1 Nov 2006 10:34:16 +0000 (11:34 +0100)]
Merge branch 'ff/mysql'
Florian Forster [Wed, 1 Nov 2006 10:32:13 +0000 (11:32 +0100)]
mysql plugin: Don't give up when connecting to the database fails during `init'.
Instead a connection attempt is made in increasing intervals, up to one day.
Florian Forster [Wed, 1 Nov 2006 10:09:47 +0000 (11:09 +0100)]
Merge branch 'ff/ntpd'
Lubos Stanek [Wed, 1 Nov 2006 10:05:57 +0000 (11:05 +0100)]
sensors plugin: Improved the extended naming.
And changed indentation to be the same as anywhere else in the program.
Lubos Stanek [Wed, 1 Nov 2006 09:56:15 +0000 (10:56 +0100)]
collectd.conf.pod: Corrected typos and punctuations.
Lubos Stanek [Wed, 1 Nov 2006 09:52:28 +0000 (10:52 +0100)]
collectd.conf.in: Correct the example entry for the sensors plugin.
Florian Forster [Wed, 1 Nov 2006 08:43:35 +0000 (09:43 +0100)]
ntpd plugin: Pass a `struct sockaddr' to `getnameinfo', rather than a `struct in_addr'.
Thanks to Lubos Stanek for pointing me in the right direction :)
Florian Forster [Thu, 26 Oct 2006 20:33:18 +0000 (22:33 +0200)]
Merge branch 'collectd-3.10'
Florian Forster [Thu, 26 Oct 2006 20:32:19 +0000 (22:32 +0200)]
Merge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into collectd-3.10
Florian Forster [Thu, 26 Oct 2006 20:29:30 +0000 (22:29 +0200)]
collection.cgi: Label the values displayed as `Temperature' in the temperature graph.
Florian Forster [Thu, 26 Oct 2006 20:27:59 +0000 (22:27 +0200)]
collectd(1): Improved the information about sensors plugin's DSes.
Lubos Stanek [Wed, 25 Oct 2006 14:23:42 +0000 (16:23 +0200)]
sensors plugin: Improve the support for multiple chips and add an ignore functionality.
Date: Tue, 24 Oct 2006 19:09:35 +0200
From: Lubo?? Stan??k <lubek@users.sourceforge.net>
To: collectd@verplant.org
Subject: Re: [collectd] 3.10.1 - proposed patch to extend sensors plugin
Enhancements:
- precise sensor feature selection (chip-bus-address/type-feature) in the
ExtendedSensorNaming mode
- more sensor features (finite list)
- honor sensors.conf's ignored
- config Sensor option
- config IgnoreSelected option
- config ExtendedSensorNaming option
- modified DS'es to include proper information about type in the
ExtendedSensorNaming mode
- /type- differs from yours because of the conflict between the type and the
old DS in the ExtendedSensorNaming mode
- the contrib/collection.cgi is modified to support both modes
Florian Forster [Mon, 23 Oct 2006 21:35:43 +0000 (23:35 +0200)]
src/utils_mount.c: Correct syntax errors in error-strings.
Florian Forster [Mon, 23 Oct 2006 21:34:16 +0000 (23:34 +0200)]
swap plugin: Removed unused variable `status' which aborted the build with gcc.
Florian Forster [Mon, 23 Oct 2006 16:17:07 +0000 (18:17 +0200)]
src/utils_mount.c: Prefer `getvfsstat' over `getfsstat' if both are present.
Apparently the `getfsstat' syscall is deprecated, so don't use it unless there
is no alternative.
Florian Forster [Mon, 23 Oct 2006 16:16:29 +0000 (18:16 +0200)]
src/urils_mount.c: Use `getvfsstat' on NetBSD, if available.
Florian Forster [Mon, 23 Oct 2006 11:43:22 +0000 (13:43 +0200)]
processes plugin: Only define `ps_list_register' if it is actually used.
Florian Forster [Sun, 22 Oct 2006 16:42:45 +0000 (18:42 +0200)]
ping plugin: Add the hosts during initialization, not when reading the config file.
Since adding a host to liboping might block when no nameserver can be reached
or another problem occures (normally this means network misconfiguration) it's
not the best idea to do this when reading the config file. At that point we
didn't fork to the background yet, so the boot process may hang which is not good.
Also, hosts that cannot be added right away are tried again in increasing intervals.
Florian Forster [Sun, 22 Oct 2006 16:32:58 +0000 (18:32 +0200)]
Merge branch 'sh-pidfile'
Florian Forster [Sun, 22 Oct 2006 16:31:48 +0000 (18:31 +0200)]
Completed the documentation of the new `-P' commandline option.
Additionally the `have_pidfile' variable was eliminated.
Sebastian Harl [Wed, 11 Oct 2006 21:03:42 +0000 (23:03 +0200)]
Add the `-P' command line option.
This option may be used to set the pid file, overwriting any settings found
in the config file.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Florian Forster [Sun, 22 Oct 2006 15:53:08 +0000 (17:53 +0200)]
Add file `NEWS' to make automake happy.
Florian Forster [Sun, 22 Oct 2006 15:52:46 +0000 (17:52 +0200)]
Merge branch 'collectd-3.10'
Florian Forster [Tue, 26 Sep 2006 18:05:21 +0000 (20:05 +0200)]
src/apache.c: Increase the buffer size from 4kByte to 16kByte, since this was a problem twice.
Also, make this limit easier to configure.
Peter Holik [Fri, 4 Aug 2006 18:37:13 +0000 (20:37 +0200)]
This patch adds an new plugin called multimeter.
I have a multimeter which can be connected to the serial port. It is
called Metex M4650CR.
No configuration is nesessary, this multimeter is autodetected on
programm start if connected and switched on. Only your serial port has
to be enabled (setserial /dev/ttyS0 autoconfig)
Florian Forster [Mon, 24 Jul 2006 07:01:28 +0000 (09:01 +0200)]
collectd.pod: Correct the information about the different modes.
There are _four_ modes now. Also, be more clear about when and why the `Client'
mode is the default mode.
Florian Forster [Sat, 22 Jul 2006 20:38:29 +0000 (22:38 +0200)]
Merge branch 'origin'
Florian Forster [Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)]
Merge branch 'collectd-3.10'
Florian Forster [Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200)]
Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd-3.10
Florian Forster [Sat, 22 Jul 2006 20:33:43 +0000 (22:33 +0200)]
collectd.conf.pod: Fix the synopsis: There is not `Port' option.
[22:23] <@tokkee> octo: Also laut deiner Manpage ist Listen ein Alias fuer Server und es gibt auch ne Option "Port" ;-)
Florian Forster [Sat, 22 Jul 2006 20:28:40 +0000 (22:28 +0200)]
collectd.conf.in: Added (commented) lines for the `Listen' and `Server' options.
[22:20] <@tokkee> octo: Koenntest du bitte im naechsten Release von collectd in das Config-File auskommentierte Bsp-Zeilen fuer "Server" und "Port" mit rein nehmen?
[22:20] <@octo> tokkee: Ja, kann ich machen..
[22:21] <@tokkee> octo: Thx.
[22:21] <@tokkee> octo: Dann brauch ich wegen so was net mit patchen im Paket anfangen ;-)
Florian Forster [Wed, 19 Jul 2006 16:52:20 +0000 (18:52 +0200)]
Merge branch 'master' of /var/lib/git/collectd
Florian Forster [Wed, 19 Jul 2006 16:51:35 +0000 (18:51 +0200)]
Merge branch 'collectd-3.10'
Florian Forster [Wed, 19 Jul 2006 16:50:21 +0000 (18:50 +0200)]
Bumped version to 3.10.1; Updated ChangeLog.
Florian Forster [Wed, 19 Jul 2006 16:41:36 +0000 (18:41 +0200)]
apcups plugin: Close the socket when `connect' failes.
Otherwise people will get `Too many open files' faily soon.
Florian Forster [Sun, 16 Jul 2006 14:17:50 +0000 (16:17 +0200)]
Upgraded liboping to version 0.2.3
Florian Forster [Sun, 16 Jul 2006 13:35:22 +0000 (15:35 +0200)]
Merge branch 'master' of /var/lib/git/collectd
Florian Forster [Sat, 15 Jul 2006 08:14:39 +0000 (10:14 +0200)]
Merge branch 'ff/processes'
Florian Forster [Tue, 11 Jul 2006 12:07:41 +0000 (14:07 +0200)]
Merge branch 'processes' of /var/lib/git/collectd
Florian Forster [Mon, 10 Jul 2006 21:10:19 +0000 (23:10 +0200)]
collection.cgi: The new processes RRD files have been added.
The new files are:
* ps_rss
* ps_cputime
* ps_count
* ps_pagefaults
Florian Forster [Mon, 10 Jul 2006 21:03:52 +0000 (23:03 +0200)]
processes plugin: The DS-type of the pagefault RRD-file is COUNTER, not GAUGE.
Florian Forster [Mon, 10 Jul 2006 20:32:28 +0000 (22:32 +0200)]
collection.cgi: Improved the interfaces package and error count.
Florian Forster [Mon, 10 Jul 2006 18:56:27 +0000 (20:56 +0200)]
vserver plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 18:51:57 +0000 (20:51 +0200)]
processes plugin: Renamed the selection option to `Process'.
Florian Forster [Mon, 10 Jul 2006 15:21:22 +0000 (17:21 +0200)]
processes plugin: Improved the storage of counters, so they work when the number of running instances varies.
Florian Forster [Mon, 10 Jul 2006 12:34:45 +0000 (14:34 +0200)]
processes plugin: Implement collecting the number of pagefaults for a selected process.
Florian Forster [Mon, 10 Jul 2006 11:43:28 +0000 (13:43 +0200)]
cpu plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 11:33:55 +0000 (13:33 +0200)]
disk plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 10:10:23 +0000 (12:10 +0200)]
apcups plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 09:42:10 +0000 (11:42 +0200)]
Implemented `plugin_complain' and `plugin_relief' for better error-logging in plugins.
Florian Forster [Mon, 10 Jul 2006 08:13:48 +0000 (10:13 +0200)]
processes plugin: Implement number of processes and number of threads/LWPs of a specific name.
Florian Forster [Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)]
Merge branch 'master' into ff/processes
Florian Forster [Sun, 9 Jul 2006 12:46:27 +0000 (14:46 +0200)]
debian/: Corrected the files needed for building Debian packages.
Florian Forster [Sun, 9 Jul 2006 10:54:26 +0000 (12:54 +0200)]
Bumped version to 3.10.0.
Florian Forster [Sun, 9 Jul 2006 10:51:13 +0000 (12:51 +0200)]
collectd.spec: Added the `ntpd' plugin.
Florian Forster [Sun, 9 Jul 2006 10:46:37 +0000 (12:46 +0200)]
Don't include the debian/ subdirectory in the distribution tarball, since Sebastian has packaged an official package.
Apparently Debian developers prefer not having this directory in the tarball..
Florian Forster [Sun, 9 Jul 2006 10:38:44 +0000 (12:38 +0200)]
Merge branch 'ff/traffic'
Florian Forster [Sun, 9 Jul 2006 10:34:55 +0000 (12:34 +0200)]
collection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.
Florian Forster [Sun, 9 Jul 2006 10:16:02 +0000 (12:16 +0200)]
ping plugin: Updated the ping plugin to work with liboping 0.2.2.
Florian Forster [Sun, 9 Jul 2006 10:07:48 +0000 (12:07 +0200)]
liboping: Use `oping.h' rather than the (old) `liboping.h'.
Florian Forster [Sun, 9 Jul 2006 10:06:06 +0000 (12:06 +0200)]
liboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.
Florian Forster [Sun, 9 Jul 2006 10:05:33 +0000 (12:05 +0200)]
renamed: src/liboping/liboping.h -> src/liboping/oping.h
Florian Forster [Sun, 9 Jul 2006 09:43:04 +0000 (11:43 +0200)]
Merge branch 'install-config'
Florian Forster [Sun, 9 Jul 2006 09:38:51 +0000 (11:38 +0200)]
collectd.conf: Un-comment a valid mode using the automake mechanismn.
Florian Forster [Sun, 9 Jul 2006 09:21:31 +0000 (11:21 +0200)]
Don't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.
Florian Forster [Sun, 9 Jul 2006 08:49:15 +0000 (10:49 +0200)]
traffic plugin: Store the new `if_packets.rrd' and `if_errors.rrd' in a seperate subdirectory.
This makes it easier for user interfaces to know what host, and what a plugin
subdirectory is.
Florian Forster [Sun, 9 Jul 2006 08:16:49 +0000 (10:16 +0200)]
Merge branch 'collectd-3.9'
Florian Forster [Sun, 9 Jul 2006 08:16:15 +0000 (10:16 +0200)]
network: Be more verbose when `network_create_socket' failes due to a wrong `mode'.
On Sat, Jul 08, 2006 at 02:14:05PM +0000, Cryptronic wrote:
> collectd[6889]: network_create_socket (zensoredip, 25826) failed
if this is the only error you get, you most likely need to put
Mode Client
Somewhere before the `Listen' statement.
Florian Forster [Sun, 9 Jul 2006 00:30:51 +0000 (02:30 +0200)]
collectd.conf: (Un)comment plugins based on the configure-setting. Install the file in `sysconfdir'.
What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.
Florian Forster [Sat, 8 Jul 2006 23:53:27 +0000 (01:53 +0200)]
renamed: contrib/collectd.conf -> src/collectd.conf.in
Florian Forster [Sat, 8 Jul 2006 17:29:42 +0000 (19:29 +0200)]
Merge branch 'master' into processes