Code

collectd.git
17 years agoBug#404018: Close the file descriptor when binding to a socket fails.
Florian Forster [Thu, 21 Dec 2006 12:38:52 +0000 (13:38 +0100)]
Bug#404018: Close the file descriptor when binding to a socket fails.

This closes the second part of the bug reported by Max Kellermann.

17 years agoBug#404018: Break out of the `while (loop)'-loop when no socket can be opened.
Florian Forster [Thu, 21 Dec 2006 12:27:56 +0000 (13:27 +0100)]
Bug#404018: Break out of the `while (loop)'-loop when no socket can be opened.

This fixes the first part of the bug reported by Max Kellermann.

18 years agoBumped version to 3.10.3; Updated ChangeLog. collectd-3.10.3
Florian Forster [Sat, 4 Nov 2006 12:49:07 +0000 (13:49 +0100)]
Bumped version to 3.10.3; Updated ChangeLog.

18 years agontpd plugin: Use the `NI_MAXHOST' define for the fixed-size buffer `peername'.
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'.

18 years agontpd plugin: Fix buffer reallocation when the message is send in more than one packet.
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.

18 years agodebian/: Removed one last unneccessary file. collectd-3.10.2
Florian Forster [Wed, 1 Nov 2006 15:20:51 +0000 (16:20 +0100)]
debian/: Removed one last unneccessary file.

18 years agodebian/: Imported the files from Sebastian's Debian package, part 2.
Florian Forster [Wed, 1 Nov 2006 15:19:41 +0000 (16:19 +0100)]
debian/: Imported the files from Sebastian's Debian package, part 2.

18 years agodebian/: Imported the files from Sebastian's Debian package.
Florian Forster [Wed, 1 Nov 2006 15:17:53 +0000 (16:17 +0100)]
debian/: Imported the files from Sebastian's Debian package.

18 years agoconfigure.in, utils_mount.c: Improved the detection of the different `getmntent'...
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.

18 years agoBumped version to 3.10.2; Updated ChangeLog.
Florian Forster [Wed, 1 Nov 2006 10:46:42 +0000 (11:46 +0100)]
Bumped version to 3.10.2; Updated ChangeLog.

18 years agomysql plugin: Don't give up when connecting to the database fails during `init'.
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.

18 years agontpd plugin: Pass a `struct sockaddr' to `getnameinfo', rather than a `struct in_addr'.
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 :)

18 years agoMerge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into 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

18 years agosrc/utils_mount.c: Correct syntax errors in error-strings.
Florian Forster [Mon, 23 Oct 2006 21:35:43 +0000 (23:35 +0200)]
src/utils_mount.c: Correct syntax errors in error-strings.

18 years agoswap plugin: Removed unused variable `status' which aborted the build with gcc.
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.

18 years agosrc/utils_mount.c: Prefer `getvfsstat' over `getfsstat' if both are present.
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.

18 years agosrc/urils_mount.c: Use `getvfsstat' on NetBSD, if available.
Florian Forster [Mon, 23 Oct 2006 16:16:29 +0000 (18:16 +0200)]
src/urils_mount.c: Use `getvfsstat' on NetBSD, if available.

18 years agoping plugin: Add the hosts during initialization, not when reading the config file.
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.

18 years agocollectd.pod: Correct the information about the different modes.
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.

18 years agoMerge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...
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

18 years agocollectd.conf.pod: Fix the synopsis: There is not `Port' option.
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" ;-)

18 years agocollectd.conf.in: Added (commented) lines for the `Listen' and `Server' options.
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 ;-)

18 years agoBumped version to 3.10.1; Updated ChangeLog. collectd-3.10.1
Florian Forster [Wed, 19 Jul 2006 16:50:21 +0000 (18:50 +0200)]
Bumped version to 3.10.1; Updated ChangeLog.

