Code

collectd.git
15 years agouuid plugin: Pass `int' to `isxdigit'.
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>
15 years agotcpconns plugin: Compilation fixes for NetBSD.
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>
15 years agoprocesses plugin: Fix compilation issues under OpenBSD.
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.

15 years agorrdtool plugin: Make absolutely sure two local variables are initialized.
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.

15 years agontpd plugin: Fix dereference of type-punned pointer.
Florian Forster [Sun, 3 May 2009 21:45:16 +0000 (23:45 +0200)]
ntpd plugin: Fix dereference of type-punned pointer.

15 years agoprocesses plugin: Comment out nonexistent struct members.
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.

15 years agomemory plugin: Fix a formatstring error.
Florian Forster [Sat, 2 May 2009 08:45:51 +0000 (10:45 +0200)]
memory plugin: Fix a formatstring error.

15 years agoemail plugin: Don't assume `pthread_t' is a `unsigned long'.
Florian Forster [Sat, 2 May 2009 08:29:14 +0000 (10:29 +0200)]
email plugin: Don't assume `pthread_t' is a `unsigned long'.

15 years agoirq plugin: Force 32bit wrap-around.
Florian Forster [Fri, 1 May 2009 14:34:30 +0000 (16:34 +0200)]
irq plugin: Force 32bit wrap-around.

15 years agobattery plugin: Fix a typo.
Florian Forster [Fri, 1 May 2009 14:34:15 +0000 (16:34 +0200)]
battery plugin: Fix a typo.

15 years agoirq plugin: Parse interrupt counters as unsigned long long.
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>
15 years agoVarious plugins: Update copyright information.
Florian Forster [Mon, 20 Apr 2009 14:16:33 +0000 (16:16 +0200)]
Various plugins: Update copyright information.

15 years agointerface, memory, ping plugins: Update copyright information.
Florian Forster [Fri, 17 Apr 2009 22:55:59 +0000 (00:55 +0200)]
interface, memory, ping plugins: Update copyright information.

15 years agocpu plugin: Updated copyright information.
Florian Forster [Fri, 17 Apr 2009 16:19:59 +0000 (18:19 +0200)]
cpu plugin: Updated copyright information.

15 years agoSet process vmem_size and stack_size on FreeBSD
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>
15 years agobattery plugin: Don't complain about missing /proc/acpi/battery each interval.
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.

15 years agoRestore BYTE_ORDER on DARWIN The files matching grep "define _POSIX_C_SOURCE" src...
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>
15 years agoDisable disable multi -arch flags to perl.c on OSX Compilation of perl.c fails with:
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>
15 years agosrc/plugin.c: Emit warning in load_plugin if !S_ISREG
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>
15 years agocontrib/collectd-network.py: Add pure-Python implementation of collectd's network...
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>

15 years agocollectd-unixsock(5): Fix two typos.
Florian Forster [Sun, 22 Mar 2009 10:40:14 +0000 (11:40 +0100)]
collectd-unixsock(5): Fix two typos.

15 years agoexec plugin: Allow executed programs to close STDERR.
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 :)

15 years agonetwork plugin: Improve a debugging message.
Florian Forster [Thu, 19 Mar 2009 08:40:29 +0000 (09:40 +0100)]
network plugin: Improve a debugging message.

15 years agoconfigure: Prefixed cache-ids in AC_CACHE_CHECK with "c_cv_".
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.

15 years agoconfigfile, types_list: Improved error messages when handling "TypesDB".
Sebastian Harl [Tue, 10 Mar 2009 19:48:54 +0000 (20:48 +0100)]
configfile, types_list: Improved error messages when handling "TypesDB".

15 years agosrc/liboping/liboping.c: Fix a problem with strict aliasing.
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 :)

15 years agosrc/utils_cache.c: Fix an error message.
Florian Forster [Mon, 16 Mar 2009 08:07:12 +0000 (09:07 +0100)]
src/utils_cache.c: Fix an error message.

15 years agoMerge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5
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

15 years agocontrib/collection3: Use {interface} in `if_octets' graphs.
Florian Forster [Sat, 14 Mar 2009 16:54:19 +0000 (17:54 +0100)]
contrib/collection3: Use {interface} in `if_octets' graphs.

