Merge branch 'collectd-3.11' into merge/collectd-4
Conflicts:
configure.in
src/processes.c
Conflicts:
configure.in
src/processes.c
README: Updated the informatioin about plugins and prerequisites.
dns plugin: Only include and build with `utils_dns.c' if it's actually used.
configure.in: Don't link all objects with `libkstat' and `libdevinfo'.
configure.in: Bump to 3.11.1; Improve the detection of `netinet/udp.h'.
ChangeLog: Added changes for version 3.11.1.
traffic pluxin: Remove unnecessary `strcpy'.
Merge branch 'pull/collectd-3.11' into collectd-3.11
src/utils_mount.c: Fix defines so `cu_mount_getlist' works under Solaris.
Merge branch 'sh/freebsd'
17 years agosrc/utils_dns.c: Fix the handling of the `struct udphdr' under the GNU libc and other...
src/utils_dns.c: Fix the handling of the `struct udphdr' under the GNU libc and other systems.
processes.c, utils_dns.c: Fix compile errors on GNU/kFreeBSD.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Merge branch 'pull/uni' into collectd-4
tape plugin: Converted to the new plugin interface.
serial plugin: Converted to the new plugin interface.
multimeter plugin: Converted to the new plugin interface.
hddtemp plugin: Converted to the new plugin interface.
mbmon plugin: Correct the `type's being passed to the dispatch function.
mbmon plugin: Converted to the new plugin interface.
mysql plugin: Converted to the new plugin interface.
{apcups,battery} plugin: Changes the voltage DS as for the sensors plugin.
sensors plugin: Change the DS of `voltage' to be named `value' as for other physical data-sets.
plugin interface: If an init-function fails, write an error to syslog and remove the read function.
wireless plugin: Converted to the new plugin interface.
dns plugin: Converted to the new plugin interface.
swap plugin: Converted to the new plugin interface.
ntpd plugin: Converted to the new plugin interface.
unixsock plugin: Finally fixed the `pthread_t'-initialization to be platform independant.
unixsock plugin: Fix the initialization of the pthread variable under Mac OS X.
processes plugin: Converted to the new plugin interface.
A first version anyways.
A first version anyways.
Merge branch 'pull/collectd-4'
cpu plugin: Remove newline from syslog message.
src/plugin.c: Implemented delaying of read-functions that fail.
The usual quadratic increase of delay-intervals is being used to disable the
function for up to 24 hours.
The usual quadratic increase of delay-intervals is being used to disable the
function for up to 24 hours.
cpufreq plugin: Converted to the new plugin interface.
src/plugin.[ch]: Provide unregister-functions for plugins to remove certain functions.
disk plugin: Converted to the new plugin interface.
battery plugin: Converted to the new plugin interface.
df plugin: Converted to the new plugin interface.
unixsock plugin: Make created threads to be `detached'.
cpu plugin: Write each CPU-counter in a seperate RRD-file.
This has proven to be a lot more flexible. And if we're to add `interrupt' and
`soft interrupt' counters anyway, we might as well change it to this superior
layout.
This has proven to be a lot more flexible. And if we're to add `interrupt' and
`soft interrupt' counters anyway, we might as well change it to this superior
layout.
unixsock plugin, collectd-nagios: Use the hostname, too, to identify values.
This is, of course, necessary, because many hosts may submit their values.
This is, of course, necessary, because many hosts may submit their values.
collectd-nagios: Added an option to select certain DSes and updated the usage.
collectd-nagios: Added a small program to perform Nagios-compatible checks on values.
unixsock plugin: Transmit the DS name so clients can chose which values they need.
Merge branch 'collectd-4' into ff/unixsock
cpu plugin: Fix a bug in the data-set description.
unixsock plugin: Added a first version of a UNIX-socket output plugin.
The goal is to build a nagios-interface on top of this.
The goal is to build a nagios-interface on top of this.
Merge branch 'pull/collectd-4'
apple_sensors plugin: Converted to the new plugin interface.
cpu plugin: Improved some syslog messages.
Also updated the copyright notice.
Also updated the copyright notice.
nfs plugin: Fixes to work under !Linux.
traffic plugin: Fix the plugin to work under Mac OS X.
csv plugin: Fixed the initialization of `struct flock' to be portable.
It didn't work on Mac OS X for example.
It didn't work on Mac OS X for example.
Merge branch 'ff/entropy' into collectd-4
traffic plugin: Updated copyright notice.
sensors plugin: Fixed some syntactic errors.
17 years agosensors plugin: Improved the data sources, changed the license and updated the copyri...
sensors plugin: Improved the data sources, changed the license and updated the copyright notice.
apcups plugin: Converted to the new plugin interface.
src/collectd.h: Include `math.h' and try to force it to define `NAN'.
entropy plugin: Added a plugin to collect available entropy.
Only works on Linux systems right now..
Only works on Linux systems right now..
ping plugin: Converted to the new plugin interface.
memory plugin: Converted to the new plugin interface.
network plugin: Use a global buffer and fill it as much as possible.
This should lessen network load, hopefully.
This should lessen network load, hopefully.
src/common.c: Removed `log_update_file' and `log_create_file'.
Also changed the license to GPLv2-only and updated the copyright date.
Also changed the license to GPLv2-only and updated the copyright date.
csv plugin: Added this plugin which writes to CSV files.
This is basically the old `logfile' functionality.
This is basically the old `logfile' functionality.
collectd.spec: Updated for version 3.11
Never received any feedback from you and every release still contains a spec
file that is out of date... here is the spec file updated to build ok on fedora
core 3-6.
Never received any feedback from you and every release still contains a spec
file that is out of date... here is the spec file updated to build ok on fedora
core 3-6.
cpu plugin: Converted to the new plugin interface.
src/collectd.conf.in: Added the rrdtool plugin and configuration examples.
load, traffic plugins: Changed license to GPLv2 only.
apache plugin: Converted to the new plugin interface.
Merge branch 'master' into collectd-4
Conflicts:
src/sensors.c
Conflicts:
src/sensors.c
17 years agoMerge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...
Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugins-ng
sensors plugin: Converted to the new plugin interface.
17 years agosrc/plugin.[ch]: Store the hostname in a global variable to minimize calls to `gethos...
src/plugin.[ch]: Store the hostname in a global variable to minimize calls to `gethostname'.
src/plugin.h: Added `VALUE_LIST_INIT', a static initializer for value_list_t.
nfs plugin: Ported to the new plugin structure.
network plugin: Don't case an int to a void*, because some systems don't like it..
collectd.conf(5): Documented the option of the rrdtool-plugin.
rrdtool plugin: Implemented caching of values to minimize IO operations.
Use the `CacheTimeout' option to enable this feature.
Use the `CacheTimeout' option to enable this feature.
src/utils_llist.[ch]: Implemented `llist_remove'.
traffic plugin: Converted the plugin to the new plugin ifrastructure.
network plugin: Fix many bugs, especially `hton*' and `ntoh*' related.
load plugin: Set the hostname to something meaningfull, not `localhost'.
rrdtool plugin: Use the time supplied by the value list, not `N'.
src/plugin.[ch]: Include the time in the value list.
This is necessary when we will implement caching in the future.
This is necessary when we will implement caching in the future.
src/Makefile.am: Link the network plugin against pthread.
Merge branch 'master' into ff/plugins-ng
Conflicts:
src/collectd.c
src/network.c
Conflicts:
src/collectd.c
src/network.c
src/{dns,ntpd}.c: Use <poll.h> rather than <sys/poll.h>.
src/{collectd,plugin}.[ch]: Changed license to GPLv2 only.
src/configfile.c: Removed `cf_callback_socket'
.. since the network stuff is now implemented as a plugin.
.. since the network stuff is now implemented as a plugin.
network plugin: Changed the old network code to work as a plugin.
It's mostly untested, but basic sending appears to work fine.
It's mostly untested, but basic sending appears to work fine.
rrdtool plugin: Fixed misc. bugs and changed license to GPLv2 only.
common.c: Implemented `ntohll' and `htonll'.
email plugin: Ignore size if it less than or equal to zero.
Some daemons (e.g. postgrey) don't provide any size information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Some daemons (e.g. postgrey) don't provide any size information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
sensors plugin: Avoid assertion in ignorelist_match () when not configured.
If the sensors plugin is not configured (i.e. default settings are used) the
ignorelist (sensors_list) is never created causing the assertion in
ignorelist_match () to fail. This fixes it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
If the sensors plugin is not configured (i.e. default settings are used) the
ignorelist (sensors_list) is never created causing the assertion in
ignorelist_match () to fail. This fixes it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Bumped version to 3.11.0; Updated ChangeLog.
src/collectd.h: Don't mess with the syslog-stuff if it's present.
No idea where it came from, but it's not necessary, thus remove it. This even
resolves a conflice with some newer glibc version.
No idea where it came from, but it's not necessary, thus remove it. This even
resolves a conflice with some newer glibc version.
AUTHORS: Converted to UTF-8 and added Lubos' efforts.
Added the `mbmon' plugin to the ChangeLog for 3.11.0
.. and Flavio Stanchina to the list of contributors.
.. and Flavio Stanchina to the list of contributors.
Merge branch 'fs/mbmon'