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: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 [Sat, 27 May 2006 11:25:55 +0000 (11:25 +0000)]
hddtemp.c: Don't try other sockets if one could be opened..
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.
octo [Tue, 25 Apr 2006 12:46:47 +0000 (12:46 +0000)]
Added information about the new `cacert' option in the `apache' plugin to `collectd.conf(5)'.
octo [Tue, 25 Apr 2006 12:35:22 +0000 (12:35 +0000)]
Added the config option `cacert' to the `apache' plugin. This allows to specify a file holding the CA Certificate. This is needed for connecting to SSL hosts that use self-signed certificates.
octo [Sat, 22 Apr 2006 10:11:01 +0000 (10:11 +0000)]
Added `contrib/README'
octo [Sat, 22 Apr 2006 09:38:55 +0000 (09:38 +0000)]
Added `contrib/add_rra.sh' which allows to add an very detailed RRA to old RRD files.
octo [Fri, 21 Apr 2006 16:56:21 +0000 (16:56 +0000)]
Added note about the `ping' plugin fix to the ChangeLog.
octo [Fri, 21 Apr 2006 15:39:14 +0000 (15:39 +0000)]
Bumped version to 3.9.1
Added ChangeLog-entries
octo [Fri, 21 Apr 2006 15:28:38 +0000 (15:28 +0000)]
octo@huhu:~/collectd $ svn merge -r657:658 trunk tags/collectd-3.9.1
octo [Fri, 21 Apr 2006 15:27:54 +0000 (15:27 +0000)]
Link liboping with `libsocket' if it's needed for `socket' to work.
octo [Fri, 21 Apr 2006 15:21:47 +0000 (15:21 +0000)]
octo@huhu:~/collectd $ svn merge -r652:656 trunk tags/collectd-3.9.1
octo [Fri, 21 Apr 2006 14:50:35 +0000 (14:50 +0000)]
Fix this (need to cast void-pointer to function-pointer to make Sun-cc happy):
"plugin.c", line 132: warning: assignment type mismatch:
pointer to function(void) returning void "=" pointer to void
octo [Fri, 21 Apr 2006 14:41:15 +0000 (14:41 +0000)]
Fix this (a pointer was compared with an integer):
"common.c", line 525: warning: improper pointer/integer combination: op ">"
octo [Fri, 21 Apr 2006 14:40:18 +0000 (14:40 +0000)]
Corrected inclusion of `sys/swap.h'.
Define `HAVE_LIBKSTAT' again if it's present..
octo [Fri, 21 Apr 2006 14:28:23 +0000 (14:28 +0000)]
Only link against libraries that are needed. E.g., don't link evey plugin to `libkstat' but only those who actually use it.
octo [Fri, 21 Apr 2006 07:52:42 +0000 (07:52 +0000)]
octo@crystal:~/Projects/collectd $ svn merge -r646:651 trunk tags/collectd-3.9.1
octo [Fri, 21 Apr 2006 07:37:45 +0000 (07:37 +0000)]
Cast pointer arithmetics to make weird gcc versions happy.
octo [Fri, 21 Apr 2006 07:35:19 +0000 (07:35 +0000)]
Fix this:
hddtemp.c: In function `hddtemp_init':
hddtemp.c:349: warning: unsigned int format, different type arg (arg 3)
octo [Fri, 21 Apr 2006 07:33:37 +0000 (07:33 +0000)]
Check for `nanosleep'. If not found, look for `librt'. Abort if `nanosleep' is missing.
This is needed on Solaris, apparently..
octo [Fri, 21 Apr 2006 07:20:53 +0000 (07:20 +0000)]
Fix for this:
collectd.c: In function `pidfile_create':
collectd.c:259: warning: int format, pid_t arg (arg 3)
octo [Fri, 21 Apr 2006 07:19:06 +0000 (07:19 +0000)]
Disabled all `kstat' code in the nfs plugin. This failed builds on Solaris..
octo [Fri, 21 Apr 2006 07:13:49 +0000 (07:13 +0000)]
Merged revision 6.4.5 from `trunk' to `tags/collectd-3.9.1'
octo [Fri, 21 Apr 2006 07:12:47 +0000 (07:12 +0000)]
Corrected the define's in the apache plugin so it'll build without libcurl.
octo [Fri, 21 Apr 2006 07:05:39 +0000 (07:05 +0000)]
Merged revisions 640 and 642 from `trunk' to `tags/collectd-3.9.1'
octo [Fri, 21 Apr 2006 06:47:17 +0000 (06:47 +0000)]
Simple fix for the swap plugin. This needs to go into 3.9.1
octo [Fri, 21 Apr 2006 06:46:49 +0000 (06:46 +0000)]
Only include `dict_get_double' when using IOKit or CoreFoundation. This caused a build on Linux to fail before..
octo [Wed, 19 Apr 2006 12:40:06 +0000 (12:40 +0000)]
Set object options to the default values, when creating the object. This may have failed the `ping' plugins initialization..
octo [Tue, 18 Apr 2006 07:12:36 +0000 (07:12 +0000)]
Merged addition to ChangeLog back from tags/collectd-3.9.0
octo [Tue, 18 Apr 2006 07:11:46 +0000 (07:11 +0000)]
Added note about `apple_sensors' to the ChangeLog
octo [Mon, 17 Apr 2006 09:19:22 +0000 (09:19 +0000)]
Moved error-message reporting closer to the system-calls in `ping_host_add'.
Small fix to give the correct socktype arg to `socket'.
octo [Mon, 17 Apr 2006 08:51:44 +0000 (08:51 +0000)]
The `ping' plugin now reports which error occured. The string is not neccessarily useful, we just use what `liboping' gives us..
octo [Mon, 17 Apr 2006 08:51:03 +0000 (08:51 +0000)]
Added reporting of errors:
- ping_set_error
- ping_get_error
octo [Mon, 17 Apr 2006 08:18:53 +0000 (08:18 +0000)]
Moved the actual struct-definition from the header file to the .c-file. This way the definition is not visible to the user and he cannot access the fields..
octo [Sun, 16 Apr 2006 16:23:35 +0000 (16:23 +0000)]
Added notes of ports of the `disk' and `battery' plugins to Darwin to the ChangeLog.
octo [Sun, 16 Apr 2006 16:18:07 +0000 (16:18 +0000)]
Fix for subdirectories in host directories..
octo [Sun, 16 Apr 2006 13:59:41 +0000 (13:59 +0000)]
Added `temperature' and `fanspeed' to `collection.cgi'. This is needed for the
`apple_sensors' plugin.
octo [Sun, 16 Apr 2006 13:57:14 +0000 (13:57 +0000)]
Battery charge, current and voltage work now with my PB.