15 years agocontrib/collection3: Add graph for `ps_cputime'.
Florian Forster [Sat, 14 Mar 2009 16:53:55 +0000 (17:53 +0100)]
contrib/collection3: Add graph for `ps_cputime'.

15 years agocontrib/collection3: Add the "height" parameter.
Florian Forster [Sat, 14 Mar 2009 12:31:00 +0000 (13:31 +0100)]
contrib/collection3: Add the "height" parameter.

15 years agosrc/common.c, memory plugin: Fix a potential problem under Solaris.
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.

15 years agocontrib/collection3: Fix two minor issues.
Florian Forster [Fri, 13 Mar 2009 15:20:36 +0000 (16:20 +0100)]
contrib/collection3: Fix two minor issues.

15 years agocontrib/collection3: Add "Wirkleistung" graph.
Stefan Pfab [Fri, 13 Mar 2009 14:49:02 +0000 (15:49 +0100)]
contrib/collection3: Add "Wirkleistung" graph.

15 years agocontrib/collection3: Minor HTML work-around for some browsers.
Florian Forster [Fri, 13 Mar 2009 14:43:03 +0000 (15:43 +0100)]
contrib/collection3: Minor HTML work-around for some browsers.

15 years agocontrib/collection3: Update bin/json.cgi to use the JSON module.
Florian Forster [Fri, 13 Mar 2009 14:42:30 +0000 (15:42 +0100)]
contrib/collection3: Update bin/json.cgi to use the JSON module.

15 years agocontrib/collection3: Add graph for "Table space" graphs.
Florian Forster [Fri, 13 Mar 2009 14:39:38 +0000 (15:39 +0100)]
contrib/collection3: Add graph for "Table space" graphs.

15 years agocontrib/collecion3: Add graphs for `dns_opcode' and `io_octets'.
Florian Forster [Fri, 13 Mar 2009 14:34:30 +0000 (15:34 +0100)]
contrib/collecion3: Add graphs for `dns_opcode' and `io_octets'.

15 years agocontrib/collection3: Add the `index' to the parameters.
Florian Forster [Fri, 13 Mar 2009 14:30:54 +0000 (15:30 +0100)]
contrib/collection3: Add the `index' to the parameters.

15 years agosrc/liboping/test_liboping.c: Remove legacy file.
Florian Forster [Thu, 12 Mar 2009 07:56:36 +0000 (08:56 +0100)]
src/liboping/test_liboping.c: Remove legacy file.

15 years agopostgresql_default.conf: Make sure the "disk_io" query does not return NULLs.
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.

15 years agocontrib/exec-nagios.px: Make it possible to run the same script multiple times.
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.

15 years agorrdtool plugin: Fix a possible race condition at startup.
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.

15 years agocontrib/collection3: Fix stacking with NAN values.
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..

15 years agocontrib/collection3: Minor cleanups.
Florian Forster [Thu, 5 Mar 2009 08:35:50 +0000 (09:35 +0100)]
contrib/collection3: Minor cleanups.

15 years agocontrib/collection3: Add the "IgnoreUnknown" config option.
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.

15 years agocontrib/collection3: Add "Total" to "GenericIO" 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.

15 years agocontrib/collection3: Add the "DataDir" config option.
Florian Forster [Thu, 5 Mar 2009 08:30:06 +0000 (09:30 +0100)]
contrib/collection3: Add the "DataDir" config option.

15 years agocontrib/collection3/bin/.htaccess: s/SetHandler/AddHandler/
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.

15 years agocontrib/collection3/bin/.htaccess: Add file.
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..?

15 years agosnmp plugin: Added a note about a potential bug that needs fixing.
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..

15 years agoMerge branch 'bp/php-collection' into collectd-4.5
Florian Forster [Mon, 2 Mar 2009 08:31:37 +0000 (09:31 +0100)]
Merge branch 'bp/php-collection' into collectd-4.5

15 years agophp-collection: Add support for named graph lists as favorites
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>
15 years agophp-collection/functions.php: Escape/avoid problematic characters in RRD commandline
Bruno Prémont [Sun, 1 Mar 2009 21:20:06 +0000 (22:20 +0100)]
php-collection/functions.php: Escape/avoid problematic characters in RRD commandline

php-collection/functions.php: Escape/avoid problematic characters in RRD commandline

