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.
collectd.conf(5): Added a note about that trailing whitespace bug.
Bumped version to 4.0.7; Updated ChangeLog.
Merge branch 'collectd-3.11' into collectd-4.0
processes plugin: Fix a possible segfault.
build system: Several fixes for libcurl, libmysql, and libupsclient.
libcurl: Check for CFLAGS using `curl-config --cflags' and use these
CFLAGS when checking for <curl/curl.h> to allow for weird
locations of the library.
libmysql: Cleaned up the checking code.
libupsclient: Check if the header file provides `UPSCONN' or `UPSCONN_t' and
use the one available. This should fix compile issues with with
the nut plugin.
libcurl: Check for CFLAGS using `curl-config --cflags' and use these
CFLAGS when checking for <curl/curl.h> to allow for weird
locations of the library.
libmysql: Cleaned up the checking code.
libupsclient: Check if the header file provides `UPSCONN' or `UPSCONN_t' and
use the one available. This should fix compile issues with with
the nut plugin.
build system: Use the libs provided by `mysql_config' to check for the lib itself.
Merge branch 'pull/collectd-4.0' into collectd-4.0
build system: Use `mysql_config' to find the appropriate flags for MySQL.
Merge branch 'pull/master'
exec and unixsock plugin: Move the shared `PUTVAL' code into src/utils_cmd_putval.[ch].
The putval code itself has been extended to allow `options' which can currently
be used to set the interval of the value-list(s) being submitted. Also,
submiting multiple value-lists in one command has been implemented. The
manpages should be up to date.
The putval code itself has been extended to allow `options' which can currently
be used to set the interval of the value-list(s) being submitted. Also,
submiting multiple value-lists in one command has been implemented. The
manpages should be up to date.
contrib/collectd2html.pl: Don't invoke the Perl interpreter with `-w'.
17 years agocontrib/collectd2html.pl: Allow generation of graphs from remote hosts or in an alter...
contrib/collectd2html.pl: Allow generation of graphs from remote hosts or in an alternative directory.
In the contribs area of the package there is a nice collectd2html.pl script
which assumes that the data is present in /var/lib/collectd and infers the
hostname. All fine and dandy, but there is no way to override this. This is
useful if one generates the data on a machine, but generates the graphs on
another one.
With the attached patch now is possible to specify a different host and/or a
different directory for the data.
The added options are '--host-is' and '--data-dir'.
An invocation for a remote host whose rrd files have been placed in
/var/tmp/collectd-remoteh looks like:
collectd2html.pl --host-is=remoteh --data-dir=/var/tmp/collectd-remoteh
In the contribs area of the package there is a nice collectd2html.pl script
which assumes that the data is present in /var/lib/collectd and infers the
hostname. All fine and dandy, but there is no way to override this. This is
useful if one generates the data on a machine, but generates the graphs on
another one.
With the attached patch now is possible to specify a different host and/or a
different directory for the data.
The added options are '--host-is' and '--data-dir'.
An invocation for a remote host whose rrd files have been placed in
/var/tmp/collectd-remoteh looks like:
collectd2html.pl --host-is=remoteh --data-dir=/var/tmp/collectd-remoteh
Merge branch 'pull/collectd-4.0' into collectd-4.0
Merge branch 'sh/master'
Conflicts:
configure.in
Conflicts:
configure.in
contrib/README: Updated information about collection.cgi.
The list of required Perl modules has been updated and some instructions
how to install the script have been added. Also a note about the config
file required since version 4 has been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The list of required Perl modules has been updated and some instructions
how to install the script have been added. Also a note about the config
file required since version 4 has been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Generate version dynamically using version-gen.sh.
This dynamically creates the version string when the configure script is
created. If run from within a repository the output of "git describe" is
used to create the version string. Else it defaults to a hardcoded value
which should be something like "$latest_version.git".
The idea is to update the default version to the new version (without
".git" appended) as the last commit of a release cycle. This commit is
tagged as the new version. The next commit after the release will set the
default version to "$new_version.git".
The benefit is that a pre-release with a quite well defined and unique
version can be easily created at any time.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This dynamically creates the version string when the configure script is
created. If run from within a repository the output of "git describe" is
used to create the version string. Else it defaults to a hardcoded value
which should be something like "$latest_version.git".
The idea is to update the default version to the new version (without
".git" appended) as the last commit of a release cycle. This commit is
tagged as the new version. The next commit after the release will set the
default version to "$new_version.git".
The benefit is that a pre-release with a quite well defined and unique
version can be easily created at any time.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Fixed some typos in the manpages.
The adjective "performant" does not seem to exist (neither in English nor
in German). I've replaced it with "efficient".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The adjective "performant" does not seem to exist (neither in English nor
in German). I've replaced it with "efficient".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
README, contrib/README: Fixed some typos.
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>
network plugin: Allow port arguments to be numeric.
README: Added a pointer to the mailinglist.
Merge branch 'pull/collectd-4.0'
contrib/fedora/collectd.spec: Updated for 4.0.6.
Hi,
Here is an updated version of the F7 rpm spec file.
It now handles updates as well (rpm -U).
When new versions of collectd are out please bump the version tag at the top of
the spec file.
It will then build correct version of collectd.
Regards
Kjell Randa
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Hi,
Here is an updated version of the F7 rpm spec file.
It now handles updates as well (rpm -U).
When new versions of collectd are out please bump the version tag at the top of
the spec file.
It will then build correct version of collectd.
Regards
Kjell Randa
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
collectd(1): Fix typo.
Merge branch 'pull/master'
Merge branch 'collectd-4.0'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Bumped version to 4.0.6; Updated ChangeLog.
Updated .gitignore.
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>
Merge branch 'pull/collectd-4.0' into collectd-4.0
src/collectd.conf.in: Added the `SocketFile' option for the email plugin.
Fixed Fedora specfile for Fedora 7 and collectd 4.0.5
Hi,
Here is a working spec file for Fedora 7.
Copy the tar.gz file to /usr/src/redhat/SOURCES and run
rpmbuild -ba collectd.spec
It has only been tested on x86_64, but I well see if I can find time to test
on x86 as well.
Upgrade not tested.
The file /etc/collection.conf referenced in collection.cgi is missing in the
tar file and not installed by the spec file.
Regards
Kjell Randa
Hi,
Here is a working spec file for Fedora 7.
Copy the tar.gz file to /usr/src/redhat/SOURCES and run
rpmbuild -ba collectd.spec
It has only been tested on x86_64, but I well see if I can find time to test
on x86 as well.
Upgrade not tested.
The file /etc/collection.conf referenced in collection.cgi is missing in the
tar file and not installed by the spec file.
Regards
Kjell Randa
syslog plugin: Call `openlog' right when the plugin is loaded.
sensors plugin: Fix the use of the ignorelist, so it matches the documentation.
ChangeLog: A first draft of the changes that were made for 4.1.
configure.in: Use the custom CFLAGS and LDFLAGS when testing for the upsclient library.
Added a sample collection.conf to contrib/.
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>
Changed the test for the `libupsclient' to it uses `libupsclient-config'.
Apparently it's linked against libssl on some systems, so getting the LDFLAGS
right is important.
Apparently it's linked against libssl on some systems, so getting the LDFLAGS
right is important.
Merge branch 'collectd-4.0'
Conflicts:
configure.in
Conflicts:
configure.in
Bumped version to 4.0.5; Updated ChangeLog.
collectd-nagios: Display performance data and generally be more verbose.
src/collectd.conf.in: s/_MODULE_/_PLUGIN_/g
Merge branch 'pull/master'
Conflicts:
src/memory.c
Conflicts:
src/memory.c
memory plugin: Check for `HAVE_HOST_STATISTICS' rather than `HOST_VM_INFO'.
Removed the `XXX_HAVE_READ' defines from all plugins.
collectd-nagios(1): Fix typo.
build system: Do dependency checking in the configure script.
The plan is to remove the dependency defines from the plugins and do all that
in the configure script from now on.
The plan is to remove the dependency defines from the plugins and do all that
in the configure script from now on.
dns plugin: Added support for the old bind-interface.
Apparently it is still in use, even in new distributions:
-- 8< --
bsbuild>uname -a
OpenBSD bsbuild 4.1 GENERIC#1435 i386
bsbuild>/usr/sbin/named -v
BIND 9.3.4
-- >8 --
Apparently it is still in use, even in new distributions:
-- 8< --
bsbuild>uname -a
OpenBSD bsbuild 4.1 GENERIC#1435 i386
bsbuild>/usr/sbin/named -v
BIND 9.3.4
-- >8 --
src/common.c: Allow the `pwbufp' argument to `getpwnam_r' to be NULL.
Impelemt an own version of `getpwnam_r'.
Since OpenBSD doesn't provide a threadsafe version itself, we need to provide
it in this case.. :/
Since OpenBSD doesn't provide a threadsafe version itself, we need to provide
it in this case.. :/
{hddtemp,mbmon,ntpd} plugins: Only use the `AI_ADDRCONFIG' if it's defined.
configure.in: Include `sys/types.h' and `sys/param.h' before other `sys/*.h' includes.
This fixes build problems under OpenBSD.
This fixes build problems under OpenBSD.
Merge branch 'collectd-4.0'
Bumped version to 4.0.4; Updated ChangeLog.
src/collectd-nagios.c: Copy the NAN-defines from `collectd.h'.
This should fix the bug reported by Daniel Leite.
This should fix the bug reported by Daniel Leite.
snmp plugin: Use several reading threads to parallelize the reading of SNMP hosts.
snmp plugin: Use the `snmp_sess_*' interface.
Apparently that's thread safe..
Apparently that's thread safe..
dns plugin: Check for `net/ppp_defs.h' and include it before `net/if_ppp.h' if it exists.
This hopefully solves build problems under OpenBSD.
This hopefully solves build problems under OpenBSD.
snmp plugin: Many important bugfixes.
It workes a lot better now :)
It workes a lot better now :)
memory plugin: Fix a typo in the Solaris code.
liboconfig: Added `%option noyywrap' to the scanner.
This should solve the link issues when collectd is built without flex being
installed.
This should solve the link issues when collectd is built without flex being
installed.
load plugin: Fix the Linux code that reads `/proc/loadavg'.
cpu, interface plugin: Fix compilation issues under Solaris.
Merge branch 'collectd-4.0'
Bumped version to 4.0.3.
ChangeLog, README: Documented the `--with-nan-emulation' option.
configure: Implemented `--with-nan-emulation' for crosscompiling.
When crosscompiling you cannot do the runtime checks for the (0.0 / 0.0) hack.
With this option you can force this implementation if neccessary.
When crosscompiling you cannot do the runtime checks for the (0.0 / 0.0) hack.
With this option you can force this implementation if neccessary.
src/Makefile.am: When building outside the source tree, install will fail
Signed-off-by: Ezra Peisach <epeisach@med-xtal.bu.edu>
Signed-off-by: Ezra Peisach <epeisach@med-xtal.bu.edu>
csv, rrdtool plugin: Initialize a buffer correctly.
While reading the source code, I found the following:
In csv.c (line 44) and rrdtool.c (line 363) (value_list_to_string) the
following syntax exists:
memset (buffer, '\0', sizeof (buffer_len));
The sizeof should be removed - assuming that the desire is to zero the buffer
and not the first four (sizeof(int)) bytes.
Based on the code paths - I do not see an information leak - or any security
implications...
While reading the source code, I found the following:
In csv.c (line 44) and rrdtool.c (line 363) (value_list_to_string) the
following syntax exists:
memset (buffer, '\0', sizeof (buffer_len));
The sizeof should be removed - assuming that the desire is to zero the buffer
and not the first four (sizeof(int)) bytes.
Based on the code paths - I do not see an information leak - or any security
implications...
Collectd::Unixsock: Implemented the `listval' method.
unixsock plugin: Implemented the `LISTVAL' command.
The LISTVAL command returnes a list of all available values and their timestamps.
The LISTVAL command returnes a list of all available values and their timestamps.
ChangeLog: Added changes for 4.0.3.
snmp plugin: Implemented the host-option `Interval'.
With this option hosts can be queried in different intervals, reducing the load
on devices with little CPU power, such as switches.
With this option hosts can be queried in different intervals, reducing the load
on devices with little CPU power, such as switches.
ping plugin: Actually check the uid, not the address of `getuid'.
xmms plugin: Added a plugin to graph bitrate and frequencies or files played by XMMS.
Of course, this is not the most useful plugin ever.. ;)
Of course, this is not the most useful plugin ever.. ;)
cpu plugin: Submit the right values in the Darwin code.
configure.in, src/Makefile.am: Only link against Net-SNMP if it is found.
snmp plugin: Use `size_t' for the OID length to be more portable.
Added initial version off cussh.pl to contrib/.
cussh (Collectd Unix Socket SHell) is a little interactive frontend for
the unixsock plugin. It supports two commands - GETVAL and PUTVAL - just
as the unixsock plugin itself.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
cussh (Collectd Unix Socket SHell) is a little interactive frontend for
the unixsock plugin. It supports two commands - GETVAL and PUTVAL - just
as the unixsock plugin itself.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
contrib/SpamAssassin/: Set default socket path to /var/run/collectd-email.
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>
email plugin: Set default path of the UNIX socket to $localstatedir.
In addition make it configurable using the "SocketFile" config option just
as for the unixsock plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
In addition make it configurable using the "SocketFile" config option just
as for the unixsock plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
unixsock plugin: Set default path of the UNIX socket to $localstatedir.
For this purpose LOCALSTATEDIR is defined to $localstatedir during
compilation.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
For this purpose LOCALSTATEDIR is defined to $localstatedir during
compilation.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.0'
Bumped version to 4.0.2; Updated ChangeLog.
hddtemp, ntpd plugin: Allow numeric `Port' arguments.
Merge branch 'collectd-4.0'
Bumped version to 4.0.1; Updated ChangeLog.
contrib/collection.cgi: Added graphs for gauge, if_errors, ipt_bytes and ipt_packets.