18 years agoapcups plugin: Close the socket when `connect' failes.
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.

18 years agodebian/: Corrected the files needed for building Debian packages. collectd-3.10.0
Florian Forster [Sun, 9 Jul 2006 12:46:27 +0000 (14:46 +0200)]
debian/: Corrected the files needed for building Debian packages.

18 years agoBumped version to 3.10.0.
Florian Forster [Sun, 9 Jul 2006 10:54:26 +0000 (12:54 +0200)]
Bumped version to 3.10.0.

18 years agocollectd.spec: Added the `ntpd' plugin.
Florian Forster [Sun, 9 Jul 2006 10:51:13 +0000 (12:51 +0200)]
collectd.spec: Added the `ntpd' plugin.

18 years agoDon't include the debian/ subdirectory in the distribution tarball, since Sebastian...
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..

18 years agoMerge branch 'ff/traffic'
Florian Forster [Sun, 9 Jul 2006 10:38:44 +0000 (12:38 +0200)]
Merge branch 'ff/traffic'

18 years agocollection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.
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'.

18 years agoping plugin: Updated the ping plugin to work with liboping 0.2.2.
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.

18 years agoliboping: Use `oping.h' rather than the (old) `liboping.h'.
Florian Forster [Sun, 9 Jul 2006 10:07:48 +0000 (12:07 +0200)]
liboping: Use `oping.h' rather than the (old) `liboping.h'.

18 years agoliboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.
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.

18 years agorenamed: src/liboping/liboping.h -> src/liboping/oping.h
Florian Forster [Sun, 9 Jul 2006 10:05:33 +0000 (12:05 +0200)]
renamed: src/liboping/liboping.h -> src/liboping/oping.h

18 years agoMerge branch 'install-config'
Florian Forster [Sun, 9 Jul 2006 09:43:04 +0000 (11:43 +0200)]
Merge branch 'install-config'

18 years agocollectd.conf: Un-comment a valid mode using the automake mechanismn.
Florian Forster [Sun, 9 Jul 2006 09:38:51 +0000 (11:38 +0200)]
collectd.conf: Un-comment a valid mode using the automake mechanismn.

18 years agoDon't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.
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.

18 years agotraffic plugin: Store the new `if_packets.rrd' and `if_errors.rrd' in a seperate...
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.

18 years agoMerge branch 'collectd-3.9'
Florian Forster [Sun, 9 Jul 2006 08:16:49 +0000 (10:16 +0200)]
Merge branch 'collectd-3.9'

18 years agonetwork: Be more verbose when `network_create_socket' failes due to a wrong `mode'.
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.

18 years agocollectd.conf: (Un)comment plugins based on the configure-setting. Install the file...
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.

18 years agorenamed: contrib/collectd.conf -> src/collectd.conf.in
Florian Forster [Sat, 8 Jul 2006 23:53:27 +0000 (01:53 +0200)]
renamed: contrib/collectd.conf -> src/collectd.conf.in

18 years agoliboping: Updated liboping to version 0.2.2
Florian Forster [Sat, 8 Jul 2006 17:24:22 +0000 (19:24 +0200)]
liboping: Updated liboping to version 0.2.2

18 years agoMerge branch 'v39/liboping-license'
Florian Forster [Sat, 8 Jul 2006 17:03:37 +0000 (19:03 +0200)]
Merge branch 'v39/liboping-license'

18 years agoliboping: Include information about the package in the source districution.
Florian Forster [Sat, 8 Jul 2006 17:03:03 +0000 (19:03 +0200)]
liboping: Include information about the package in the source districution.

The included files are: AUTHORS, COPYING, ChangeLog, and README

18 years agotraffic plugin: Documented the new optioins in collectd.conf(5).
Florian Forster [Sat, 8 Jul 2006 16:53:25 +0000 (18:53 +0200)]
traffic plugin: Documented the new optioins in collectd.conf(5).

18 years agotraffic plugin: Made it possible to select/ignore certain interfaces.
Florian Forster [Sat, 8 Jul 2006 16:37:15 +0000 (18:37 +0200)]
traffic plugin: Made it possible to select/ignore certain interfaces.

Based on an idea by and a discussion with Zhuang Yuyao.

18 years agoliboping: Added license and other information.
Florian Forster [Fri, 7 Jul 2006 09:44:34 +0000 (11:44 +0200)]
liboping: Added license and other information.

octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}

18 years agoMerge branch 'v39/libconfig-license'
Florian Forster [Fri, 7 Jul 2006 08:40:59 +0000 (10:40 +0200)]
Merge branch 'v39/libconfig-license'

18 years agolibconfig: Include the license information in the distribution tarball.
Florian Forster [Fri, 7 Jul 2006 08:40:28 +0000 (10:40 +0200)]
libconfig: Include the license information in the distribution tarball.

Also added README and other information.