rrdtool does not like '!' in variable names so replace them with '_'.
(bind plugin has them in a few type-instances and type-instance is used
as variable name by MetaGraphs)
Also escape rrdtool field seperators that might appear in file names.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agophp-collection/definitions.php: Add MetaGraph definitions for bind plugin
Bruno Prémont [Sun, 1 Mar 2009 21:19:59 +0000 (22:19 +0100)]
php-collection/definitions.php: Add MetaGraph definitions for bind plugin

php-collection/definitions.php: Add MetaGraph definitions for bind plugin

Add metagraph definition and matching function for the various
types used by bind plugin.
Adjust the memory MetaGraph function to support bind memory statistics.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agophp-collection/graph.php: Add missing error500() function
Bruno Prémont [Sun, 1 Mar 2009 21:19:49 +0000 (22:19 +0100)]
php-collection/graph.php: Add missing error500() function

php-collection/graph.php: Add missing error500() function

When a call to rrdtool fails or some other internal error occurs
a HTTP error with code 500 and matching error image should be
returned, added the missing error500() function which does this
the same way as error404() and error400() functions.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agophp-collection: Fixes and multiple saved graph lists
Bruno Prémont [Sun, 1 Mar 2009 21:19:43 +0000 (22:19 +0100)]
php-collection: Fixes and multiple saved graph lists

php-collection/functions.php: Fix collectd_flush()

Some obsolete code in collectd_flush() caused PHP Notice errors
and prevented caused the function to return before attempting
to ask collectd to flush cache.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agophp-collection/definitions.php: Add missing MetaGraph for tcp_connections
Bruno Prémont [Sun, 1 Mar 2009 21:19:37 +0000 (22:19 +0100)]
php-collection/definitions.php: Add missing MetaGraph for tcp_connections

php-collection/definitions.php: Add missing MetaGraph for tcp_connections

Add missing MetaGraph reference for tcp_connections and fix DS name
for the MetaGraph

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agocontrib/php-collection: A few more bug-fixes to the graphing scripts.
Bruno Prémont [Mon, 2 Mar 2009 08:24:39 +0000 (09:24 +0100)]
contrib/php-collection: A few more bug-fixes to the graphing scripts.

This removes some obsolete code which prevents flush from working and adds
missing wrapper error500().

15 years agoREADME: Documented the `--with-fp-layout' configure option.
Florian Forster [Sat, 28 Feb 2009 14:40:45 +0000 (15:40 +0100)]
README: Documented the `--with-fp-layout' configure option.

15 years agodns plugin: Don't pass a NULL pointer to `pcap_open_live'.
Florian Forster [Sat, 28 Feb 2009 09:29:08 +0000 (10:29 +0100)]
dns plugin: Don't pass a NULL pointer to `pcap_open_live'.

Although the documentation states clearly, that passing a NULL pointer
as device is okay and handled like "any", doing so will crash the daemon
on some systems, most notably *BSDs but Linux users have reported this
behavior, too.

This patch passes "any" when the pointer it NULL, which reportedly
resulted in a different behavior, but still crashing the daemon. We'll
keep trying ;)

15 years agosrc/common.c: Fixed a race condition in check_create_dir().
Sebastian Harl [Tue, 24 Feb 2009 10:27:22 +0000 (11:27 +0100)]
src/common.c: Fixed a race condition in check_create_dir().

Between checking for the existence of a directory using stat() and creating
the directory using mkdir(), another thread might have already created the
directory thus causing mkdir() to fail with errno == EEXIST. This case is now
handled sanely, no longer causing the function (and thus some write callback)
to fail in this case.

Most likely, this only happens during startup when creating the data
directories - later, no two threads should try to create the same directory.

Interestingly enough, I frequently encountered this issue on a single core
machine.

15 years agocollectd-unixsock(5): Slightly improved the description.
Sebastian Harl [Sun, 22 Feb 2009 20:02:05 +0000 (21:02 +0100)]
collectd-unixsock(5): Slightly improved the description.

15 years agoRevert "libiptc/Makefile.am: Added xtables.h, libxtc.h to libiptc_la_SOURCES." collectd-4.5.3
Florian Forster [Sun, 22 Feb 2009 18:29:49 +0000 (19:29 +0100)]
Revert "libiptc/Makefile.am: Added xtables.h, libxtc.h to libiptc_la_SOURCES."

