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:24:22 +0000 (19:24 +0200)]
liboping: Updated liboping to version 0.2.2
Florian Forster [Sat, 8 Jul 2006 17:03:37 +0000 (19:03 +0200)]
Merge branch 'v39/liboping-license'
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
Florian Forster [Sat, 8 Jul 2006 16:53:25 +0000 (18:53 +0200)]
traffic plugin: Documented the new optioins in collectd.conf(5).
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.
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}
Florian Forster [Fri, 7 Jul 2006 08:40:59 +0000 (10:40 +0200)]
Merge branch 'v39/libconfig-license'
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.
Florian Forster [Sun, 25 Jun 2006 17:42:08 +0000 (19:42 +0200)]
Merge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 17:34:15 +0000 (19:34 +0200)]
configure.in: Bumped verion to 3.9.4.
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'.
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.
Florian Forster [Sun, 25 Jun 2006 10:13:07 +0000 (12:13 +0200)]
Merge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 10:09:15 +0000 (12:09 +0200)]
collectd-3.9: Removed `src/libping' since it's not used.
Florian Forster [Sun, 25 Jun 2006 09:25:52 +0000 (11:25 +0200)]
Merge branch 'svn-trunk'
Florian Forster [Sun, 25 Jun 2006 09:22:59 +0000 (11:22 +0200)]
Copied missing files from the subversion repository.
Florian Forster [Sun, 25 Jun 2006 09:15:35 +0000 (11:15 +0200)]
ChangeLog: Added the bugfix with `operating_mode'.
Florian Forster [Sun, 25 Jun 2006 08:56:59 +0000 (10:56 +0200)]
Merge branch 'v393-fix' into b39-fix
Florian Forster [Sun, 25 Jun 2006 08:53:36 +0000 (10:53 +0200)]
Applied all the changes that `git-svnimport' missed.
Florian Forster [Sun, 25 Jun 2006 08:52:53 +0000 (10:52 +0200)]
Merge branch 'v392-fix' into v393-fix
Florian Forster [Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)]
Merge branch 'v391-fix' into v392-fix
Florian Forster [Sun, 25 Jun 2006 08:50:41 +0000 (10:50 +0200)]
Applied all the changes that `git-svnimport' missed.
Florian Forster [Sun, 25 Jun 2006 08:48:42 +0000 (10:48 +0200)]
Merge branch 'v390-fix' into v391-fix
Florian Forster [Sun, 25 Jun 2006 08:42:32 +0000 (10:42 +0200)]
Applied all the changes that `git-svnimport' missed.
Florian Forster [Sun, 25 Jun 2006 08:36:10 +0000 (10:36 +0200)]
Copied missing files from the subversion repository.
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.
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'.
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.
Florian Forster [Sat, 17 Jun 2006 19:15:42 +0000 (21:15 +0200)]
Merge branches 'processes-fix' and 'solaris-fixes'
Conflicts:
src/swap.c
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 ;)
octo [Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000)]
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
octo [Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)]
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
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.
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.
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.
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.
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
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 :)
octo [Wed, 14 Jun 2006 09:03:23 +0000 (09:03 +0000)]
octo@casella:~/collectd $ svn cp trunk branches/disk-linux
octo [Sat, 10 Jun 2006 14:54:58 +0000 (14:54 +0000)]
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
octo [Sat, 10 Jun 2006 14:46:55 +0000 (14:46 +0000)]
trunk: add .gitignore
Thanks to Olaf Rempel for this patch.
octo [Sat, 10 Jun 2006 14:40:39 +0000 (14:40 +0000)]
trunk: Added the `apcups' and the `ntpd' plugins to the `README' file.
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.
octo [Sat, 10 Jun 2006 13:57:55 +0000 (13:57 +0000)]
trunk: fix some fd-leaks
Thanks to Olaf Rempel for this patch.
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..
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.
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..
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..? ;)
octo [Sat, 10 Jun 2006 12:52:23 +0000 (12:52 +0000)]
octo@casella:~/collectd $ svn cp trunk branches/apcups
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.
octo [Sat, 10 Jun 2006 12:44:13 +0000 (12:44 +0000)]
trunk: Added configuration options for `ntpd' to the `collectd.conf' manpage.
octo [Sat, 10 Jun 2006 11:38:39 +0000 (11:38 +0000)]
trunk: Documentes the two new plugins, apcups and ntpd
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
octo [Sat, 10 Jun 2006 11:15:01 +0000 (11:15 +0000)]
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
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.
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).
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..
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.
octo [Fri, 9 Jun 2006 09:35:57 +0000 (09:35 +0000)]
apcups branch: Renamed the temperature-DS to `value' to work with existing plugins.
octo [Thu, 8 Jun 2006 17:57:43 +0000 (17:57 +0000)]
apcups branch: Fixed some minor issues with the apcups plugin. It's working now.
octo [Thu, 8 Jun 2006 17:32:49 +0000 (17:32 +0000)]
freebsd branch: swap plugin: Added the possibility to use `libkvm' to collect swap statistics.
For some weird reason one needs r00t for this, though..
octo [Thu, 8 Jun 2006 17:31:43 +0000 (17:31 +0000)]
freebsd branch: memory plugin: Include "utils_debug.h" because DBG is being used.
octo [Wed, 7 Jun 2006 17:11:52 +0000 (17:11 +0000)]
freebsd branch: swap plugin: Use `sysctlnametomib' to query the mib if we don't know it.
Maybe this should be the default?
octo [Wed, 7 Jun 2006 17:11:15 +0000 (17:11 +0000)]
freebsd branch: memory plugin: Use `errno', not the return value of `sysctlbyname', as argument to `strerror'.
octo [Wed, 7 Jun 2006 16:53:54 +0000 (16:53 +0000)]
freebsd branch: memory plugin: Quick bugfix. Works under FreeBSD now.
octo [Wed, 7 Jun 2006 16:53:09 +0000 (16:53 +0000)]
memory plugin: MACH_VM_STATISTICS_H -> HAVE_MACH_VM_STATISTICS_H
Not really a bug. It worked the other way, too..
octo [Wed, 7 Jun 2006 16:21:56 +0000 (16:21 +0000)]
freebsd branch: memory.c: Hopefully working version.
Use `sysctlbyname' to get values instead of the `sysctl' call. Also, use the
`HAVE_SYSCTLBYNAME' define rather than `VM_TOTAL'.
octo [Wed, 7 Jun 2006 16:04:34 +0000 (16:04 +0000)]
freebsd branch: First attempt at porting the `memory' plugin to FreeBSD.
octo [Wed, 7 Jun 2006 15:52:35 +0000 (15:52 +0000)]
octo@huhu:~/collectd $ svn cp trunk branches/freebsd
octo [Tue, 6 Jun 2006 08:05:39 +0000 (08:05 +0000)]
octo@leeloo:~/collectd $ svn merge -r737:784 branches/apcups trunk
The trunk did not compile with the `apcups' plugin enabled. Since it's enabled
by default some extra action was neccessary. The `apcups' plugin in the branch
compiles and may be useable, so I'm merging it back to get to some consistent
state.
octo [Tue, 6 Jun 2006 07:50:33 +0000 (07:50 +0000)]
apcups branch: Fix minor issues with the apcups plugin.
- Removed `#include <errno.h>' since it is included from `collectd.h'.
- Changed `global_host' back to NULL. Added a ?:-construct to use a default
value when querying the server.
- Use `strcmp' rather than `strncmp' to compare the full string, not just part
of the strings.
anthony [Tue, 6 Jun 2006 03:14:39 +0000 (03:14 +0000)]
1. Was erroneously using tokptr vice key.
2. Changed calls to strcmp to strncmp so that
only definate ranges where being compared.
anthony [Tue, 6 Jun 2006 02:27:50 +0000 (02:27 +0000)]
1. Keeping the socket open on my system, when apcupsd is shutdown, collectd dies as well.
I re-inserted the net_close() and now when apcupsd is shutdown (or otherwise goes away)
collectd stays running.
2. Changed the 'complain' and 'complain_step' code so that it will chirp the first time, then
every 6 hours. As it was originally it would only start complaining after 6 hours. Additionally
I made complain an unsigned int. If it was an int and rolled over I wasn't certain what would happen.
3. 'global_host' set to localhost. It was set to NULL, but what happens is if someone does not enter
an apcups section to collectd.conf, then it will not connect to anyone. With 'global_host' set to localhost
the default behavior is now to connect to the apcupsd on the localhost.
4. Added entry for apcupsd.so in 'contrib/collectd.spec'.
octo [Sun, 4 Jun 2006 13:42:49 +0000 (13:42 +0000)]
Changed the build system to link against the system's `liboping' if it is found.
If it is not found the version shipped in `src/liboping' is used.
octo [Thu, 1 Jun 2006 20:53:20 +0000 (20:53 +0000)]
octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk
octo [Thu, 1 Jun 2006 20:49:32 +0000 (20:49 +0000)]
Bumped version to 3.9.3
octo [Thu, 1 Jun 2006 20:41:23 +0000 (20:41 +0000)]
Added a ChangeLog entry for version 3.9.3.
octo [Thu, 1 Jun 2006 20:39:43 +0000 (20:39 +0000)]
Removed the call to `bind'.
It's only neccessary when binding to a specific (local) address, which we
don't. FreeBSD, Mac OS X and potentially other operating systems didn't like
this.. GNU/Linux never complained, though..
octo [Thu, 1 Jun 2006 20:36:43 +0000 (20:36 +0000)]
Updated the configure script to work under *BSD.
There was a problem with building the `oping' library under FreeBSD. The
`netinet/*.h' includes need to have `sys/types.h' included before them. Under
other operating systems only `stdint.h' is neccessary.
octo [Thu, 1 Jun 2006 07:17:11 +0000 (07:17 +0000)]
ntpd branch: Close the ntpd-socket if a read or write failes (with something else then EAGAIN or EINTR).
octo [Wed, 31 May 2006 14:06:09 +0000 (14:06 +0000)]
ntpd branch: Removed the headerfiles that were copied from the NTPd distribution: They are not used (anymore).
octo [Wed, 31 May 2006 08:44:15 +0000 (08:44 +0000)]
ntpd branch: Added `time_dispersion' and `delay' to the `collection.cgi' Also, changed `time_offset' to use `Seconds' and let RRDTool scale that to milli- or micro-seconds.
octo [Wed, 31 May 2006 08:43:13 +0000 (08:43 +0000)]
ntpd branch: Added the collection of the `time_dispersion' and `delay' values to the ntpd plugin.
octo [Wed, 31 May 2006 08:03:44 +0000 (08:03 +0000)]
ntpd branch: The ntpd plugin now resolves the `127.127.$id.*' addresses to the reference-clock name.
octo [Wed, 31 May 2006 07:04:40 +0000 (07:04 +0000)]
ntpd branch: Added config-code to the ntpd plugin, so one can configure the host and port to use/query.
octo [Wed, 31 May 2006 06:59:14 +0000 (06:59 +0000)]
ntpd branch: Added the reverse-lookup for both, IPv4 and IPv6 to the ntpd plugin.
octo [Tue, 30 May 2006 20:56:19 +0000 (20:56 +0000)]
ntpd branch: Added `frequency_offset' and `time_offset' to `collection.cgi'
octo [Tue, 30 May 2006 20:55:41 +0000 (20:55 +0000)]
ntpd branch: The ntpd plugin now requests the `peer info summary' but doesn't record it yet.
octo [Tue, 30 May 2006 17:50:27 +0000 (17:50 +0000)]
ntpd branch: Added some debug messages to the ntpd plugin. Also changed it to request `kern_info' rather than `sys_info'. `peer_stats' or something is still to be done.
octo [Mon, 29 May 2006 13:52:00 +0000 (13:52 +0000)]
ntpd branch: The ntpd-plugin compiles and gets _some_ values. Doesn't entirely work yet, though.
octo [Mon, 29 May 2006 13:41:20 +0000 (13:41 +0000)]
ntpd branch: Fixed misspelled variable name in common.h.
octo [Sun, 28 May 2006 17:37:26 +0000 (17:37 +0000)]
Added a call to `poll(2)' to the ntpd plugin. Also added some needed time calculation for the timeout.
octo [Sun, 28 May 2006 15:53:59 +0000 (15:53 +0000)]
ntpd.c: Fixed most syntax errors.. Removed the inclusion of `ntp_request.h' since it has too many dependencies.
octo [Sun, 28 May 2006 15:21:47 +0000 (15:21 +0000)]
Added `ntp_{types,machine}.h' from the NTPd distribution.
octo [Sun, 28 May 2006 15:15:43 +0000 (15:15 +0000)]
First (incomplete) code for querying an ntpd.
octo [Sun, 28 May 2006 15:15:04 +0000 (15:15 +0000)]
Added `sread' and `swrite': `read' and `write' like functions that assure that all data is written or fail completely..
octo [Sat, 27 May 2006 11:25:55 +0000 (11:25 +0000)]
hddtemp.c: Don't try other sockets if one could be opened..
octo [Fri, 26 May 2006 15:54:07 +0000 (15:54 +0000)]
Copied `ntp-4.2.0a+stable/include/ntp_request.h' to the source directory.
octo [Fri, 26 May 2006 15:53:25 +0000 (15:53 +0000)]
Created the `ntpd' branch.