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.
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.
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).
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).
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.
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.
apcups branch: Renamed the temperature-DS to `value' to work with existing plugins.
apcups branch: Fixed some minor issues with the apcups plugin. It's working now.
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.
- 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.
1. Was erroneously using tokptr vice key.
2. Changed calls to strcmp to strncmp so that
only definate ranges where being compared.
2. Changed calls to strcmp to strncmp so that
only definate ranges where being compared.
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'.
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'.
Changed the apcups plugin to keep the socket open.
Define the `APCMAIN' define in any way. Set it to zero if building as a plugin (default).
apcups.c: Closed run-away comment. Sorry.
Removed all the conflicts from the apcups-plugin again.
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.
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.
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..
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..
Rearranged the functions in the `apcups' plugin.
Simplified the `submit' and `write' functions of the `apcups' plugin. Also changed the DS definitions.
18 years agoChanged the network code to use `getaddrinfo' rather than the old style name resolution.
Changed the network code to use `getaddrinfo' rather than the old style name resolution.
branches/apcups/src/apcups.c:
Restored changes made to the trunk.
Restored changes made to the trunk.
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.
'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.
Copied trunk to `branches/apcups'
Fixed miscellaneous small stuff..
Cleaned up the apcups plugin some more..
apcups.c:
- Improved the `do_pthreads_status' function to not have the same code 10 times (or so).
- Improved the `do_pthreads_status' function to not have the same code 10 times (or so).
src/apcups.c:
- Fixed more indentation.
- Made internal-only functions static.
- Fixed more indentation.
- Made internal-only functions static.
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).
Removed the av?snprintf-auxiliary-functions from the apcups-plugin.
`fixed' indentation in the apcups-plugin (not done yet).
Added `apcups.c' by Anthony Gialluca <tonyabg at charter.net>
Merged stuff from branches/collectd-3.9: After release 3.9.2 the ChangeLog additions were not copied..
Renamed threads to vs_threads in collection.cgi (should have already been done
in r532 :-/ ).
in r532 :-/ ).
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@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.9
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@leeloo:~/collectd $ svn cp tags/collectd-3.8.5 branches/collectd-3.8
octo@huhu:~/collectd $ svn merge -r717:718 trunk tags/collectd-3.9.2
Bumped version to 3.9.2
Merged changelog entries from versions 3.8.5 and 3.9.1
Fixed the nasty bug in the ping plugin: The sequence wasn't checked correctly. Argh.
Removed `trunk/src/libping/', since it's obsolete.
Updated ChangeLog; also added version 3.9.1
Added a config option to the traffic plugin to ignore certain interfaces. Thanks to Sune Marcher for the patch.
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.
- only check for libkvm and libdevstat if libstatgrab is installed
- only link against the above libraries if libstatgrab is present.
Corrected/removed fixme-note.
A first port of the `swap' plugin to Mach/Mac OS X
Applied patch by Peter Holik to work with arbitary length device names (when using the `KERNEL_LINUX' read method).
Added `package' and `errors' counter for libkstat to the `traffic' plugin.
Changed the fixed heartbeat of `25' with the string `HEARTBEAT' in trunk/src/collectd.pod
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..
Added the RRD files `if_packets' and `if_errors' to `collectd(1)'.
Added the RRD files of the `wireless' plugin to `collectd(1)'
Added RRD file of the `cpufreq' plugin to `collectd(1)'
Added the RRD files of the `apple_sensors' plugin to `collectd(1)'
Added RRD files of the `apache' plugin to `collectd(1)'
Changed the `traffic' plugin to generate `packets' and `errors' statistics, too.
Added information about the new `cacert' option in the `apache' plugin to `collectd.conf(5)'.
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.
Added `contrib/README'
Added `contrib/add_rra.sh' which allows to add an very detailed RRA to old RRD files.
Added note about the `ping' plugin fix to the ChangeLog.
Bumped version to 3.9.1
Added ChangeLog-entries
Added ChangeLog-entries
octo@huhu:~/collectd $ svn merge -r657:658 trunk tags/collectd-3.9.1
Link liboping with `libsocket' if it's needed for `socket' to work.
octo@huhu:~/collectd $ svn merge -r652:656 trunk tags/collectd-3.9.1
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
"plugin.c", line 132: warning: assignment type mismatch:
pointer to function(void) returning void "=" pointer to void
Fix this (a pointer was compared with an integer):
"common.c", line 525: warning: improper pointer/integer combination: op ">"
"common.c", line 525: warning: improper pointer/integer combination: op ">"
Corrected inclusion of `sys/swap.h'.
Define `HAVE_LIBKSTAT' again if it's present..
Define `HAVE_LIBKSTAT' again if it's present..
18 years agoOnly link against libraries that are needed. E.g., don't link evey plugin to `libksta...
Only link against libraries that are needed. E.g., don't link evey plugin to `libkstat' but only those who actually use it.
octo@crystal:~/Projects/collectd $ svn merge -r646:651 trunk tags/collectd-3.9.1
Cast pointer arithmetics to make weird gcc versions happy.
Fix this:
hddtemp.c: In function `hddtemp_init':
hddtemp.c:349: warning: unsigned int format, different type arg (arg 3)
hddtemp.c: In function `hddtemp_init':
hddtemp.c:349: warning: unsigned int format, different type arg (arg 3)
Check for `nanosleep'. If not found, look for `librt'. Abort if `nanosleep' is missing.
This is needed on Solaris, apparently..
This is needed on Solaris, apparently..
Fix for this:
collectd.c: In function `pidfile_create':
collectd.c:259: warning: int format, pid_t arg (arg 3)
collectd.c: In function `pidfile_create':
collectd.c:259: warning: int format, pid_t arg (arg 3)
Disabled all `kstat' code in the nfs plugin. This failed builds on Solaris..
Merged revision 6.4.5 from `trunk' to `tags/collectd-3.9.1'
Corrected the define's in the apache plugin so it'll build without libcurl.
Merged revisions 640 and 642 from `trunk' to `tags/collectd-3.9.1'
Simple fix for the swap plugin. This needs to go into 3.9.1
Only include `dict_get_double' when using IOKit or CoreFoundation. This caused a build on Linux to fail before..
Set object options to the default values, when creating the object. This may have failed the `ping' plugins initialization..
Merged addition to ChangeLog back from tags/collectd-3.9.0
Added note about `apple_sensors' to the ChangeLog
Moved error-message reporting closer to the system-calls in `ping_host_add'.
Small fix to give the correct socktype arg to `socket'.
Small fix to give the correct socktype arg to `socket'.
The `ping' plugin now reports which error occured. The string is not neccessarily useful, we just use what `liboping' gives us..
Added reporting of errors:
- ping_set_error
- ping_get_error
- ping_set_error
- ping_get_error
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..
Added notes of ports of the `disk' and `battery' plugins to Darwin to the ChangeLog.
Fix for subdirectories in host directories..
Added `temperature' and `fanspeed' to `collection.cgi'. This is needed for the
`apple_sensors' plugin.
`apple_sensors' plugin.
Battery charge, current and voltage work now with my PB.
Removed useless crap that I forgot to delete..
First version of a (hopefully) working battery plugin for darwin.
Fixed bugs in the Darwin code of the `disk' plugin. It mostly works now.
Link the `disk' plugin against `IOKitLib' when available..
18 years agoAdded code to find major/minor numbers of disks. Partition statistics are not availab...
Added code to find major/minor numbers of disks. Partition statistics are not available though :/
Ported the `disk' plugin to Darwin. It's not complete yet, search for `FIXME's.
The defines in the `disk' plugin have been brought to the `state of the art'.. ;)
Implemented step-back for the cpu-plugin, mach part when trying to read temperature..
Update of the specfile. It works with FC1
Updated the Debian changelog
Added missing modules to the manpage.
Added some more `IOHWSensor' types..
Changed all occurences of `verplant.org/collectd/' to `http://collectd.org/'
Changed version to `3.9.0'
Updated the information in the README