18 years agoMerge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 17:42:08 +0000 (19:42 +0200)]
Merge branch 'collectd-3.9'

18 years agoconfigure.in: Bumped verion to 3.9.4. collectd-3.9.4
Florian Forster [Sun, 25 Jun 2006 17:34:15 +0000 (19:34 +0200)]
configure.in: Bumped verion to 3.9.4.

18 years agoCorrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `colle...
Florian Forster [Sun, 25 Jun 2006 17:33:51 +0000 (19:33 +0200)]
Corrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `collectd.spec'.

18 years agoconfigfile: Be more verbose if the `Server' or `Local' modes are not available.
Florian Forster [Sun, 25 Jun 2006 13:45:21 +0000 (15:45 +0200)]
configfile: Be more verbose if the `Server' or `Local' modes are not available.

This happends if not linking against librrd. Some people missed the summary at
the end of the configure script and the error message wasn't helping them.

18 years agoMerge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 10:13:07 +0000 (12:13 +0200)]
Merge branch 'collectd-3.9'

18 years agocollectd-3.9: Removed `src/libping' since it's not used.
Florian Forster [Sun, 25 Jun 2006 10:09:15 +0000 (12:09 +0200)]
collectd-3.9: Removed `src/libping' since it's not used.

18 years agoMerge branch 'svn-trunk'
Florian Forster [Sun, 25 Jun 2006 09:25:52 +0000 (11:25 +0200)]
Merge branch 'svn-trunk'

18 years agoCopied missing files from the subversion repository. svn-trunk
Florian Forster [Sun, 25 Jun 2006 09:22:59 +0000 (11:22 +0200)]
Copied missing files from the subversion repository.

18 years agoChangeLog: Added the bugfix with `operating_mode'.
Florian Forster [Sun, 25 Jun 2006 09:15:35 +0000 (11:15 +0200)]
ChangeLog: Added the bugfix with `operating_mode'.

18 years agoMerge branch 'v393-fix' into b39-fix
Florian Forster [Sun, 25 Jun 2006 08:56:59 +0000 (10:56 +0200)]
Merge branch 'v393-fix' into b39-fix

18 years agoApplied all the changes that `git-svnimport' missed. collectd-3.9.3
Florian Forster [Sun, 25 Jun 2006 08:53:36 +0000 (10:53 +0200)]
Applied all the changes that `git-svnimport' missed.

18 years agoMerge branch 'v392-fix' into v393-fix
Florian Forster [Sun, 25 Jun 2006 08:52:53 +0000 (10:52 +0200)]
Merge branch 'v392-fix' into v393-fix

18 years agoMerge branch 'v391-fix' into v392-fix collectd-3.9.2
Florian Forster [Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)]
Merge branch 'v391-fix' into v392-fix

18 years agoApplied all the changes that `git-svnimport' missed. collectd-3.9.1
Florian Forster [Sun, 25 Jun 2006 08:50:41 +0000 (10:50 +0200)]
Applied all the changes that `git-svnimport' missed.

18 years agoMerge branch 'v390-fix' into v391-fix
Florian Forster [Sun, 25 Jun 2006 08:48:42 +0000 (10:48 +0200)]
Merge branch 'v390-fix' into v391-fix

18 years agoApplied all the changes that `git-svnimport' missed. collectd-3.9.0
Florian Forster [Sun, 25 Jun 2006 08:42:32 +0000 (10:42 +0200)]
Applied all the changes that `git-svnimport' missed.

18 years agoCopied missing files from the subversion repository.
Florian Forster [Sun, 25 Jun 2006 08:36:10 +0000 (10:36 +0200)]
Copied missing files from the subversion repository.

18 years agoSet `operating_mode' to a defined state, even if not linking with librrd.
Florian Forster [Sun, 25 Jun 2006 08:27:04 +0000 (10:27 +0200)]
Set `operating_mode' to a defined state, even if not linking with librrd.

18 years agoAdded information about version 3.9.4 to `collectd.spec' and `debian/changelog'.
Florian Forster [Sun, 18 Jun 2006 17:53:40 +0000 (19:53 +0200)]
Added information about version 3.9.4 to `collectd.spec' and `debian/changelog'.

18 years agoAdded a ChangeLog entry about 3.9.4.
Florian Forster [Sun, 18 Jun 2006 17:03:59 +0000 (19:03 +0200)]
Added a ChangeLog entry about 3.9.4.

