Code

collectd.git
16 years agonetwork plugin: Documented (in the source) that the network plugin cannot flush indiv...
Florian Forster [Tue, 27 May 2008 14:37:35 +0000 (16:37 +0200)]
network plugin: Documented (in the source) that the network plugin cannot flush individual values.

16 years agoMerge branch 'collectd-4.4'
Florian Forster [Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)]
Merge branch 'collectd-4.4'

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 27 May 2008 11:16:46 +0000 (13:16 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agobuild.sh: Check for lex and yacc.
Sebastian Harl [Sat, 24 May 2008 20:29:56 +0000 (22:29 +0200)]
build.sh: Check for lex and yacc.

Warn the user, if lex(1) and yacc(1) cannot be found. This is not
necessarily an error, as flex(1) or bison(1) might be available.

As suggested by Kevin Trumbull (onebinary) on IRC.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/liboconfig/oconfig.c: Declare "c_file" as "const char *".
Sebastian Harl [Sat, 24 May 2008 18:32:43 +0000 (20:32 +0200)]
src/liboconfig/oconfig.c: Declare "c_file" as "const char *".

This fixes an "assignment discards qualifiers from pointer target type"
warning. That string stores the name of the config file which is not
going to be modified by liboconfig.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/plugin.c: Don't require write callbacks to be present.
Sebastian Harl [Thu, 22 May 2008 11:37:57 +0000 (13:37 +0200)]
src/plugin.c: Don't require write callbacks to be present.

plugin_dispatch_values() used to fail, if no write callbacks had been
registered. As that function is used to update the cache and check
threshold as well, this limited the flexibility of collectd setups. Thus,
the error message has been downgraded to a one-time complaint.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/utils_complain.[ch]: Reintroduced an improved version of the complain mechanism.
Sebastian Harl [Thu, 22 May 2008 11:34:54 +0000 (13:34 +0200)]
src/utils_complain.[ch]: Reintroduced an improved version of the complain mechanism.

This has been asked for a couple of times and since I need it now, here it
goes... ;-) I've done the following modifications to Florian's original
version:

 * Renamed "plugin_complain" to "c_complain".
 * Renamed "plugin_relief" to "c_release", thus using two verbs which is
   more consistent imho.
 * Added "c_complain_once" to report a complaint only once.
 * Use timestamps instead of counting multiples of "interval_g" to
   determine when to report again. Thus, multiple calls to the complain-
   functions in one interval are allowed.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/utils_llist.c: Improved robustness against NULL pointers.
Sebastian Harl [Thu, 22 May 2008 11:36:00 +0000 (13:36 +0200)]
src/utils_llist.c: Improved robustness against NULL pointers.

All functions searching for some list entry now return NULL if the given
list equals NULL. Imho, that's the expected behavior. Also, it removes the
need to check the lists from the calling function while that function
usually checks the returned list entry anyway.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollectd-nagios: Updated to the new "unixsock" protocol.
Sebastian Harl [Wed, 21 May 2008 14:50:07 +0000 (16:50 +0200)]
collectd-nagios: Updated to the new "unixsock" protocol.

