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.
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
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.
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
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.
Florian Forster [Tue, 22 Apr 2008 11:16:34 +0000 (13:16 +0200)]
ChangeLog: Add missing notes about _REENTRANT and the sensors plugin.
Florian Forster [Tue, 22 Apr 2008 08:28:20 +0000 (10:28 +0200)]
Bumped version to 4.2.7; Updated ChangeLog.
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>
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>
Florian Forster [Fri, 18 Apr 2008 05:23:48 +0000 (07:23 +0200)]
sensors plugin: Fix the return status of `sensors_snprintf_chip_name'.
The function should return <0 only if an error occured, but in two out of three
branches the initial status of -1 was not modified. This may have rendered the
sensors plugin unusable for some people.
Sebastian Harl [Wed, 16 Apr 2008 16:53:30 +0000 (18:53 +0200)]
configure: Build perl bindings only if a perl interpreter is available.
For this purpose a check for the perl interpreter has been added. As the
check for libperl requires a perl interpreter as well (to get the compiler
and linker flags) the perl module will be disabled as well if a perl
interpreter is not available.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
Florian Forster [Mon, 14 Apr 2008 10:26:08 +0000 (12:26 +0200)]
build system: Check if strtok_r needs _REENTRANT
Resolves: #8
Florian Forster [Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200)]
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
Florian Forster [Wed, 9 Apr 2008 16:32:14 +0000 (18:32 +0200)]
exec plugin: Close all file descriptors but the one connected to the pipe.
Florian Forster [Thu, 3 Apr 2008 08:11:57 +0000 (10:11 +0200)]
COPYING: Switched to a version with the new address of the FSF.
Florian Forster [Thu, 3 Apr 2008 07:35:28 +0000 (09:35 +0200)]
COPYING: Added the file (including the GPLv2).
Newer versions of automake copy the GPLv3 when invoked with ``--add-missing''
which is not what we want.
Sebastian Harl [Mon, 31 Mar 2008 09:31:38 +0000 (11:31 +0200)]
unixsock plugin: Do not unregister a write-callback in us_shutdown().
The unixsock plugin no longer registers a write-callback. Basically,
unregistering a non-existent callback does not do any harm, However, if no
write-callback has been registered at all, the appropriate linked list has
never been created and the process will segfault when trying to access it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 1 Apr 2008 12:11:35 +0000 (14:11 +0200)]
configure.in: Set CPPFLAGS when checking headers.
When checking for <upsclient.h> (and the headers of a few other libraries) the
library specific CFLAGS were added to the global CFLAGS variable. This variable
is used when checking for ``header usability'', but not when checking for
``header presence'' for some reason.
This commit uses the global CPPFLAGS variable instead, which is used in both
checks. Libraries that benefit from this commit are:
- libcurl,
- libmysql(client),
- libnetsnmp,
- libupsclient.
Resolves #6
Florian Forster [Tue, 1 Apr 2008 08:40:39 +0000 (10:40 +0200)]
apache plugin: Increase the size of the read-buffer dynamically.
Why guess the size if you can just adapt to whatever comes in? The memory isn't
freed ever, though.
Florian Forster [Mon, 31 Mar 2008 15:03:56 +0000 (17:03 +0200)]
src/plugin.c: plugin_dispatch_values: Improve the error messages.
If no write plugin was loaded or no DS was defined, the
`plugin_dispatch_values' used to fail silently. This is of course not good, so
this commit introduces error messages for this case, so that users can see why
their setup is not working properly.
Also, the ``no such DS type'' message was promoted from DEBUG to INFO.
Florian Forster [Mon, 31 Mar 2008 13:51:13 +0000 (15:51 +0200)]
src/common.c: Make really sure BYTE_ORDER and BIG_ENDIAN are defined.
If both, BYTE_ORDER and BIG_ENDIAN, are undefined, the statement
#if BYTE_ORDER == BIG_ENDIAN
will be evaluated to `true', which may cause `ntohll' and `htonll' to behave
weird.
Sebastian Harl [Mon, 31 Mar 2008 08:46:42 +0000 (10:46 +0200)]
plugin.c: Tell the user if a plugin could not be found.
Up to now this error was silently ignored, letting the user believe that
everything went fine.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 30 Mar 2008 18:00:45 +0000 (20:00 +0200)]
collection.cgi: Make sure to pass valid variable names to rrdgraph.
Variable names used with DEF, VDEF, etc. must be made up of the
characters "A-Z, a-z, 0-9, -, _". In meta_graph_generic_stack() variable
names have been generated from the instance name which may, however,
contain illegal characters. Now, all illegal characters will be replaced
with "_" and a number will be prepended to the variable name to make
sure the name is still unique.
Thanks to Joerg Jaspert for pointing this out and helpful debugging
information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 31 Mar 2008 06:29:25 +0000 (08:29 +0200)]
hddtemp plugin: Prefix all messages with "hddtemp plugin:".
Sebastian Harl [Sun, 30 Mar 2008 15:25:16 +0000 (17:25 +0200)]
collection.cgi: Added "meta graph" for "dns_qtype" and "dns_rcode".
This will merge all query types and return codes into a single graph each.
get_n_colors() has been taken from the version 3 script to get the colors for
the graphs. get_random_color() imho is not suitable for that purpose as it can
return colors that are hardly different - which would result in graphs that
are hard to read. get_n_colors() now returns a hash-ref suitable to be passed
to meta_graph_generic_stack().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 30 Mar 2008 17:35:14 +0000 (19:35 +0200)]
collection.cgi: Added support for "wireless" values.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 30 Mar 2008 13:45:04 +0000 (15:45 +0200)]
collection.cgi: Updated "dns" types to version 4.x.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 29 Mar 2008 09:34:46 +0000 (10:34 +0100)]
Bumped version to 4.2.6
Florian Forster [Thu, 27 Mar 2008 16:52:53 +0000 (17:52 +0100)]
ChangeLog: Added changes since 4.2.5.
Peter Holik [Wed, 26 Mar 2008 12:48:09 +0000 (13:48 +0100)]
sensors plugin: Simple fix for temperature sensors.
Hi everybody!
While playing with sensors i missed temperature rrd files:
--- sensors.c.orig 2008-03-25 14:58:21.
000000000 +0100
+++ sensors.c 2008-03-25 14:58:27.
000000000 +0100
@@ -580,7 +580,7 @@
type = "fanspeed";
else if (fl->feature->type
== SENSORS_FEATURE_TEMP)
- type = "input";
+ type = "temperature";
else
continue;
because this type got registered as input and "input" is not in types.db
after configuring with --enable-debug i saw a log:
No such dataset registered: input
should that be also without --enable-debug in my syslog?
cu Peter
Sebastian Harl [Wed, 26 Mar 2008 08:44:04 +0000 (09:44 +0100)]
unixsock plugin: Open two different IO stream handles for reading and writing.
Full-duplex standard IO streams are not really supported on sockets.
Mixing input and output functions involves calls to lseek(2) which is
not supported on sockets and thus causes the IO operations to fail.
Opening two IO streams solves the problem.
This is a backport of
43df21461d523023951746ef669f1bb95f61366d.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 25 Mar 2008 14:52:47 +0000 (15:52 +0100)]
collectd-unixsock(5): Updated the paragraph about Collectd::Unixsock.
The module is no longer available in contrib/PerlLib/ but bindings/perl/.
Also it's now installed by default.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 24 Mar 2008 11:07:20 +0000 (12:07 +0100)]
liboconfig/parser.y: Enabled verbose error messages.
This uses bison's "%error-verbose" option which might not be available in
other yacc implementations.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 24 Mar 2008 11:06:49 +0000 (12:06 +0100)]
liboconfig: Include the filename in error messages.
As collectd now supports more than one config file, this is more
convenient.
A module-global variable is used for that purpose. If no filename is
available (e.g. if the user uses oconfig_parse_fh() directly), a string
like "<fd#X>" is used instead, where X is replaced by the file descriptor.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 22 Mar 2008 16:22:49 +0000 (17:22 +0100)]
perl plugin: Updated copyright information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 22 Mar 2008 16:22:19 +0000 (17:22 +0100)]
collectd-unixsock(5): Fixed some typos.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 22 Mar 2008 10:14:03 +0000 (11:14 +0100)]
sensors plugin: Print information why a specific feature is ignored in debug mode.
As requested by Ondřej Válek.
Florian Forster [Sat, 22 Mar 2008 09:45:11 +0000 (10:45 +0100)]
wireless plugin: Fix reading the noise value.
Accidentally the wrong value was used as `noise'. This patch fixes it.
Thanks to Ondřej Válek for pointing this out.
Sebastian Harl [Sun, 9 Mar 2008 18:59:15 +0000 (19:59 +0100)]
build.sh: Use glibtoolize if it's available.
This way, the script should work on e.g. MacOSX as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 9 Mar 2008 18:58:24 +0000 (19:58 +0100)]
configure: Do not preset $with_libstatgrab and $with_libdevstat.
Those variables are set when parsing the command line options and evaluated
inside the AC_ARG_WITH() macro. Presetting them overwrites any command line
options.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 20 Mar 2008 10:03:32 +0000 (11:03 +0100)]
liboconfig/oconfig.c: Free all allocated memory in oconfig_free().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 4 Mar 2008 13:43:40 +0000 (14:43 +0100)]
Bumped version to 4.2.5; Updated ChangeLog.
Florian Forster [Tue, 4 Mar 2008 13:36:14 +0000 (14:36 +0100)]
configure.in: Fix a typo.
Florian Forster [Tue, 4 Mar 2008 13:35:07 +0000 (14:35 +0100)]
network plugin: Tested and fixed the receiving part on Sparc.
Florian Forster [Tue, 4 Mar 2008 10:09:07 +0000 (11:09 +0100)]
network plugin: Use `memcpy' when parsing packages, too.
This should prevent crashes due to unaligned memory access when running as
server.
Florian Forster [Tue, 4 Mar 2008 08:36:42 +0000 (09:36 +0100)]
ChangeLog: Wrote an entry for 4.2.5.
Florian Forster [Thu, 28 Feb 2008 18:54:55 +0000 (19:54 +0100)]
src/common.c: Use uint8_t's instead of (signed) char's.
Florian Forster [Thu, 28 Feb 2008 14:15:53 +0000 (15:15 +0100)]
src/common.[ch]: Implemented `htond' and `ntohd' and applied it to the network plugin.
The functions convert doubles to the x86 representation or from the x86
representation to the representation used on the host. On x86 systems, this is
a NOP.
Florian Forster [Thu, 28 Feb 2008 13:23:27 +0000 (14:23 +0100)]
configure.in: Added checks to find out how doubles are stored.
Florian octo Forster [Wed, 27 Feb 2008 09:22:19 +0000 (10:22 +0100)]
network plugin: Align write access to the send buffer.
SPARC and possibly other architectures cannot access arbitrary memory
locations. This caused a `bus error' on SPARC when the network plugin was
loaded. This change hopefully fixes this problem.
Rob Lensen [Wed, 27 Feb 2008 07:04:57 +0000 (08:04 +0100)]
tcpconns plugin: Fix for compilation under FreeBSD.
Stefan Völkel [Mon, 25 Feb 2008 19:14:19 +0000 (20:14 +0100)]
rrdtool plugin: Simplified heartbeat calculation
Looks simpler, should do the same.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 19 Feb 2008 11:24:53 +0000 (12:24 +0100)]
hddtemp plugin: Use SCSI_DISK8_MAJOR thru SCSI_DISK15_MAJOR only if available.
Some Linux versions don't seem to provide the major numbers 8 thru 15.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 24 Feb 2008 17:25:14 +0000 (18:25 +0100)]
ping plugin: Fixed a typo when setting the TTL.
PING_DEF_TIMEOUT used to be used instead of PING_OPT_TTL as option
argument of ping_setopt(). This caused really strange effects when pinging
hosts, like a failed assertion in ping_timeval_sub() in liboping
indicating a latency <= 0.
Thanks to Romain Francoise for pointing this out and a lot of helpful
debugging information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 24 Feb 2008 11:17:24 +0000 (12:17 +0100)]
exec plugin: Don't pass an invalid egid to setgroups() if no group was given.
In case that no group has been specified in the config file, egid = -1 used to
be passed to setgroups() which, obviously, is not what we want.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 25 Feb 2008 07:28:39 +0000 (08:28 +0100)]
perl plugin: Warn if "EnableDebugger" has been used after "LoadPlugin".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 23 Feb 2008 09:58:00 +0000 (10:58 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Sat, 23 Feb 2008 09:56:37 +0000 (10:56 +0100)]
ping plugin: Deactivate the plugin if (pingobj == NULL).
If (pingobj == NULL), then the init-function will return (-1) so that the
plugin is deactivated.
Florian Forster [Sat, 23 Feb 2008 09:48:19 +0000 (10:48 +0100)]
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
Christophe Kalt [Sat, 23 Feb 2008 09:47:20 +0000 (10:47 +0100)]
swap plugin: Reapply a patch for Solaris.
This is a previously applied change that somehow got lost.
See http://git.verplant.org/?p=collectd.git;a=commitdiff;h=
ee1113650b0b565776fc3d62162d84741e234f05
and http://git.verplant.org/?p=collectd.git;a=commitdiff;h=
f68b68c5825efbd23c51531ff4e43c78a3bb2b3b
Florian Forster [Fri, 22 Feb 2008 16:24:23 +0000 (17:24 +0100)]
contrib/extractDS.px: Enhanced the script to modify RRD files a bit.
It can now also change the stepsize and add an RRA.
Florian Forster [Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)]
Merge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Tue, 19 Feb 2008 12:55:32 +0000 (13:55 +0100)]
exec plugin: Use `setgroups' to set the list of supplementary group IDs.
Thanks to Peter Holik for suggesting this.
Sebastian Harl [Sun, 17 Feb 2008 19:23:46 +0000 (20:23 +0100)]
migrate-3-4.px: Do not translate the disk names used by hddtemp.
In version 4, hddtemp still uses major/minor device numbers to identify disks.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 18 Feb 2008 19:53:44 +0000 (20:53 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Mon, 18 Feb 2008 19:41:38 +0000 (20:41 +0100)]
rrdtool plugin: Sort the list of user defined `RRATimespan's.
This is required by the logic calculating the RRA sized.
Florian Forster [Mon, 11 Feb 2008 10:18:58 +0000 (11:18 +0100)]
contrib/migrate-3-4.px: Handle `hddtemp' graphs correctly.
Sebastian Harl [Sun, 27 Jan 2008 15:13:44 +0000 (16:13 +0100)]
configure.in: Fixed handling of the --with-perl-bindings option.
This option could not be disabled so far as this case has not been handled in
the configure script. This patch fixes this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 23 Jan 2008 19:53:57 +0000 (20:53 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Wed, 23 Jan 2008 19:30:06 +0000 (20:30 +0100)]
network plugin: Have two different threads for handling incoming packets.
One that only receives and enqueues packets and one which parses the packets
and dispatches them to the daemon. This should solve problems with (too) short
socket buffers and (very) heavy load.
Florian Forster [Wed, 23 Jan 2008 13:54:41 +0000 (14:54 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Wed, 23 Jan 2008 13:31:11 +0000 (14:31 +0100)]
collectd-unixsock(5): Copied Sebastian's additions from collectd-exec(5).
Florian Forster [Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100)]
Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1
Florian Forster [Wed, 23 Jan 2008 12:53:08 +0000 (13:53 +0100)]
src/common.h: Fixed many typos in the header file.
Florian Forster [Tue, 22 Jan 2008 10:06:15 +0000 (11:06 +0100)]
apache plugin: Improved some error messages and fixed-buffer string copying.
Return an error when initialization fails. This includes the case when no URL
is configured. The user is informed about this as clear as possible.
Also, `strncpy' and `snprintf' now are followed by a forced NULL-termination of
the strings to be on the save side. This also changes the plugin to look more
like the other plugins which mostly do this already.
Sebastian Harl [Tue, 22 Jan 2008 08:34:03 +0000 (09:34 +0100)]
apache plugin: Do not initialize the plugin if no URL has been specified.
There is no need to initialize curl, if the plugin will not be used anyway.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 17:30:26 +0000 (18:30 +0100)]
Merge branch 'pull/collectd-4.2' into collectd-4.2
Florian Forster [Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Sebastian Harl [Fri, 18 Jan 2008 11:29:19 +0000 (12:29 +0100)]
collectd-exec(5): Improved description of the value-list identifier.
A short note about valid values for the plugin and type names and the
respective instance names as well as a pointer to types.db has been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 10:01:03 +0000 (11:01 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Sebastian Harl [Sun, 20 Jan 2008 22:11:53 +0000 (23:11 +0100)]
network plugin: Made network_receive() static.
This function is not exported to any other module.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 20 Jan 2008 21:54:55 +0000 (22:54 +0100)]
logfile plugin: Added Florian to the list of copyright holders.
Most of the current version has been written by him.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 09:41:29 +0000 (10:41 +0100)]
Bumped version to 4.2.4; Updated ChangeLog.
Florian Forster [Mon, 21 Jan 2008 09:40:33 +0000 (10:40 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
Florian Forster [Mon, 21 Jan 2008 09:39:50 +0000 (10:39 +0100)]
ChangeLog: Fixed the date of the 4.1.6 release.
Florian Forster [Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Fri, 11 Jan 2008 10:24:19 +0000 (11:24 +0100)]
Bumped version to 4.1.6; Updated ChangeLog.
Florian Forster [Thu, 10 Jan 2008 08:48:52 +0000 (09:48 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Thu, 10 Jan 2008 08:48:24 +0000 (09:48 +0100)]
src/configfile.c: Updated the copyright notice for 2008.
Sebastian Harl [Wed, 9 Jan 2008 07:33:52 +0000 (08:33 +0100)]
bindings/Makefile.am: Replaced "make -C" with "cd && make".
BSD make does not support "make -C".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 6 Jan 2008 19:11:29 +0000 (20:11 +0100)]
bindings/Makefile.am: Removed a bashism.
Brace expansion using { and } is not defined by POSIX but rather a bash
extension and should thus not be used for portability reasons.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 9 Jan 2008 07:29:36 +0000 (08:29 +0100)]
collectd.conf(5): Added a note about the availability of the "debug" loglevel.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 8 Jan 2008 10:25:20 +0000 (11:25 +0100)]
collectd.conf(5): Fix a messed up merge.
Florian Forster [Tue, 8 Jan 2008 10:23:28 +0000 (11:23 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
src/collectd.conf.pod
Florian Forster [Tue, 8 Jan 2008 10:08:41 +0000 (11:08 +0100)]
collectd.conf(5): Documented the fact that the configuration is processes from top to bottom.
Luke Heberling [Thu, 13 Dec 2007 07:03:03 +0000 (08:03 +0100)]
collectd.conf(5): Added a note about plugin loading order.
Florian Forster [Tue, 8 Jan 2008 09:52:44 +0000 (10:52 +0100)]
src/configfile.c: Improve the "Plugin `%s' did not register a callback." warning.
Evgeny Chukreev [Sun, 6 Jan 2008 09:00:06 +0000 (10:00 +0100)]
unixsock plugin: Actually set the permissions for the socket.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 28 Dec 2007 17:33:54 +0000 (18:33 +0100)]
Bumped version to 4.2.3; Updated ChangeLog.
Florian Forster [Fri, 28 Dec 2007 17:21:01 +0000 (18:21 +0100)]
build system: Yet another way to solve the src-dir vs. build-dir issue.