It containes information about the Solaris fixes by Christophe Kalt.

18 years agoMerge branches 'processes-fix' and 'solaris-fixes'
Florian Forster [Sat, 17 Jun 2006 19:15:42 +0000 (21:15 +0200)]
Merge branches 'processes-fix' and 'solaris-fixes'

Conflicts:

src/swap.c

18 years agoprocesses plugin: Added some more error- and debug-messages.
Florian Forster [Sat, 17 Jun 2006 18:33:18 +0000 (20:33 +0200)]
processes plugin: Added some more error- and debug-messages.

Mostly to play with the merging of git, though ;)

18 years agoocto@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
octo [Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000)]
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk

18 years agoocto@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
octo [Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)]
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk

18 years agosolaris-fixes branch: Change `pagesize' to be a `unsigned long long'.
octo [Thu, 15 Jun 2006 20:37:27 +0000 (20:37 +0000)]
solaris-fixes branch: Change `pagesize' to be a `unsigned long long'.

Christophe Kalt is having problems with what appears to be a 32bit overflow.
This is just to make sure the multiplications with `pagesize' are not causing
this.

18 years agosolaris-fixes branch: Complain in the syslog if `swapctl' failes.
octo [Thu, 15 Jun 2006 20:28:20 +0000 (20:28 +0000)]
solaris-fixes branch: Complain in the syslog if `swapctl' failes.

Shouldn't happen, but one ought to know if it does.

18 years agosolaris-fixes branch: Applied the swap-patch by Christophe Kalt.
octo [Thu, 15 Jun 2006 20:24:43 +0000 (20:24 +0000)]
solaris-fixes branch: Applied the swap-patch by Christophe Kalt.

It's supposed to fix the swap plugin under Solaris, but appears to have some
problems.

18 years agosolaris-fixes branch: Fix the debugging output in `configfile.c'.
octo [Thu, 15 Jun 2006 20:19:12 +0000 (20:19 +0000)]
solaris-fixes branch: Fix the debugging output in `configfile.c'.

The Solaris libc doesn't like if you pass a NULL pointer to as the string used
with printf like formatting. This patch introduces a macro which escapes this.

18 years agoocto@leeloo:~/collectd $ svn cp tags/collectd-3.9.3 branches/solaris-fixes
octo [Thu, 15 Jun 2006 10:59:49 +0000 (10:59 +0000)]
octo@leeloo:~/collectd $ svn cp tags/collectd-3.9.3 branches/solaris-fixes

18 years agodisk-linux branch: Fix a bug in the disk plugin.
octo [Wed, 14 Jun 2006 09:40:02 +0000 (09:40 +0000)]
disk-linux branch: Fix a bug in the disk plugin.

When `{read,write}-sectors' hit the 32 bit boundary, `atoi' would always return
LONG_MAX, resulting in the same counter-value being logged over and over again,
resulting in zero-entries in the RRD file.
Thanks to James Valente for reporting this bug and providing much debugging
information :)

18 years agoocto@casella:~/collectd $ svn cp trunk branches/disk-linux
octo [Wed, 14 Jun 2006 09:03:23 +0000 (09:03 +0000)]
octo@casella:~/collectd $ svn cp trunk branches/disk-linux

18 years agoocto@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
octo [Sat, 10 Jun 2006 14:54:58 +0000 (14:54 +0000)]
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk

18 years agotrunk: add .gitignore
octo [Sat, 10 Jun 2006 14:46:55 +0000 (14:46 +0000)]
trunk: add .gitignore

Thanks to Olaf Rempel for this patch.

18 years agotrunk: Added the `apcups' and the `ntpd' plugins to the `README' file.
octo [Sat, 10 Jun 2006 14:40:39 +0000 (14:40 +0000)]
trunk: Added the `apcups' and the `ntpd' plugins to the `README' file.

18 years agotrunk: traffic plugin: fix linux pkt/err counters
octo [Sat, 10 Jun 2006 13:59:15 +0000 (13:59 +0000)]
trunk: traffic plugin: fix linux pkt/err counters

Thanks to Olaf Rempel for this patch.

18 years agotrunk: fix some fd-leaks
octo [Sat, 10 Jun 2006 13:57:55 +0000 (13:57 +0000)]
trunk: fix some fd-leaks

Thanks to Olaf Rempel for this patch.