When disambiguating the protocol used by the unixsock plugin in commit
90287c6d240a168fca8d01f8330e2e2263e1f0a4 ("Disambiguated the protocol used
by the unixsock (and other) plugins.") the formatting of the return values
of the "GETVAL" command has been modified. This patch updates
collectd-nagios to handle the new format correctly.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/{email,ntpd,utils_cmd_getval}.c: Fix formatting errors.
Florian Forster [Mon, 26 May 2008 13:27:35 +0000 (15:27 +0200)]
src/{email,ntpd,utils_cmd_getval}.c: Fix formatting errors.

16 years agosrc/utils_threshold.c: Fix wrong output (was `min, min', should be `min, max') in...
Dieter Bloms [Sun, 25 May 2008 09:15:15 +0000 (11:15 +0200)]
src/utils_threshold.c: Fix wrong output (was `min, min', should be `min, max') in the created notification.

Resolves: #16

16 years agosrc/collectd.conf.in: Add sample section for the disk plugin.
Florian Forster [Sun, 25 May 2008 09:11:28 +0000 (11:11 +0200)]
src/collectd.conf.in: Add sample section for the disk plugin.

Resolves: #15

16 years agoconfigure: Reformatted the configuration summary.
Sebastian Harl [Mon, 19 May 2008 21:12:42 +0000 (23:12 +0200)]
configure: Reformatted the configuration summary.

The name of the "desktop_notification" plugin was too long to fit into the
formatting of the summary printed at the end of the configure run. To keep
the other patch readable, fixing this has been split into an extra patch.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agodesktop_notification: Added a plugin to send desktop notifications.
Sebastian Harl [Mon, 19 May 2008 21:08:17 +0000 (23:08 +0200)]
desktop_notification: Added a plugin to send desktop notifications.

This plugin sends desktop notifications to a notification daemon, as
defined in the Desktop Notification Specification (see
http://www.galago-project.org/specs/notification/).

The timeout after which to expire the displayed notification may be
configured in collectd.conf.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.4'
Florian Forster [Tue, 13 May 2008 14:58:41 +0000 (16:58 +0200)]
Merge branch 'collectd-4.4'

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 13 May 2008 14:58:11 +0000 (16:58 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

contrib/cussh.pl

16 years agocontrib/cussh.pl: Remove left over merge stuff..
Florian Forster [Tue, 13 May 2008 14:56:17 +0000 (16:56 +0200)]
contrib/cussh.pl: Remove left over merge stuff..

How the hell did that get there..?

16 years agocontrib/cussh.pl: Improve parsing of identifiers.
Florian Forster [Tue, 13 May 2008 14:51:26 +0000 (16:51 +0200)]
contrib/cussh.pl: Improve parsing of identifiers.

16 years agocontrib/cussh.pl: Add the `identifier' option to the `flush' command.
Florian Forster [Tue, 13 May 2008 14:50:49 +0000 (16:50 +0200)]
contrib/cussh.pl: Add the `identifier' option to the `flush' command.

16 years agorrdtool plugin: Fix cache key generation from the identifier.
Florian Forster [Tue, 13 May 2008 14:49:40 +0000 (16:49 +0200)]
rrdtool plugin: Fix cache key generation from the identifier.

16 years agobindings/perl/Collectd/Unixsock.pm: Add the `identifier' option to the `flush' method.
Florian Forster [Tue, 13 May 2008 13:03:53 +0000 (15:03 +0200)]
bindings/perl/Collectd/Unixsock.pm: Add the `identifier' option to the `flush' method.

16 years agocollectd-unixsock(5): Updated the FLUSH documentation.
Florian Forster [Tue, 13 May 2008 12:41:35 +0000 (14:41 +0200)]
collectd-unixsock(5): Updated the FLUSH documentation.

16 years agosrc/utils_cmd_flush.c: Add the `identifier' option.
Florian Forster [Tue, 13 May 2008 12:28:58 +0000 (14:28 +0200)]
src/utils_cmd_flush.c: Add the `identifier' option.

Using something like
  FLUSH plugin=rrdtool identifier=localhost/cpu-0/cpu-idle
will now only flush the local cpu-0/cpu-idle value, only using the rrdtool
plugin.

This is meant to be used in frontends which want to display up-to-date graphs
but there are too many hosts/rrd files to update them ``live'', i. e. without
caching.

16 years agoMerge branch 'collectd-4.4'
Florian Forster [Tue, 13 May 2008 10:54:48 +0000 (12:54 +0200)]
Merge branch 'collectd-4.4'

16 years agocollectd, rrdtool plugin: Add flushing of specific identifiers.
Florian Forster [Tue, 13 May 2008 10:53:11 +0000 (12:53 +0200)]
collectd, rrdtool plugin: Add flushing of specific identifiers.

The flush callbacks have been changed to expect an (optional)
`const char *instance'. If not NULL, *only* that value should be flushed.

The network and perl plugins don't follow this rule yet, but will in the
not so far future - hopefully ;)

16 years agosrc/utils_threshold.c: Fix the `Instance' option inside of `Type' blocks.
Florian Forster [Tue, 13 May 2008 10:08:14 +0000 (12:08 +0200)]
src/utils_threshold.c: Fix the `Instance' option inside of `Type' blocks.

Thanks to `kyrone' for pointing this out.

16 years agoteamspeak2 plugin: Fix out-of-bounds access to two arrays.
René Rebe [Tue, 13 May 2008 08:11:00 +0000 (10:11 +0200)]
teamspeak2 plugin: Fix out-of-bounds access to two arrays.

Hi,

while updating our T2 SDE (http://www.t2-project.org) package I
noticed some out-of-bounds acces in the teamspeak2 support:

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoChangeLog: Add a note about changes to the threshold handling. collectd-4.4.0
Florian Forster [Tue, 6 May 2008 19:13:51 +0000 (21:13 +0200)]
ChangeLog: Add a note about changes to the threshold handling.

16 years agoAUTHORS: Added Luke Herberling and Oleg King.
Florian Forster [Tue, 6 May 2008 17:19:31 +0000 (19:19 +0200)]
AUTHORS: Added Luke Herberling and Oleg King.

16 years agoBumped version to 4.4.0; Updated ChangeLog.
Florian Forster [Tue, 6 May 2008 14:55:35 +0000 (16:55 +0200)]
Bumped version to 4.4.0; Updated ChangeLog.

16 years agosrc/collectd.conf.in: Added the new powerdns and tail plugins.
Florian Forster [Tue, 6 May 2008 14:46:42 +0000 (16:46 +0200)]
src/collectd.conf.in: Added the new powerdns and tail plugins.

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 6 May 2008 14:14:18 +0000 (16:14 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 6 May 2008 14:13:35 +0000 (16:13 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in

16 years agopowerdns plugin: Fix some bugs after testing the plugin.
Florian Forster [Tue, 6 May 2008 14:01:01 +0000 (16:01 +0200)]
powerdns plugin: Fix some bugs after testing the plugin.

16 years agoconfigure.in: Don't use `test -a'.
Florian Forster [Tue, 6 May 2008 12:29:56 +0000 (14:29 +0200)]
configure.in: Don't use `test -a'.

Some old/weird versions of sh and/or test don't support the `-a' (`and')
argument.

16 years agocollectd-nagios: Open two different I/O streams for reading and writing.
Sebastian Harl [Thu, 1 May 2008 23:14:32 +0000 (01:14 +0200)]
collectd-nagios: Open two different I/O streams for reading and writing.

Full-duplex standard I/O streams are not really supported on sockets.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agodaemon: Ignore SIGPIPE.
Sebastian Harl [Thu, 1 May 2008 23:13:24 +0000 (01:13 +0200)]
daemon: Ignore SIGPIPE.

The default action for the PIPE signal is to terminate the process. This
is not really what we want for collectd, as e.g. a client of the unixsock
plugin (which might even be running without root privileges) could kill
the daemon by closing the socket right after sending a request.

The signal now gets ignored and each I/O function is checked for success.
To simply that, the unixsock's output stream is now configured to be line
buffered, removing the need to call fflush() (which could fail as well and
would have to be checked for success).

While I was at it, I renamed the sigaction struct for SIGCHLD to fit the
coding style used elsewhere in collectd.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoAdd libiptc.
Sebastian Harl [Thu, 1 May 2008 10:48:02 +0000 (12:48 +0200)]
Add libiptc.

libiptc is not meant to be a public interface by upstream. Debian has thus
removed it from all packages. To be able to use it, we need to take care
of it ourselves.

The configure script now checks, if libiptc is available and uses the
shipped version as a fallback.

The following changes to the libiptc sources were required:
 * added copyright headers mentioning the "Netfilter Core Team" as author
 * changed libiptc/* includes to * only
 * made libiptc.c:standard_target_map() static

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.4'
Florian Forster [Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)]
Merge branch 'collectd-4.4'

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 6 May 2008 11:45:14 +0000 (13:45 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 6 May 2008 11:44:46 +0000 (13:44 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agocollectd.conf(5): Documented the powerdns plugin.
Florian Forster [Mon, 5 May 2008 15:30:33 +0000 (17:30 +0200)]
collectd.conf(5): Documented the powerdns plugin.

16 years agopowerdns plugin: Promoted the "not found" message from DEBUG to INFO.
Florian Forster [Mon, 5 May 2008 15:30:13 +0000 (17:30 +0200)]
powerdns plugin: Promoted the "not found" message from DEBUG to INFO.

Since users may configure this themselves, they should know when it
doesn't work, so it's not a debug issue anymore.

16 years agopowerdns plugin: Fix a bug when checking the configuration options.
Florian Forster [Mon, 5 May 2008 15:29:10 +0000 (17:29 +0200)]
powerdns plugin: Fix a bug when checking the configuration options.

16 years agopowerdns plugin: Trim the default recursor command.
Florian Forster [Mon, 5 May 2008 15:28:27 +0000 (17:28 +0200)]
powerdns plugin: Trim the default recursor command.

16 years agoMerge branch 'collectd-4.4' of git://git.verplant.org/collectd into collectd-4.4
Florian Forster [Mon, 5 May 2008 14:44:49 +0000 (16:44 +0200)]
Merge branch 'collectd-4.4' of git://git.verplant.org/collectd into collectd-4.4

16 years agoMerge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
Florian Forster [Mon, 5 May 2008 14:44:11 +0000 (16:44 +0200)]
Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4

16 years agopowerdns plugin: Add defaults that are used if no fields are configured.
Florian Forster [Mon, 5 May 2008 14:20:38 +0000 (16:20 +0200)]
powerdns plugin: Add defaults that are used if no fields are configured.

16 years agobuild system: Fixed indentation and unconditionally declare CFLAGS and LIBADD.
Florian Forster [Mon, 5 May 2008 12:24:42 +0000 (14:24 +0200)]
build system: Fixed indentation and unconditionally declare CFLAGS and LIBADD.

16 years agousers plugin: Add support for the statgrab library.
Oleg King [Mon, 5 May 2008 12:21:37 +0000 (14:21 +0200)]
users plugin: Add support for the statgrab library.

16 years agoMerge branch 'ok/disk' into collectd-4.4
Florian Forster [Mon, 5 May 2008 12:04:31 +0000 (14:04 +0200)]
Merge branch 'ok/disk' into collectd-4.4

Conflicts:

configure.in

16 years agocpu plugin: Account wait-IO, system and swap separately when using libstatgrab.
Florian Forster [Mon, 5 May 2008 12:03:41 +0000 (14:03 +0200)]
cpu plugin: Account wait-IO, system and swap separately when using libstatgrab.

16 years agodisk plugin: Use the DATA_MAX_NAME_LEN define for a fixed-sized buffer.
Florian Forster [Mon, 5 May 2008 09:59:09 +0000 (11:59 +0200)]
disk plugin: Use the DATA_MAX_NAME_LEN define for a fixed-sized buffer.

16 years agodisk plugin: Add support for the statgrab library.
Oleg King [Mon, 5 May 2008 09:58:27 +0000 (11:58 +0200)]
disk plugin: Add support for the statgrab library.

16 years agocpu plugin: Add support for the statgrab library.
Oleg King [Mon, 5 May 2008 09:40:03 +0000 (11:40 +0200)]
cpu plugin: Add support for the statgrab library.

16 years agopowerdns plugin: Replace the `Command' option with the `Collect' option.
Florian Forster [Sat, 3 May 2008 21:17:10 +0000 (23:17 +0200)]
powerdns plugin: Replace the `Command' option with the `Collect' option.

The original code let the user define the command to use when querying the
server. This commit changes that and lets the user select the _values_ he's
interested in. Depending on whether an authorative server or a recursor is
collected this
- issues a `SHOW *' and manually greps the interesting pieces, or
- builds a command that requests only the interesting values.

Code compiles but it untested. Manpage not yet updated.

16 years agopowerdns plugin: Added all the other recursor stuff to the lookup table.
Florian Forster [Thu, 1 May 2008 10:17:40 +0000 (12:17 +0200)]
powerdns plugin: Added all the other recursor stuff to the lookup table.

16 years agosrc/collectd.h: Check for `_BYTE_ORDER', too.
Florian Forster [Thu, 1 May 2008 09:59:33 +0000 (11:59 +0200)]
src/collectd.h: Check for `_BYTE_ORDER', too.

Apparently Solaris uses that name..

16 years agopowerdns plugin: Completed the list of values for the authorative server.
Florian Forster [Wed, 30 Apr 2008 17:43:32 +0000 (19:43 +0200)]
powerdns plugin: Completed the list of values for the authorative server.

Also added a TODO comment that should be resolved before releasing 4.4.

16 years agoMerge branch 'collectd-4.4'
Florian Forster [Wed, 30 Apr 2008 09:04:23 +0000 (11:04 +0200)]
Merge branch 'collectd-4.4'

Conflicts:

src/collectd-perl.pod
src/email.c

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 30 Apr 2008 08:59:19 +0000 (10:59 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in
src/perl.c

16 years agoload plugin: Use #if rather than #ifdef.
Florian Forster [Wed, 30 Apr 2008 08:57:51 +0000 (10:57 +0200)]
load plugin: Use #if rather than #ifdef.

16 years agobuild system: Remove the COLLECT_LIBIOKIT define.
Florian Forster [Wed, 30 Apr 2008 08:57:22 +0000 (10:57 +0200)]
build system: Remove the COLLECT_LIBIOKIT define.

It isn't used anywhere, so remove it.

16 years agobuild system: Define HAVE_LIBSTATGRAB if the statgrab library is available.
Florian Forster [Wed, 30 Apr 2008 08:52:27 +0000 (10:52 +0200)]
build system: Define HAVE_LIBSTATGRAB if the statgrab library is available.

This define is used in some plugins. Thanks to Oleg King for noticing and
pointing this out and thanks to Sebastian Harl for a first patch which,
unfortunately, doesn't work anymore after changing the configure script.

16 years agoperl plugin: Work around a compiler warning on FreeBSD.
Sebastian Harl [Mon, 28 Apr 2008 14:53:57 +0000 (16:53 +0200)]
perl plugin: Work around a compiler warning on FreeBSD.

On FreeBSD, PERL_SYS_INIT3 expands to some expression which triggers a "value
computed is not used" warning by gcc. By telling the compiler to ignore this
value, we can work around this issue. In the long run, this should imho be
fixed in Perl though.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoemail plugin: Simplified code.
Sebastian Harl [Sun, 27 Apr 2008 18:58:44 +0000 (20:58 +0200)]
email plugin: Simplified code.

While looking at the code for some reason, I decided to simplify and
improve large parts of it. Most notably, standard IO streams are now used
to read from the socket. This allowed to remove large parts of the code
which were used to read and buffer data from the socket so far.

Also among the changes:
 * free any allocated memory
 * added / improved log messages
 * do not require euid == 0 to chown() the socket

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollectd-perl(5): Documented the support for flush callbacks.
Sebastian Harl [Sun, 27 Apr 2008 18:57:34 +0000 (20:57 +0200)]
collectd-perl(5): Documented the support for flush callbacks.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoCollectd.pm: Renamed the plugin_flush() "name" parameter to "plugins".
Sebastian Harl [Sun, 27 Apr 2008 18:56:52 +0000 (20:56 +0200)]
Collectd.pm: Renamed the plugin_flush() "name" parameter to "plugins".

This is more consistent with Collectd::Unixsock.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoperl plugin: Exported plugin_flush*() to Perl.
Sebastian Harl [Sun, 27 Apr 2008 18:56:09 +0000 (20:56 +0200)]
perl plugin: Exported plugin_flush*() to Perl.

This adds the following functions to collectd's Perl API which flush the
given plugins using the given interval.

 * Collectd::plugin_flush:
   This function is a frontend to _flush_one() and _flush_all() and
   expects up to two named parameters:
   - timeout => $timeout
   - name    => $name or [ $name1, $name2, ... ]
 * Collectd::plugin_flush_one:
   This function expects exactly two parameters, namely the timeout and
   the plugin name.
 * Collectd::plugin_flush_all:
   This function expects a single parameter, namely the timeout.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoperl plugin, Collectd.pm: Added support to flush Perl plugins.
Sebastian Harl [Sun, 27 Apr 2008 18:53:49 +0000 (20:53 +0200)]
perl plugin, Collectd.pm: Added support to flush Perl plugins.

Perl plugins may now register a callback of type Collectd::TYPE_FLUSH. A
single integer argument, representing the timeout in seconds, will be
passed to such callbacks.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoCollectd.pm: Fixed the check for complete function names in plugin_register.
Sebastian Harl [Sun, 20 Apr 2008 21:21:50 +0000 (23:21 +0200)]
Collectd.pm: Fixed the check for complete function names in plugin_register.

plugin_register() checks if the registered function includes the plugin's
package name. Up to now, this check would also have succeeded if the
function name itself would be prepended by the package name. Now, the
check looks for the separator "::".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 30 Apr 2008 08:26:28 +0000 (10:26 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoMoved <statgrab.h> out of "collectd.h" and into the plugins that actually use the...
Florian Forster [Wed, 30 Apr 2008 08:25:15 +0000 (10:25 +0200)]
Moved <statgrab.h> out of "collectd.h" and into the plugins that actually use the library.

The libstatgrab specific CFLAGS are only passed to these plugins, so that other
plugins may fail if libstatgrab is in a non-standard path.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 30 Apr 2008 06:18:21 +0000 (08:18 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoMerge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2
Florian Forster [Wed, 30 Apr 2008 06:18:08 +0000 (08:18 +0200)]
Merge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2

16 years agobuild system: Fix another bug in the detection of the statgrab library.
Florian Forster [Wed, 30 Apr 2008 06:17:21 +0000 (08:17 +0200)]
build system: Fix another bug in the detection of the statgrab library.

16 years agoMerge branch 'collectd-4.4'
Florian Forster [Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200)]
Merge branch 'collectd-4.4'

Conflicts:

src/sensors.c

16 years agoMerge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 29 Apr 2008 15:44:26 +0000 (17:44 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoMerge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2
Florian Forster [Tue, 29 Apr 2008 15:43:19 +0000 (17:43 +0200)]
Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2

16 years agoMerge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 15:43:04 +0000 (17:43 +0200)]
Merge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3

16 years agoMerge branch 'collectd-4.3'
Florian Forster [Tue, 29 Apr 2008 15:42:07 +0000 (17:42 +0200)]
Merge branch 'collectd-4.3'

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 14:52:08 +0000 (16:52 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

src/Makefile.am

16 years agobuild system: Use pkg-config to determine flags for the statgrab library.
Florian Forster [Tue, 29 Apr 2008 09:34:22 +0000 (11:34 +0200)]
build system: Use pkg-config to determine flags for the statgrab library.

16 years agobuild system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or...
Florian Forster [Tue, 29 Apr 2008 08:27:38 +0000 (10:27 +0200)]
build system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or libvirt.

16 years agosrc/types.db: Converted spaces to tabs.
Florian Forster [Wed, 9 Apr 2008 09:05:52 +0000 (11:05 +0200)]
src/types.db: Converted spaces to tabs.

Actually spaces would be nicer, but all lines but one used tabs..

16 years agosrc/plugin.c: Fix a typo.
Florian Forster [Wed, 23 Apr 2008 14:35:36 +0000 (16:35 +0200)]
src/plugin.c: Fix a typo.

16 years agoUnified string handling.
Sebastian Harl [Sun, 20 Apr 2008 21:20:45 +0000 (23:20 +0200)]
Unified string handling.

sstrncpy() and the newly added function ssnprintf() are now used all over
the place to make sure strings are null terminated. This removes quite
some duplicate code that was found all over the place and thus fairly
increases overall readability of the code. Also sizeof() is used instead
of hard-coded constants where appropriate to determine the available
space.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoAdded "type" to the value_list_t struct.
Sebastian Harl [Sun, 20 Apr 2008 21:19:28 +0000 (23:19 +0200)]
Added "type" to the value_list_t struct.

This way, the complete tuple (host, plugin, plugin instance, type, type
instance) is stored in a single data-type which is more straight forward
and allows a more flexible use of that data-type. As a consequence, there
is no longer a need to explicitly pass the type to some functions, most
notably plugin_dispatch_values(), which have been updated in that respect.

The "perl" plugin has also been updated to reflect this change. For
backwards compatibility, plugin_dispatch_values() still accepts a second
argument - however, a warning will be submitted to the daemon in that
case.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoBumped version to 4.3.3; Updated ChangeLog. collectd-4.3.3
Florian Forster [Tue, 22 Apr 2008 11:18:21 +0000 (13:18 +0200)]
Bumped version to 4.3.3; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

16 years agoChangeLog: Add missing notes about _REENTRANT and the sensors plugin. collectd-4.2.7
Florian Forster [Tue, 22 Apr 2008 11:16:34 +0000 (13:16 +0200)]
ChangeLog: Add missing notes about _REENTRANT and the sensors plugin.

16 years agoMerge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 22 Apr 2008 11:11:46 +0000 (13:11 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

ChangeLog
version-gen.sh

16 years agoBumped version to 4.2.7; Updated ChangeLog.
Florian Forster [Tue, 22 Apr 2008 08:28:20 +0000 (10:28 +0200)]
Bumped version to 4.2.7; Updated ChangeLog.

16 years agomigrate-3-4.px: Rename vs_processes's data source from "total" to "value".
Sebastian Harl [Fri, 18 Apr 2008 12:54:50 +0000 (14:54 +0200)]
migrate-3-4.px: Rename vs_processes's data source from "total" to "value".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
16 years agocollection.cgi: Updated "vserver" graph definitions to version 4.
Sebastian Harl [Fri, 18 Apr 2008 12:53:50 +0000 (14:53 +0200)]
collection.cgi: Updated "vserver" graph definitions to version 4.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
16 years agoteamspeak2 plugin: Remove some debug messages.
Florian Forster [Sun, 20 Apr 2008 08:25:07 +0000 (10:25 +0200)]
teamspeak2 plugin: Remove some debug messages.

16 years agoteamspeak2 plugin: Be case-insensitive when checking for errors.
Florian Forster [Sun, 20 Apr 2008 08:20:44 +0000 (10:20 +0200)]
teamspeak2 plugin: Be case-insensitive when checking for errors.

Apparently the error and okay messages may have different cases..

16 years agoteamspeak2 plugin: Collect `servers' and `channels', too.
Florian Forster [Sun, 20 Apr 2008 08:19:40 +0000 (10:19 +0200)]
teamspeak2 plugin: Collect `servers' and `channels', too.