This reverts commit b6612126d862d182d9219e0512fa9ca833272b62.

This commit should have gone in the master branch, not in the
collectd-4.5 branch.

15 years agoBumped version to 4.5.3; Updated ChangeLog.
Florian Forster [Sun, 22 Feb 2009 18:22:01 +0000 (19:22 +0100)]
Bumped version to 4.5.3; Updated ChangeLog.

15 years agocontrib/cussh.pl: Fixed and improved command parsing.
Sebastian Harl [Thu, 19 Feb 2009 11:09:46 +0000 (12:09 +0100)]
contrib/cussh.pl: Fixed and improved command parsing.

The input line is now split into separate tokens which are either quoted or
unquoted strings. This simplifies e.g. the parsing of identifiers as the whole
token may be interpreted as just the id string. This allows for specifying a
somewhat greedy regex which before led to the whole remainder of the input
line ending up in the type or type instance.

15 years agocontrib/cussh.pl: Improved error reporting.
Sebastian Harl [Thu, 19 Feb 2009 10:04:49 +0000 (11:04 +0100)]
contrib/cussh.pl: Improved error reporting.

15 years agoCollectd::Unixsock: Improved error handling in putval().
Sebastian Harl [Thu, 19 Feb 2009 10:03:01 +0000 (11:03 +0100)]
Collectd::Unixsock: Improved error handling in putval().

15 years agoipmi plugin: Use a less error-prone approach to build the sensor name.
Florian Forster [Thu, 19 Feb 2009 12:45:45 +0000 (13:45 +0100)]
ipmi plugin: Use a less error-prone approach to build the sensor name.

15 years agoipmi plugin: Fix an off-by-one error.
Peter Holik [Thu, 19 Feb 2009 12:00:59 +0000 (13:00 +0100)]
ipmi plugin: Fix an off-by-one error.

Hi,

One of my ipmi sensors has a name longer than DATA_MAX_NAME_LEN and this
results in a SEGV.

