Florian Forster [Mon, 18 May 2009 11:05:26 +0000 (13:05 +0200)]
configure.in: Be more verbose if libperl exists but doesn't support ithreads.
Florian Forster [Sun, 10 May 2009 15:22:47 +0000 (17:22 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Sat, 9 May 2009 11:56:43 +0000 (13:56 +0200)]
Bumped version to 4.5.4; Updated ChangeLog.
Florian Forster [Sat, 9 May 2009 10:29:44 +0000 (12:29 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 9 May 2009 09:08:48 +0000 (11:08 +0200)]
configure.in: Hint towards the CFLAGS instead of using $CC.
Doug MacEachern [Sat, 9 May 2009 01:54:51 +0000 (18:54 -0700)]
configure.in: Add hint for building solaris 64-bit binary.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Doug MacEachern [Sat, 9 May 2009 00:35:03 +0000 (17:35 -0700)]
swap module: Include <vm/anon.h> on Solaris.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Doug MacEachern [Fri, 8 May 2009 01:05:01 +0000 (18:05 -0700)]
configure.in: Check for `mysql_get_server_version' in libmyql.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Doug MacEachern [Thu, 7 May 2009 19:50:17 +0000 (12:50 -0700)]
configure.in: Use AC_HEADER_STDBOOL
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 6 May 2009 14:37:18 +0000 (16:37 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Conflicts:
src/Makefile.am
Florian Forster [Wed, 6 May 2009 14:28:27 +0000 (16:28 +0200)]
Build system: Straighten up building of the DF plugin.
In rare cases, e. g. Solaris, getmntent is available but neither the one nor
the two argument version could be recognized. This lead to `cu_mount_getlist'
returning NULL without an error, leading to the df plugin fail without notice.
While at it I re-implemented the dependency checking of the DF plugin to match
the proprocessor logic in utils_mount.c.
Florian Forster [Wed, 6 May 2009 08:43:47 +0000 (10:43 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Doug MacEachern [Wed, 6 May 2009 08:42:01 +0000 (10:42 +0200)]
uuid plugin: Pass `int' to `isxdigit'.
Fixes compilation on NetBSD and possibly other systems.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Doug MacEachern [Wed, 6 May 2009 08:41:08 +0000 (10:41 +0200)]
tcpconns plugin: Compilation fixes for NetBSD.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 5 May 2009 18:29:08 +0000 (20:29 +0200)]
libcollectdclient: Copy `sstrerror' from src/common.c.
I don't want to simply include common.h, since that pulls in a lot of
other daemon-related headers..
Doug MacEachern [Mon, 4 May 2009 17:22:43 +0000 (19:22 +0200)]
Set process vmem_size and stack_size on FreeBSD
Fixes:
processes.c: In function 'ps_read':
processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
processes.c:1300: note: 'pse.vmem_size' was declared here
processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
processes.c:1300: note: 'pse.stack_size' was declared here
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.
Conflicts:
src/processes.c
Florian Forster [Mon, 4 May 2009 17:12:00 +0000 (19:12 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Mon, 4 May 2009 16:51:51 +0000 (18:51 +0200)]
processes plugin: Fix compilation issues under OpenBSD.
Unfortunately OpenBSD support is non-trivial to add, so we'll keep that for
later.
Florian Forster [Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Mon, 4 May 2009 15:08:22 +0000 (17:08 +0200)]
rrdtool plugin: Make absolutely sure two local variables are initialized.
To make the compiler happy.
Florian Forster [Mon, 4 May 2009 14:48:58 +0000 (16:48 +0200)]
bind plugin: Fixes for FreeBSD 7.1
X/Open is needed for strptime,
sys/select.h is needed for some libcurl versions, and
mktime is the POSIX variant of timegm (+ localization).
Florian Forster [Mon, 4 May 2009 14:46:02 +0000 (16:46 +0200)]
Various: Remove strict standards compliance defines.
Florian Forster [Sun, 3 May 2009 21:45:16 +0000 (23:45 +0200)]
ntpd plugin: Fix dereference of type-punned pointer.
Florian Forster [Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 2 May 2009 08:49:35 +0000 (10:49 +0200)]
processes plugin: Comment out nonexistent struct members.
We should reintroduce those values eventually.
Florian Forster [Sat, 2 May 2009 08:45:51 +0000 (10:45 +0200)]
memory plugin: Fix a formatstring error.
Florian Forster [Sat, 2 May 2009 08:29:14 +0000 (10:29 +0200)]
email plugin: Don't assume `pthread_t' is a `unsigned long'.
Florian Forster [Fri, 1 May 2009 14:34:51 +0000 (16:34 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Fri, 1 May 2009 14:34:30 +0000 (16:34 +0200)]
irq plugin: Force 32bit wrap-around.
Florian Forster [Fri, 1 May 2009 14:34:15 +0000 (16:34 +0200)]
battery plugin: Fix a typo.
Florian Forster [Mon, 20 Apr 2009 20:04:28 +0000 (22:04 +0200)]
src/libcollectdclient/: Specify _XOPEN_SOURCE=600.
Tomasz Pala [Sat, 18 Apr 2009 15:45:01 +0000 (17:45 +0200)]
irq plugin: Parse interrupt counters as unsigned long long.
Hello,
attached patch fixes accounting of most frequent interrupts (like NICs
on routers). E.g. in my case:
213: 76266 76357 76250 76397
2408617852 2411844062 2411642538 2411814531 PCI-MSI-edge eth1
214:
2621368360 2621463385 2621343444 2621386931 2349184 28 35 32 PCI-MSI-edge eth0
Here LONG_MAX (2147483647L) overflows in 10 days uptime and strtol()
returns the same value.
As all the values (including counter_t) are unsigned long long int, the
fix is trivial (for now there's no need to check for irq_value overflow;>).
--
Tomasz Pala <gotar@pld-linux.org>
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Florian Forster [Mon, 20 Apr 2009 14:17:08 +0000 (16:17 +0200)]
csv plugin: Update copyright information.
Florian Forster [Mon, 20 Apr 2009 14:16:33 +0000 (16:16 +0200)]
Various plugins: Update copyright information.
Florian Forster [Fri, 17 Apr 2009 23:04:48 +0000 (01:04 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Conflicts:
src/cpu.c
Florian Forster [Fri, 17 Apr 2009 23:02:59 +0000 (01:02 +0200)]
src/libcollectdclient/: Check if EILSEQ is defined.
And fall back to EPROTO or EINVAL if it is not, e. g. under FreeBSD.
Florian Forster [Fri, 17 Apr 2009 22:55:59 +0000 (00:55 +0200)]
interface, memory, ping plugins: Update copyright information.
Florian Forster [Fri, 17 Apr 2009 22:55:23 +0000 (00:55 +0200)]
openvpn plugin: Correct copyright information.
Florian Forster [Fri, 17 Apr 2009 16:19:59 +0000 (18:19 +0200)]
cpu plugin: Updated copyright information.
Florian Forster [Fri, 17 Apr 2009 15:43:12 +0000 (17:43 +0200)]
mysql plugin: Fix a typo in my previous patch.
D'oh!
Florian Forster [Fri, 17 Apr 2009 15:38:42 +0000 (17:38 +0200)]
mysql plugin: Updated copyright information.
Doug MacEachern [Fri, 17 Apr 2009 02:53:49 +0000 (19:53 -0700)]
Set process vmem_size and stack_size on FreeBSD
Fixes:
processes.c: In function 'ps_read':
processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
processes.c:1300: note: 'pse.vmem_size' was declared here
processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
processes.c:1300: note: 'pse.stack_size' was declared here
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 10 Mar 2009 21:06:10 +0000 (22:06 +0100)]
battery plugin: Don't complain about missing /proc/acpi/battery each interval.
Instead, complain once when the read callback is called for the first time.
Florian Forster [Sat, 11 Apr 2009 07:34:32 +0000 (09:34 +0200)]
Merge branch 'collectd-4.5' into collectd-4.6
Doug MacEachern [Fri, 10 Apr 2009 21:54:11 +0000 (14:54 -0700)]
Restore BYTE_ORDER on DARWIN The files matching grep "define _POSIX_C_SOURCE" src/*.c on MacOSX do not compile: In file included from target_notification.c:60: collectd.h:172:3: error: #error "Cannot determine byte order"
See /usr/include/i386/endian.h:
#if defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
#define LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN
#define BIG_ENDIAN __DARWIN_BIG_ENDIAN
#define BYTE_ORDER __DARWIN_BYTE_ORDER
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Doug MacEachern [Fri, 10 Apr 2009 21:38:33 +0000 (14:38 -0700)]
Disable disable multi -arch flags to perl.c on OSX Compilation of perl.c fails with:
gcc ... -Wall -Werror -arch i386 -arch ppc -g -pipe -fno-common -DPERL_DARWIN ... -MT perl_la-perl.lo -MD -MP -MF ...
...
gcc-4.0: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
See Config_heavy.pl:
$archflags = exists($ENV{ARCHFLAGS}) ? $ENV{ARCHFLAGS} : '-arch i386 -arch ppc';
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Doug MacEachern [Fri, 12 Dec 2008 20:52:04 +0000 (12:52 -0800)]
src/plugin.c: Emit warning in load_plugin if !S_ISREG
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 7 Apr 2009 07:37:09 +0000 (09:37 +0200)]
dbi plugin: Be more specific about unknown field types.
Especially print the name of the field.
Adrian Perez [Fri, 27 Mar 2009 21:23:51 +0000 (22:23 +0100)]
contrib/collectd-network.py: Add pure-Python implementation of collectd's network protocol.
Announcement can be found here:
<http://blogs.igalia.com/aperez/?p=38>
Florian Forster [Sun, 22 Mar 2009 10:40:14 +0000 (11:40 +0100)]
collectd-unixsock(5): Fix two typos.
Florian Forster [Thu, 19 Mar 2009 18:46:01 +0000 (19:46 +0100)]
exec plugin: Allow executed programs to close STDERR.
When an executed program is closing STDERR but continues running, the
daemon will wait for the child to exit and the child will eventually
block because the pipe is filled up, resulting in no statistics being
collected.
Thanks to Thorsten von Eicken for finding this problem :)
Florian Forster [Thu, 19 Mar 2009 08:40:29 +0000 (09:40 +0100)]
network plugin: Improve a debugging message.
Florian Forster [Wed, 18 Mar 2009 10:11:18 +0000 (11:11 +0100)]
configure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_".
autoconf requires the string "_cv_" to be present in cache-ids.
This patch adds/changes `have_broken_perl_load_module' which was added
after 4.5.
Florian Forster [Wed, 18 Mar 2009 10:07:30 +0000 (11:07 +0100)]
Bumped version to 4.6.2; Updated ChangeLog.
Florian Forster [Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)]
Merge branch 'collectd-4.5' into collectd-4.6
Sebastian Harl [Tue, 10 Mar 2009 20:26:51 +0000 (21:26 +0100)]
configure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_".
autoconf requires the string "_cv_" to be present in cache-ids.
Sebastian Harl [Tue, 10 Mar 2009 19:48:54 +0000 (20:48 +0100)]
configfile, types_list: Improved error messages when handling "TypesDB".
Florian Forster [Tue, 17 Mar 2009 08:29:06 +0000 (09:29 +0100)]
Merge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6
Florian Forster [Mon, 16 Mar 2009 08:38:42 +0000 (09:38 +0100)]
src/liboping/liboping.c: Fix a problem with strict aliasing.
Just remove the code since it's dead anyway.
Thanks to Alan Pevec <apevec at gmail.com> for pointing this out :)
Florian Forster [Mon, 16 Mar 2009 08:31:04 +0000 (09:31 +0100)]
src/filter_chain.c: Allow chains without a default target.
This is how it's documented.
Bruno Prémont [Mon, 16 Mar 2009 08:18:42 +0000 (09:18 +0100)]
timediff match: Register the correct match name.
Florian Forster [Mon, 16 Mar 2009 08:07:12 +0000 (09:07 +0100)]
src/utils_cache.c: Fix an error message.
Florian Forster [Sun, 15 Mar 2009 22:40:20 +0000 (23:40 +0100)]
src/collectd.conf.in: Add `match_timediff'.
Florian Forster [Sat, 14 Mar 2009 17:52:19 +0000 (18:52 +0100)]
Merge branch 'collectd-4.5' into collectd-4.6
Florian Forster [Sat, 14 Mar 2009 17:08:10 +0000 (18:08 +0100)]
Merge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5
Bruno Prémont [Sat, 14 Mar 2009 17:06:58 +0000 (18:06 +0100)]
bind plugin: Actually handle RR cache numbers as `gauge'..
Hi Florian,
Well a working patch was even less trivial as the quick one from
yesterday evening.
Just using a gauge type is not sufficient (only 0 is written to RRD
files), it's also necessary to adjust the bind_xml_stats_handle_view()
as has been done for the memory statistics
Attached is a patch to bind.c (I skipped types.db) which fixes the
cache data collection.
In addition I attached a graph of the cache evolution and memory (for
memory it might be worth giving it an own type as it's not cumulative
at all)
Bruno
Florian Forster [Sat, 14 Mar 2009 17:06:19 +0000 (18:06 +0100)]
bind plugin: "Trivial patch" to make `rr cache' stats work.
Florian Forster [Sat, 14 Mar 2009 17:02:35 +0000 (18:02 +0100)]
bind plugin: "Trivial patch" to make `rr cache' stats work.
Florian Forster [Sat, 14 Mar 2009 16:54:19 +0000 (17:54 +0100)]
contrib/collection3: Use {interface} in `if_octets' graphs.
Florian Forster [Sat, 14 Mar 2009 16:53:55 +0000 (17:53 +0100)]
contrib/collection3: Add graph for `ps_cputime'.
Florian Forster [Sat, 14 Mar 2009 12:31:00 +0000 (13:31 +0100)]
contrib/collection3: Add the "height" parameter.
Florian Forster [Fri, 13 Mar 2009 17:23:20 +0000 (18:23 +0100)]
src/common.c, memory plugin: Fix a potential problem under Solaris.
When the kstat chain has been updated (and init is called again),
get_kstat should overwrite the existing kstat pointer thingy.
Florian Forster [Fri, 13 Mar 2009 15:20:36 +0000 (16:20 +0100)]
contrib/collection3: Fix two minor issues.
Stefan Pfab [Fri, 13 Mar 2009 14:49:02 +0000 (15:49 +0100)]
contrib/collection3: Add "Wirkleistung" graph.
Florian Forster [Fri, 13 Mar 2009 14:43:03 +0000 (15:43 +0100)]
contrib/collection3: Minor HTML work-around for some browsers.
Florian Forster [Fri, 13 Mar 2009 14:42:30 +0000 (15:42 +0100)]
contrib/collection3: Update bin/json.cgi to use the JSON module.
Florian Forster [Fri, 13 Mar 2009 14:39:38 +0000 (15:39 +0100)]
contrib/collection3: Add graph for "Table space" graphs.
Florian Forster [Fri, 13 Mar 2009 14:34:30 +0000 (15:34 +0100)]
contrib/collecion3: Add graphs for `dns_opcode' and `io_octets'.
Florian Forster [Fri, 13 Mar 2009 14:30:54 +0000 (15:30 +0100)]
contrib/collection3: Add the `index' to the parameters.
Florian Forster [Thu, 12 Mar 2009 07:56:36 +0000 (08:56 +0100)]
src/liboping/test_liboping.c: Remove legacy file.
Sebastian Harl [Sat, 7 Mar 2009 17:03:42 +0000 (18:03 +0100)]
Merge branch 'sh/collectd-4.5' into sh/collectd-4.6
Conflicts:
contrib/collection3/lib/Collectd/Graph/Common.pm
src/postgresql_default.conf
Sebastian Harl [Sat, 7 Mar 2009 16:43:54 +0000 (17:43 +0100)]
postgresql_default.conf: Make sure the "disk_io" query does not return NULLs.
Starting with some version between 8.3.3 and 8.3.6, pg_statio_*_tables returns
NULL instead of 0 for statistics if no instance of the appropriate relation
exists. PQgetvalue() returns an empty string in that case which would then
result in error messages when udb_result_submit() tries to convert that to a
number.
Now, the "disk_io" query uses PostgreSQL's coalesce() function to make sure 0
is returned instead of NULL.
Tom Throckmorton [Fri, 6 Mar 2009 18:28:26 +0000 (19:28 +0100)]
contrib/exec-nagios.px: Make it possible to run the same script multiple times.
Florian Forster [Fri, 6 Mar 2009 15:53:28 +0000 (16:53 +0100)]
rrdtool plugin: Fix a possible race condition at startup.
On a very busy system, if the network plugin was initialized before the
rrdtool plugin, `rrd_cache_insert' may be called before the RRDtool
plugin is initialized. It would then pass `cache == NULL' to
`c_avl_get', resulting in a segmentation fault.
Sebastian Harl [Thu, 5 Mar 2009 10:49:17 +0000 (11:49 +0100)]
collectd.conf(5): Don't mix spaces and tabs in configuration examples.
Florian Forster [Thu, 5 Mar 2009 08:41:35 +0000 (09:41 +0100)]
contrib/collection3: Fix stacking with NAN values.
Stacked values above NAN values were not drawn previously..
Florian Forster [Thu, 5 Mar 2009 08:35:50 +0000 (09:35 +0100)]
contrib/collection3: Minor cleanups.
Florian Forster [Thu, 5 Mar 2009 08:35:28 +0000 (09:35 +0100)]
contrib/collection3: Add the "IgnoreUnknown" config option.
Used by the "GenericStacked" graphs.
Florian Forster [Thu, 5 Mar 2009 08:33:02 +0000 (09:33 +0100)]
contrib/collection3: Add "Total" to "GenericIO" graphs.
Using the RRDtool 1.2 VDEF syntax.
Florian Forster [Thu, 5 Mar 2009 08:30:06 +0000 (09:30 +0100)]
contrib/collection3: Add the "DataDir" config option.
Florian Forster [Thu, 5 Mar 2009 07:57:29 +0000 (08:57 +0100)]
contrib/collection3/bin/.htaccess: s/SetHandler/AddHandler/
SetHandler doesn't accept a file extension.
Florian Forster [Thu, 5 Mar 2009 07:51:51 +0000 (08:51 +0100)]
contrib/collection3/bin/.htaccess: Add file.
This has been missing. Wonder why nobody complained..?
Sebastian Harl [Wed, 4 Mar 2009 15:50:06 +0000 (16:50 +0100)]
postgresql_default.conf: Added a short usage and copyright header.
Sebastian Harl [Wed, 4 Mar 2009 15:00:53 +0000 (16:00 +0100)]
postgresql plugin: Made variable names more self-explanatory.
Also, while I was at it, improved some error messages.
Sebastian Harl [Wed, 4 Mar 2009 12:39:16 +0000 (13:39 +0100)]
postgresql_default.conf: Don't use the deprecated {Min,Max}PgVersion options.
Florian Forster [Mon, 2 Mar 2009 14:30:11 +0000 (15:30 +0100)]
collectd.conf(5): Mention that `Oracle' doesn't like semicolons..
.. at the end of the SQL statement.
Florian Forster [Mon, 2 Mar 2009 14:27:12 +0000 (15:27 +0100)]
libcollectdclient: Check if the file handle is valid before writing to it.
And free allocated memory when connecting fails. Only assign anything to
the user-provided pointer if `lcc_connect' succeeds. This should make
error-handling much more straight-forward.
Florian Forster [Mon, 2 Mar 2009 08:49:22 +0000 (09:49 +0100)]
snmp plugin: Added a note about a potential bug that needs fixing.
Negative absolute (gauge) values may be casted to an unsigned integer
variable on their way throught he daemon, producing VERY HIGH tempera-
tures in winter..
Florian Forster [Mon, 2 Mar 2009 08:31:37 +0000 (09:31 +0100)]
Merge branch 'bp/php-collection' into collectd-4.5
Bruno Prémont [Sun, 1 Mar 2009 21:20:10 +0000 (22:20 +0100)]
php-collection: Add support for named graph lists as favorites
php-collection: Add support for named graph lists as favorites
php-collection allowed saving and loading a list of graphs from a
cookie.
This patch changes loading/saving to provide support for naming
of favorite graph lists.
When saving a name has to be provided (up to 30 alphanumerical
characters includeing underscore and hyphen.
For loading a named list can be selected from a dropdown list (this list
is refreshed when it gets focus) of available favorites.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>