18 years agotrunk: Updated the `collection.cgi' with the `ntpd' types.
octo [Sat, 10 Jun 2006 13:39:18 +0000 (13:39 +0000)]
trunk: Updated the `collection.cgi' with the `ntpd' types.

Some ntpd-specific types have been added. The `apcups_*' types have been
removed, since the apcups-plugin uses pretty generic types that are also used
the `battery' plugin and possibly others..

18 years agoapcups branch: Remove `write_nbytes' and replace it with `swrite'.
octo [Sat, 10 Jun 2006 13:20:35 +0000 (13:20 +0000)]
apcups branch: Remove `write_nbytes' and replace it with `swrite'.

`swrite' is defined in `common.c' and (re)used by other plugins.
Also, use `[u]int16_t' rather than `short', since the C standard doesn't
garuantee a specific size for this storage type.
Finally, the naming of the `packet_size' variable has been unified.

18 years agoapcups branch: Removed `read_nbytes' and replaced with `sread'.
octo [Sat, 10 Jun 2006 13:09:25 +0000 (13:09 +0000)]
apcups branch: Removed `read_nbytes' and replaced with `sread'.

`sread' is the secure-read function provided by `common.c'. This removed
duplicate code..

18 years agoapcups branch: Fixed the behavior of `sread'.
octo [Sat, 10 Jun 2006 12:59:43 +0000 (12:59 +0000)]
apcups branch: Fixed the behavior of `sread'.

If `sread' receives an EOF it will now close the file descriptor and return an
error. Prior to this revision it would try to read again and possibly fail
then.. Alternatively it might have crashed, who knows..? ;)

18 years agoocto@casella:~/collectd $ svn cp trunk branches/apcups
octo [Sat, 10 Jun 2006 12:52:23 +0000 (12:52 +0000)]
octo@casella:~/collectd $ svn cp trunk branches/apcups

18 years agotrunk: Added config options of the `apcups' plugin to the `collectd.conf' manpage.
octo [Sat, 10 Jun 2006 12:51:00 +0000 (12:51 +0000)]
trunk: Added config options of the `apcups' plugin to the `collectd.conf' manpage.

18 years agotrunk: Added configuration options for `ntpd' to the `collectd.conf' manpage.
octo [Sat, 10 Jun 2006 12:44:13 +0000 (12:44 +0000)]
trunk: Added configuration options for `ntpd' to the `collectd.conf' manpage.

18 years agotrunk: Documentes the two new plugins, apcups and ntpd
octo [Sat, 10 Jun 2006 11:38:39 +0000 (11:38 +0000)]
trunk: Documentes the two new plugins, apcups and ntpd

18 years agoocto@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo [Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000)]
octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo@casella:~/collectd $ svn rm branches/ntpd

18 years agoocto@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
octo [Sat, 10 Jun 2006 11:15:01 +0000 (11:15 +0000)]
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk

18 years agoapcups branch: Don't close the socket after each iteration.
octo [Sat, 10 Jun 2006 11:08:15 +0000 (11:08 +0000)]
apcups branch: Don't close the socket after each iteration.

The apcups daemon can handle it and it's nicer to the system to just leave the
socket open, so that's what we're doing. The socket is still closed if
`APCMAIN' is defined.

18 years agoapcups branch: Some debug messages and such.
octo [Sat, 10 Jun 2006 11:01:05 +0000 (11:01 +0000)]
apcups branch: Some debug messages and such.

collectd dies when the port is forwarded using ssh and then the server exits.
Apparently ssh doesn't anser with a connection refused right away which may
result in problems..
This revision adds some debug messages and handles `EOF' correctly (when
reading).

18 years agontpd branch: Changed the RRD files of the NTPd plugin to store seconds rather than...
octo [Fri, 9 Jun 2006 20:05:12 +0000 (20:05 +0000)]
ntpd branch: Changed the RRD files of the NTPd plugin to store seconds rather than milliseconds.

Apparently seconds is what we get. I was assuming it was milliseconds for some
unknown reason..

18 years agoapcups branch: Renames some RRD files and DSes.
octo [Fri, 9 Jun 2006 11:39:52 +0000 (11:39 +0000)]
apcups branch: Renames some RRD files and DSes.

The `charge_percent' has been renamed to `load_percent' because it's actually
the load on the UPS, not the charge.
The `charge' file has been renamed to `charge_percent', because the values are
in percent, not Ah.