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 [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 [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.
octo [Thu, 25 May 2006 12:08:27 +0000 (12:08 +0000)]
Added the `Ignore' config option of the `traffic' plugin to the collectd.conf(5) manpage.
octo [Thu, 25 May 2006 11:56:38 +0000 (11:56 +0000)]
Build the `submit_{packages,errors}' functions when the proc interface is used..
octo [Thu, 25 May 2006 11:53:25 +0000 (11:53 +0000)]
traffic plugin: Store the packet- and error-counter for the proc interface, too.
octo [Thu, 25 May 2006 11:41:22 +0000 (11:41 +0000)]
Changed the build-system to only use the getifaddrs-code under Linux, if the user specifically said to do so.
octo [Wed, 24 May 2006 16:56:15 +0000 (16:56 +0000)]
Changed the apcups plugin to keep the socket open.
octo [Wed, 24 May 2006 16:12:16 +0000 (16:12 +0000)]
Define the `APCMAIN' define in any way. Set it to zero if building as a plugin (default).
octo [Wed, 24 May 2006 06:16:00 +0000 (06:16 +0000)]
apcups.c: Closed run-away comment. Sorry.
octo [Wed, 24 May 2006 06:14:28 +0000 (06:14 +0000)]
Removed all the conflicts from the apcups-plugin again.
anthony [Mon, 22 May 2006 12:51:48 +0000 (12:51 +0000)]
1. (major) Code no longer calls exit() when it encounters an error. It
will send an appropriate error via syslog instead.
2. Adopted the code recommended by Octo (thx) It was considerably cleaner
and easier to understand. Not to mention the plugin size is smaller. A win
all around ;-) I rearranged some, though.
3. Fixed the indentation. I believe I see what is recommended by octo....
Hopefully, it is now similar to the other plugins.
4. On a failure to connect apcups will log the initial failure via syslog. It will
only log another failure after the integer apcConnStatus rolls over. This should prevent
apcups from overloading syslog.
5. Other minor code cleanups.
octo [Sat, 20 May 2006 10:37:15 +0000 (10:37 +0000)]
Renamed `host' and `port' to `global_host' and `global_port' to distinguish between the global and the local variables.
Improved the config function: Set `global_host' to NULL if not configured and copy the value otherwise. Don't use a static variable within the config routine and reference to it..
octo [Sat, 20 May 2006 10:27:04 +0000 (10:27 +0000)]
Rearranged the functions in the `apcups' plugin.
octo [Sat, 20 May 2006 10:23:48 +0000 (10:23 +0000)]
Simplified the `submit' and `write' functions of the `apcups' plugin. Also changed the DS definitions.
octo [Sat, 20 May 2006 09:32:08 +0000 (09:32 +0000)]
Changed the network code to use `getaddrinfo' rather than the old style name resolution.
octo [Sat, 20 May 2006 08:51:13 +0000 (08:51 +0000)]
branches/apcups/src/apcups.c:
Restored changes made to the trunk.
anthony [Fri, 19 May 2006 13:46:16 +0000 (13:46 +0000)]
1. (major) The code in apcups.c was adapted from apcupsd-3.12.3 the command
'apcaccess status'. The code I used calls 'exit()' if it cannot connect
to the apcupsd daemon. A reasonable action for a standalone program.
Not good for a monitoring daemon. This was completely an oversight on my part.
2. (minor) Some dead code is now defined out if APCMAIN is not defined.
3. (minor) My units in collection.cgi where incorrect.
4. (minor) if the apcups plugin cannot connect to the apcupsd it will
simply not call the submit routines allowing the rrd files to fill with NAN
as expected, rather than submitting zeros.
octo [Fri, 19 May 2006 12:17:57 +0000 (12:17 +0000)]
Copied trunk to `branches/apcups'
octo [Fri, 19 May 2006 12:15:10 +0000 (12:15 +0000)]
Fixed miscellaneous small stuff..
octo [Fri, 19 May 2006 12:14:12 +0000 (12:14 +0000)]
Cleaned up the apcups plugin some more..
octo [Fri, 19 May 2006 08:30:35 +0000 (08:30 +0000)]
apcups.c:
- Improved the `do_pthreads_status' function to not have the same code 10 times (or so).
octo [Fri, 19 May 2006 07:23:38 +0000 (07:23 +0000)]
src/apcups.c:
- Fixed more indentation.
- Made internal-only functions static.
octo [Fri, 19 May 2006 06:16:07 +0000 (06:16 +0000)]
Added the apcups plugin to the build system.
Removed the av?snprintf-auxiliary-functions from the apcups-plugin.
`fixed' indentation in the apcups-plugin (not done yet).
octo [Thu, 18 May 2006 20:32:05 +0000 (20:32 +0000)]
Added `apcups.c' by Anthony Gialluca <tonyabg at charter.net>
octo [Sun, 14 May 2006 14:43:05 +0000 (14:43 +0000)]
Merged stuff from branches/collectd-3.9: After release 3.9.2 the ChangeLog additions were not copied..
tokkee [Thu, 11 May 2006 16:15:15 +0000 (16:15 +0000)]
Renamed threads to vs_threads in collection.cgi (should have already been done
in r532 :-/ ).
octo [Wed, 10 May 2006 20:06:08 +0000 (20:06 +0000)]
octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.8
octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.9
octo [Wed, 10 May 2006 20:04:05 +0000 (20:04 +0000)]
octo@leeloo:~/collectd $ svn cp tags/collectd-3.9.2 branches/collectd-3.9
octo@leeloo:~/collectd $ svn cp tags/collectd-3.8.5 branches/collectd-3.8
octo [Tue, 9 May 2006 09:14:10 +0000 (09:14 +0000)]
octo@huhu:~/collectd $ svn merge -r717:718 trunk tags/collectd-3.9.2
octo [Tue, 9 May 2006 09:13:49 +0000 (09:13 +0000)]
Bumped version to 3.9.2
octo [Tue, 9 May 2006 09:09:31 +0000 (09:09 +0000)]
Merged changelog entries from versions 3.8.5 and 3.9.1
octo [Tue, 9 May 2006 06:22:33 +0000 (06:22 +0000)]
Fixed the nasty bug in the ping plugin: The sequence wasn't checked correctly. Argh.
octo [Mon, 8 May 2006 15:11:27 +0000 (15:11 +0000)]
Removed `trunk/src/libping/', since it's obsolete.
octo [Sun, 7 May 2006 18:04:32 +0000 (18:04 +0000)]
Updated ChangeLog; also added version 3.9.1
octo [Sun, 7 May 2006 18:01:22 +0000 (18:01 +0000)]
Added a config option to the traffic plugin to ignore certain interfaces. Thanks to Sune Marcher for the patch.
octo [Fri, 28 Apr 2006 17:56:23 +0000 (17:56 +0000)]
Changed the build system to
- only check for libkvm and libdevstat if libstatgrab is installed
- only link against the above libraries if libstatgrab is present.
octo [Fri, 28 Apr 2006 17:18:03 +0000 (17:18 +0000)]
Corrected/removed fixme-note.
octo [Fri, 28 Apr 2006 16:21:19 +0000 (16:21 +0000)]
A first port of the `swap' plugin to Mach/Mac OS X
octo [Thu, 27 Apr 2006 20:52:32 +0000 (20:52 +0000)]
Applied patch by Peter Holik to work with arbitary length device names (when using the `KERNEL_LINUX' read method).
octo [Wed, 26 Apr 2006 09:37:47 +0000 (09:37 +0000)]
Added `package' and `errors' counter for libkstat to the `traffic' plugin.
octo [Wed, 26 Apr 2006 08:48:35 +0000 (08:48 +0000)]
Changed the fixed heartbeat of `25' with the string `HEARTBEAT' in trunk/src/collectd.pod
octo [Wed, 26 Apr 2006 08:44:00 +0000 (08:44 +0000)]
Renamed the new RRD files: Move the files in a subdirectory when a new major version is about to be released. For now, don't do it to be more consistent..
octo [Wed, 26 Apr 2006 08:42:56 +0000 (08:42 +0000)]
Added the RRD files `if_packets' and `if_errors' to `collectd(1)'.
octo [Wed, 26 Apr 2006 08:38:54 +0000 (08:38 +0000)]
Added the RRD files of the `wireless' plugin to `collectd(1)'
octo [Wed, 26 Apr 2006 08:35:56 +0000 (08:35 +0000)]
Added RRD file of the `cpufreq' plugin to `collectd(1)'
octo [Wed, 26 Apr 2006 08:34:05 +0000 (08:34 +0000)]
Added the RRD files of the `apple_sensors' plugin to `collectd(1)'
octo [Wed, 26 Apr 2006 08:31:38 +0000 (08:31 +0000)]
Added RRD files of the `apache' plugin to `collectd(1)'
octo [Wed, 26 Apr 2006 08:09:55 +0000 (08:09 +0000)]
Changed the `traffic' plugin to generate `packets' and `errors' statistics, too.