Merge branch 'pull/collectd-4.1' into collectd-4.1
snmp plugin: Improved the error messages in the init code.
snmp plugin: Fix a segfault when a host times out but more data should be queried.
snmp plugin: Handle `ASN_TIMETICKS' as `counter' if it's known by the SNMP library.
Merge branch 'collectd-4.0' into collectd-4.1
perl plugin: Fixed a possible buffer overflow in get_module_name().
A '\0' might have been written above the buffer array bounds.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
A '\0' might have been written above the buffer array bounds.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'pull/collectd-4.1' into collectd-4.1
build system: Fix detection of libraries when giving a directory.
Merge branch 'pull/collectd-4.1' into collectd-4.1
build system: Fixed the improved detection of the Net-SNMP library.
build system: Improve the detection of the Net-SNMP library.
netlink plugin: Don't fail if `IFLA_STATS' doesn't exist for an interface.
Hopefully this fixes problems on my WRT ;)
Hopefully this fixes problems on my WRT ;)
Merge branch 'collectd-4.0' into collectd-4.1
Merge branch 'collectd-3.11' into collectd-4.0
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
apcups plugin: Warn about the irritating name `apcups_charge_pct'.
netlink plugin: Fix build issues under Debian Sarge
or generally older Linux versions.
or generally older Linux versions.
Merge branch 'ff/apcups' into collectd-4.0
Bumped the version to 4.1.1
build system: Fix yet another issue with the detection of libupsclient.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
Conflicts:
ChangeLog
apcups plugin: Fix reporting of the `load percent' data.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
contrib/PerlLib/Collectd.pm
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
contrib/PerlLib/Collectd.pm
nothing added to commit but untracked files present (use "git add" to track)
contrib/PerlLib/Collectd.pm: Bumbed the version to 4.0.8.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
configure.in
Conflicts:
ChangeLog
configure.in
Bumped version to 4.0.8; updated ChangeLog.
plugin.c: Print lt_dlopen() error messages to STDERR as well.
This makes sure the user will get the message on the terminal in any case.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This makes sure the user will get the message on the terminal in any case.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Removed some legacy calls to DEBUG().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
rrdtool plugin: Use `-b' (begin) when creating rrd-files.
When receiving data from a host that has a clock that lacks behind the servers
clock, the newly created rrd-files had a timestamp that was ten seconds in the
past from the server's point of view. If the client was, for example, 10:00
minutes late, there would therefore be 9:50 minutes of invalid data which cause
warnings, empty graphs and overall missery. This commit changes this behavior
to not use the default `begin' time but set it explicitely based on the
client's time.
When receiving data from a host that has a clock that lacks behind the servers
clock, the newly created rrd-files had a timestamp that was ten seconds in the
past from the server's point of view. If the client was, for example, 10:00
minutes late, there would therefore be 9:50 minutes of invalid data which cause
warnings, empty graphs and overall missery. This commit changes this behavior
to not use the default `begin' time but set it explicitely based on the
client's time.
Merge branch 'collectd-4.0' into collectd-4.1
ChangeLog: Documented the fix in the apcups plugin.
Merge branch 'uni/collectd-4.1' into collectd-4.1
Merge branch 'uni/collectd-4.0' into collectd-4.0
apcups plugin: Fix the types used in the plugin.
They still had an `apcups_' prefix which isn't legal anymore.
They still had an `apcups_' prefix which isn't legal anymore.
collectd: Make `mkdir' error messages more identifiable.
netlink plugin: Fix an error-message.
ChangeLog: Documented the changes since 4.1.0.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
Conflicts:
ChangeLog
ChangeLog: Fix a merge bug.
ChangeLog: Added a note about the improved `sstrerror' function.
contrib/collection.cgi: Fix a bug in the `meta_graph_generic_stack' function.
Also add a meta-graph-handler for if_[rt]x_errors.
Also add a meta-graph-handler for if_[rt]x_errors.
Merge branch 'pull/collectd-4.1' into collectd-4.1
build system: Include <adm/types.h> when checking for `libnetlink.h'.
netlink plugin: Use the defines to determine where the `libnetlink.h' is.
build system: Check for libnetlink.h in more than one directory.
And some minor cleanups..
And some minor cleanups..
build system: Some cosmetic fixes for the libupsclient.
Merge branch 'collectd-4.0' into collectd-4.1
Merge branch 'pull/collectd-4.0' into collectd-4.0
src/plugin.c: plugin_dispatch_values: Include the interval in the debugging output.
exec plugin: Set the real group, effective group, and real and effective user.
In that order. The manpage and the config template have been updated.
In that order. The manpage and the config template have been updated.
exec plugin: Call `setgid' first so argitary groups can be configured.
sstrerror: Be even more cautios with the return value of `strerror_r'..
I don't trust this GNU implementation one bit.. ;)
I don't trust this GNU implementation one bit.. ;)
contrib/collection.cgi: Display MySQL traffic as bits/s, not bytes/s.
Merge branch 'collectd-4.0' into collectd-4.1
contrib/collection.cgi: Added meta graph handlers for nfs_procedure, ps_state, swap, mysql_commands, and mysql_handler.
src/common.c: Copy the error-string to the buffer - no matter which implementation is used.
ChangeLog: Fix a typo.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
contrib/collection.cgi
Conflicts:
contrib/collection.cgi
README: Added libnetlink, libnetsnmp and libxmms prerequisites.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
contrib/collection.cgi: Don't show all the plugins on the host's page.
Waiting for so many graphs to load is no fun. You _have_ to specify the plugins
you're interested in now.
Waiting for so many graphs to load is no fun. You _have_ to specify the plugins
you're interested in now.
contrib/collection.cgi: Quite some changes, but still incomplete and not very usable..
Merge branch 'pull/collectd-4.0' into collectd-4.0
Added the AC_FUNC_STRERROR_R check.
Even though Posix requires "strerror_r" to return an "int", some systems
(e.g. the GNU libc) return a "char *" _and_ ignore the second argument.
sstrerror() (in src/common.c) has been changed to be aware of this and
handle both cases correctly.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Even though Posix requires "strerror_r" to return an "int", some systems
(e.g. the GNU libc) return a "char *" _and_ ignore the second argument.
sstrerror() (in src/common.c) has been changed to be aware of this and
handle both cases correctly.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Added "snmp" and "xmms" plugins to README and src/collectd.conf.in.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoChangeLog: Added a note about the queueing changes to the rrdtool plugin. collectd-4.1.0
ChangeLog: Added a note about the queueing changes to the rrdtool plugin.
collectd(1): Add some references to collectd-snmp(5).
collectd.conf(5): Add some more references to collectd-snmp(5).
Bumped version to 4.1.0; Updated ChangeLog.
collectd-snmp(5): Update the documentation.
Merge branch 'collectd-4.0'
Merge branch 'pull/master'
Merge branch 'pull/master'
contrib/collection.cgi: Quite some changes, but still incomplete and not very usable..
src/plugin.c: Remove a legacy debug message.
netlink plugin: Removed unused code.
ChangeLog, README: Added the netlink plugin.
build system: Fix linking with the libnetlib library.
netlink plugin: Fix several issues, including the collection of classes and filters.
When requesting qdiscs for ifindex == 0 you get the qdiscs of all interfaces.
The same doesn't work for classes and filters.
This commit changes the behavior to iterate over a list of interfaces and
request qdiscs, classes and filters for each interface seperately. The
ignorelist is checked before sending a request to avoid unnecessary requests.
Newlines have been removed from error messages.
When requesting qdiscs for ifindex == 0 you get the qdiscs of all interfaces.
The same doesn't work for classes and filters.
This commit changes the behavior to iterate over a list of interfaces and
request qdiscs, classes and filters for each interface seperately. The
ignorelist is checked before sending a request to avoid unnecessary requests.
Newlines have been removed from error messages.
build system: Correct the detection of Mac OS X.
Merge branch 'pull/master'
build system: Skip a lot of Mac OS X only header checks when not on Mac OS X.
build system: Improve detection of the libnetlink library.
Merge branch 'collectd-4.0'
collectd.conf(5): Undo the changes of the previous merge.
This problem doesn't exist in this version.
This problem doesn't exist in this version.
Merge branch 'collectd-3.11' into collectd-4.0
Conflicts:
ChangeLog
configure.in
Conflicts:
ChangeLog
configure.in
Bumped version to 3.11.6; Updated ChangeLog.
netlink plugin: Yet another fix. `if_dropped' was getting bytes..
netlink plugin: Fix the submitted values.
configure.in: Display wether the netlink library was found or not.
src/types.db: Added the new types introduced by the netlink plugin.
collectd.conf(5): Added informatioin about the netlink plugin.
src/collectd.conf.in has been updated, too.
src/collectd.conf.in has been updated, too.
netlink plugin: Use the parent's classid for `filter'.
Also added the remaining statistics for `VerboseInterface'.
Also added the remaining statistics for `VerboseInterface'.
netlink plugin: Added a plugin for (very) enhanced Linux traffic statistics.
This plugin uses the netlink sockets provided by Linux 2.2 and later to get
information about the links, qdiscs, classes, and filters in the network stack
of a Linux system. With this plugin it's possible to get some _very_ detailed
statistics.
Still to do: Update the `types.db', `collectd.conf(5)', and `configure.conf.in'.
This plugin uses the netlink sockets provided by Linux 2.2 and later to get
information about the links, qdiscs, classes, and filters in the network stack
of a Linux system. With this plugin it's possible to get some _very_ detailed
statistics.
Still to do: Update the `types.db', `collectd.conf(5)', and `configure.conf.in'.
utils_cmd_putval.c: Fixed a copy&paste error.
"unixsock plugin" is supposed to be "cmd putval".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
"unixsock plugin" is supposed to be "cmd putval".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
src/Makefile.am: Added utils_cmd_putval to exec_la_SOURCES.
Without this, utils_cmd_putval will not be linked into the exec plugin and the
"handle_putval" symbol will not be available at runtime.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Without this, utils_cmd_putval will not be linked into the exec plugin and the
"handle_putval" symbol will not be available at runtime.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
exec plugin: Fixed a "control reaches end of non-void function" warning.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
[PATCH 2/2] collectd.conf.pod: Documented the exec plugin's group support.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
[PATCH 1/2] exec plugin: Added support to specify a group as well.
Now, the user and group as which the process should be executed can be
specified as the first argument to the "Exec" config option. The syntax is
identical to the one used by GNU's chown(1).
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Now, the user and group as which the process should be executed can be
specified as the first argument to the "Exec" config option. The syntax is
identical to the one used by GNU's chown(1).
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Merge branch 'collectd-4.0'
Conflicts:
ChangeLog
configure.in
src/Makefile.am
src/collectd-unixsock.pod
src/mysql.c
src/nut.c
Conflicts:
ChangeLog
configure.in
src/Makefile.am
src/collectd-unixsock.pod
src/mysql.c
src/nut.c
ChangeLog: Added a short note about the fix in the processes plugin.
mysql plugin: Use a different define to determine if the read functionality should be enabled.