cu Peter

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Mon, 16 Feb 2009 11:35:23 +0000 (12:35 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

configure.in

15 years agocollectd.conf(5): Add documentation for the `notify_email' plugin.
Florian Forster [Mon, 16 Feb 2009 11:30:13 +0000 (12:30 +0100)]
collectd.conf(5): Add documentation for the `notify_email' plugin.

15 years agocontrib/php-collection: Save/load graph list and fix HTTPS handling.
Bruno Prémont [Tue, 10 Feb 2009 20:38:23 +0000 (21:38 +0100)]
contrib/php-collection: Save/load graph list and fix HTTPS handling.

Hi,

An update to the graphing interface. (incremental patch attached)

This fixes security complaint by a few browsers when page is accessed
via HTTPS and also makes sure the graphs and lists will load if HTTP
and HTTPS paths differ.
Thanks to Mullet- for spotting this issue.

In addition to the fix above this patch adds support for saving
current graph list to a cookie and appending graph list read from
cookie to the currently displayed list.

A future extension would be to allow saving/loading named graph lists
so multiple list can coexist (pretty useful when monitoring multiple
servers/services)

Bruno

15 years agocontrib/php-collection: Add a PHP frontend for graph generation.
Bruno Prémont [Tue, 10 Feb 2009 20:35:44 +0000 (21:35 +0100)]
contrib/php-collection: Add a PHP frontend for graph generation.

Hi,

Attached is a patch with a set of PHP files for a complete graphing
environment for collectd-generated RRDs.
Before generating a graph with rrdtool it can tell collectd to flush
the RRDs that are about to be used.

The interface is built with dynamic HTML.
It provides following options:
 - host selection
 -> plugin selection
 --> plugin instance selection
 ---> type selection
 ----> type instance selection (or meta graph)
 - linear / logarithmic Y-scale
 - verbose / minimal legend
 - [Add Graph] [Remove all Graphs] [Refresh Graphs]
For each displayed graph:
 - Move above previous graph
 - Refresh graph
 - Remove graph
 - Move below following graph

I tested on following browsers:
- Firefox-3.0
- Safari-3.2 (Win32)
- Konqueror (KDE-4.1.3)
- Webkit (webkit-gtk-0_p40220)
- Internet Explorer (6, 7, 8rc - CSS layout issues with <8)

Dependencies:
- PHP-5 (might run with PHP-4)
  > GD suport for error images
  > Ability to execute rrdtool binary
  > Unix socket for FLUSH support
- RRDTool (rrdtool graph, rrdtool info)

TODO: complete/improve graph definitions in definitions.php
 though there is code to generate basic graph for any RRD of
 unknown type, so definitions are rather a matter of color,
 DS combination and stacking.

Bruno

File listing with short description:
- config.php
  (configuration)
- functions.php
  (common functions)
- definitions.php
  (graph definitions for most? types from types.db
   - based on collection.cgi)
- definitions.local.php
  (place for site-local graph definitions, e.g. for
   unixsock, tail, snmp generated RRDs)
- index.php
  (main page)
- graph.php
  (page returning the graph's PNG image)
- browser.js
  (whole bunch of Javascript logic to show/hide/update graphs)

Not included are a few images:
- collectd-logo.png
  (16x16, e.g. use collectd.org's favicon)
- favicon.png
  (e.g. use the one in share/collection*)
- refresh.png
- move-up.png
- move-down.png
- delete.png
  (16x16 take matching ones from your system's action-icons)

15 years agocontrib/collection.cgi: Add graph definition for libvirt/virt_cpu_total
John Leach [Thu, 5 Feb 2009 21:40:41 +0000 (22:40 +0100)]
contrib/collection.cgi: Add graph definition for libvirt/virt_cpu_total

15 years agoMerge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4
Florian Forster [Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)]
Merge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4

15 years agobuild system: Check for the libupsclient library using pkg-config *and* a custom...
Florian Forster [Thu, 29 Jan 2009 15:47:04 +0000 (16:47 +0100)]
build system: Check for the libupsclient library using pkg-config *and* a custom script.

References: #24

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

15 years agotcpconns plugin: Fix an endianness problem under *BSD.
Florian Forster [Sat, 24 Jan 2009 10:00:30 +0000 (11:00 +0100)]
tcpconns plugin: Fix an endianness problem under *BSD.

The port numbers were assumed to be in the host's byte order, when in
fact they are in network byte order (big endian). The patch adds `ntohs'
where necessary to fix this problem.

Resolves: #35

15 years agoutils_cache: Free then unused memory before returning in an error condition.
Sebastian Harl [Tue, 20 Jan 2009 12:24:54 +0000 (13:24 +0100)]
utils_cache: Free then unused memory before returning in an error condition.

15 years agoutils_cache: Unlock the cache mutex before returning in an error condition.
Sebastian Harl [Tue, 20 Jan 2009 12:20:00 +0000 (13:20 +0100)]
utils_cache: Unlock the cache mutex before returning in an error condition.

15 years agocontrib/cussh.pl: Add the PUTNOTIF command.
Doug MacEachern [Tue, 20 Jan 2009 09:27:10 +0000 (10:27 +0100)]
contrib/cussh.pl: Add the PUTNOTIF command.

I was using this to test notifications for jcollectd like so:
echo "PUTNOTIF host=foo severity=warning message=my perl is rusty" |
perl -Mblib=bindings/perl contrib/cussh.pl

Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoascent plugin: Fix a memory leak.
Bruno Prémont [Sat, 17 Jan 2009 10:40:53 +0000 (11:40 +0100)]
ascent plugin: Fix a memory leak.

According to libxml2 API doc, the string returned by
   xmlNodeListGetString()
must be freed by the user with
   xmlFree()

The attached patch adds the missing calls to xmlFree() for the ascent plugin.

15 years agoBumped version to 4.5.2; Updated ChangeLog. collectd-4.5.2
Florian Forster [Fri, 2 Jan 2009 22:18:15 +0000 (23:18 +0100)]
Bumped version to 4.5.2; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Fri, 2 Jan 2009 21:40:44 +0000 (22:40 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

ChangeLog
version-gen.sh

15 years agoBumped version to 4.4.5; Updated ChangeLog. collectd-4.4.5
Florian Forster [Fri, 2 Jan 2009 17:31:11 +0000 (18:31 +0100)]
Bumped version to 4.4.5; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Tue, 30 Dec 2008 16:24:06 +0000 (17:24 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

src/network.c

15 years agonetwork plugin: Fix an invalid size of buffer being used.
Florian Forster [Tue, 30 Dec 2008 13:44:39 +0000 (14:44 +0100)]
network plugin: Fix an invalid size of buffer being used.

When specifying the amount of data to copy, we used `sizeof (buffer)' where
`buffer' is a pointer, giving 4 or 8 bytes, depending on the architecture (and
not depending on the actual buffer size). This results in the `type' being sent
much more often than necessary and sometimes not sending a new type when is was
actually necessary. The only prominent case in the default configuration(s) was
`cpufreq' being used instead of `cpu', though.

While in the process, the global `type' buffer was replaced, because an
appropriate buffer is in `value_list_t' now.

Much thanks to Bruno Prémont for reporting and debugging this issue :)

References: #37

15 years agonetwork plugin: A fix for the buffer problem for version 4.4.
Florian Forster [Tue, 30 Dec 2008 16:13:31 +0000 (17:13 +0100)]
network plugin: A fix for the buffer problem for version 4.4.

This patch fixes the same problem as 6605ff1a, the insufficient copying of
values to the `type' buffer.

Thanks again to Bruno Prémont for reporting and debugging this :)

Resolves: #37

15 years agotypes.db(5): Fix a typo.
Florian Forster [Sat, 20 Dec 2008 12:34:43 +0000 (13:34 +0100)]
types.db(5): Fix a typo.

15 years agotypes.db(5): Explain in more detail how custom types should be added.
Florian Forster [Sat, 20 Dec 2008 10:20:31 +0000 (11:20 +0100)]
types.db(5): Explain in more detail how custom types should be added.

Apparently there was quite some confusion over this.

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

src/utils_dns.c

15 years agoDo not use *printf() to report errors / debugging messages.
Sebastian Harl [Fri, 19 Dec 2008 17:20:41 +0000 (18:20 +0100)]
Do not use *printf() to report errors / debugging messages.

The only exception to that is during configuration (which is done before
daemonization) to let the user know about problems immediately.

15 years agosrc/Makefile: Do not print the command when checking for POD ERRORS.
Sebastian Harl [Fri, 19 Dec 2008 16:16:35 +0000 (17:16 +0100)]
src/Makefile: Do not print the command when checking for POD ERRORS.

Else, the build output would include the word "error" in a cryptically looking
paragraph which might confuse users.

15 years agocollectd.conf(5): Updated the section about the "mysql" plugin.
Sebastian Harl [Fri, 19 Dec 2008 16:00:56 +0000 (17:00 +0100)]
collectd.conf(5): Updated the section about the "mysql" plugin.

 * Do not talk about what RRD files things end up in - there is more than
   "rrdtool" by now.
 * Updated the section number of the "Server Status Variables" in the MySQL
   reference manual.
 * Mention that the MySQL user does not need any special privileges.

15 years agocollectd: Abort with an appropriate status in exit_usage().
Sebastian Harl [Wed, 10 Dec 2008 21:12:24 +0000 (22:12 +0100)]
collectd: Abort with an appropriate status in exit_usage().

In case of an error, the exit status code now equals 1.

15 years agocollectd: Abort if any non-options are left over after command-line parsing.
Sebastian Harl [Wed, 10 Dec 2008 21:08:26 +0000 (22:08 +0100)]
collectd: Abort if any non-options are left over after command-line parsing.

This happens if any arguments not starting with a dash are passed to collectd.
Any of those are invalid, so let the user know about that.

Thanks to Kris (gruntruk) for (unknowingly) pointing that out ;-)

15 years agoperl plugin, utils_complain: Fixed errors identified by -Wformat-security.
Sebastian Harl [Sat, 6 Dec 2008 16:29:42 +0000 (17:29 +0100)]
perl plugin, utils_complain: Fixed errors identified by -Wformat-security.

A few "format not a string literal and no format arguments" errors have been
fixed by using "%s" as the format argument.

Thanks to Kevin (onebinary) for reporting this.

15 years agocollectd.conf.in: Fixed a wrong type used in the "tail" example.
Sebastian Harl [Sat, 6 Dec 2008 15:41:04 +0000 (16:41 +0100)]
collectd.conf.in: Fixed a wrong type used in the "tail" example.

15 years agocollectd.conf.pod: Consistently use spaces instead of tabs in examples.
Sebastian Harl [Sat, 6 Dec 2008 15:32:27 +0000 (16:32 +0100)]
collectd.conf.pod: Consistently use spaces instead of tabs in examples.