Code

collectd.git
14 years agoconfigure: In the summary, say which plugins have been disabled by the user.
Sebastian Harl [Tue, 30 Mar 2010 20:15:56 +0000 (22:15 +0200)]
configure: In the summary, say which plugins have been disabled by the user.

14 years agopostgresql plugin: Let the read callback fail if all queries failed.
Sebastian Harl [Tue, 30 Mar 2010 20:09:55 +0000 (22:09 +0200)]
postgresql plugin: Let the read callback fail if all queries failed.

14 years agocsv plugin: Use the value list's interval when outputting to STDOUT.
Sebastian Harl [Tue, 30 Mar 2010 19:59:36 +0000 (21:59 +0200)]
csv plugin: Use the value list's interval when outputting to STDOUT.

14 years agoutils_db_query: Added support for custom plugin intervals.
Sebastian Harl [Tue, 30 Mar 2010 19:55:13 +0000 (21:55 +0200)]
utils_db_query: Added support for custom plugin intervals.

The interval is specified when calling udb_query_prepare_result(). A value
less than or equal to zero may be used to let udb use the default
(interval_g).

The dbi, oracle, and postgresql plugins have been updated accordingly.

14 years agoutils_db_query: Introduced the query & result preparation areas.
Sebastian Harl [Tue, 30 Mar 2010 19:27:55 +0000 (21:27 +0200)]
utils_db_query: Introduced the query & result preparation areas.

These objects are used to store the temporary data needed during execution of
a query, which was previously stored in the query object itself. This allows
the query object to be used read-only, making it possible to use it from
multiple threads in parallel.

The dbi, oracle and postgresql plugins have been updated to use that
(mandatory) new feature.

14 years agoadded an "Invert" option for regex
Schmurfy [Sun, 28 Mar 2010 16:03:09 +0000 (18:03 +0200)]
added an "Invert" option for regex

14 years agomodbus plugin: Downgrade to use the libmodbus 1.2.5 API.
Florian Forster [Sat, 27 Mar 2010 14:01:35 +0000 (15:01 +0100)]
modbus plugin: Downgrade to use the libmodbus 1.2.5 API.

The API of the library changes every other month, so be conservative and
use the "stable" version, released in May 2008, and hope *that* API is
somewhat stable.

14 years agopostgresql plugin: Don't abort read(), if a query's version doesn't match.
Sebastian Harl [Fri, 26 Mar 2010 20:50:42 +0000 (21:50 +0100)]
postgresql plugin: Don't abort read(), if a query's version doesn't match.

There is no reason to skip unrelated queries because of that.

14 years agopostgresql plugin: Use the "right" `interval' when passing a param to a query.
Sebastian Harl [Fri, 26 Mar 2010 20:30:17 +0000 (21:30 +0100)]
postgresql plugin: Use the "right" `interval' when passing a param to a query.

… i.e., use the database specific interval, if configured.

14 years agopostgresql plugin: Added the ``Interval'' config option.
Sebastian Harl [Fri, 26 Mar 2010 19:11:32 +0000 (20:11 +0100)]
postgresql plugin: Added the ``Interval'' config option.

This option may be used to specify the read interval with which to query a
database.

14 years agoconfigure, src/Makefile: Check for nanosleep() in libposix4 as well. sh/collectd-4.8
Sebastian Harl [Fri, 26 Mar 2010 12:11:50 +0000 (13:11 +0100)]
configure, src/Makefile: Check for nanosleep() in libposix4 as well.

On, e.g., Solaris 2.6, nanosleep() is only available from that library.

Thanks to Vincent McIntyre for reporting this and providing an initial patch.

14 years agopostgresql plugin: Use the "complex read" mechanism.
Sebastian Harl [Thu, 25 Mar 2010 18:11:08 +0000 (19:11 +0100)]
postgresql plugin: Use the "complex read" mechanism.

This way, multiple databases are queried in parallel (depending on the number
of read threads).

14 years agopostgresql plugin: Connect to the database in the read function.
Sebastian Harl [Thu, 25 Mar 2010 17:49:48 +0000 (18:49 +0100)]
postgresql plugin: Connect to the database in the read function.

… rather than the init function. This way, we don't need access to some global
list of databases in the init function and it's done in preparation to using
the "complex read" system.

14 years agoREADME: Fix typo.
Florian Forster [Thu, 25 Mar 2010 07:09:57 +0000 (08:09 +0100)]
README: Fix typo.

14 years agoREADME: Fix typo.
Florian Forster [Thu, 25 Mar 2010 06:57:58 +0000 (07:57 +0100)]
README: Fix typo.

14 years agoplugin: Introduced a concept of ``read groups''.
Sebastian Harl [Wed, 24 Mar 2010 22:31:59 +0000 (23:31 +0100)]
plugin: Introduced a concept of ``read groups''.

Using a new parameter added to plugin_register_complex_read(), it's now
possible to specify a group name for the registered callback. This name may
later be used to unregister *all* callbacks belonging to that group using the
newly added function plugin_unregister_read_group().

This might come in handy for plugins that register multiple read callbacks but
do not want to keep track of all of them in order to be able to unregister
them.

14 years agoutils_llist: Added `llist_search_custom()'.
Sebastian Harl [Wed, 24 Mar 2010 22:08:34 +0000 (23:08 +0100)]
utils_llist: Added `llist_search_custom()'.

This function may be used for lookups using a custom compare function, i.e.
lookups that are not necessarily based on the name of the registered list
entry but some information specific to the used data-type.

14 years agosrc/utils_format_json.c: Use a format string to add strings to the buffer.
Florian Forster [Wed, 24 Mar 2010 16:44:41 +0000 (17:44 +0100)]
src/utils_format_json.c: Use a format string to add strings to the buffer.

While I hope that DS names can be trusted, I'm feeling more comfortable this
way nonetheless.

14 years agoutils_format_json: include ds names and types in json output.
Chris Buben [Wed, 24 Mar 2010 03:53:31 +0000 (20:53 -0700)]
utils_format_json: include ds names and types in json output.

Make it easier for external systems (i.e. those without visibility into
types.db) to interpret collectd json data.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agosrc/utils_format_json.c: Convert all data source types to rates except GAUGE.
Florian Forster [Wed, 24 Mar 2010 16:38:58 +0000 (17:38 +0100)]
src/utils_format_json.c: Convert all data source types to rates except GAUGE.

This is basically the same fix as previously done for the write_http plugin.

14 years agowrite_http: make StoreRates work for JSON format, too.
Chris Buben [Wed, 24 Mar 2010 03:53:30 +0000 (20:53 -0700)]
write_http: make StoreRates work for JSON format, too.

StoreRates for write_http was inconsistent in that it only functioned
for WH_FORMAT_COMMAND.  Extend StoreRates so that it works when using
WH_FORMAT_JSON, too.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agowrite_http plugin: Fix the store rates option.
Florian Forster [Wed, 24 Mar 2010 16:32:53 +0000 (17:32 +0100)]
write_http plugin: Fix the store rates option.

Convert all data source types to rates except GAUGE. Also, fixes some
indentation.

14 years agomemcachec plugin: Add the "ExcludeRegex" config option.
Florian Forster [Wed, 24 Mar 2010 15:58:36 +0000 (16:58 +0100)]
memcachec plugin: Add the "ExcludeRegex" config option.

14 years agocurl plugin: Add the "ExcludeRegex" config option.
Florian Forster [Wed, 24 Mar 2010 15:58:21 +0000 (16:58 +0100)]
curl plugin: Add the "ExcludeRegex" config option.

14 years agoIntroduces ExcludeRegexp to the tail plugin
Peter Warasin [Tue, 23 Mar 2010 20:55:54 +0000 (21:55 +0100)]
Introduces ExcludeRegexp to the tail plugin

Hi Florian

Florian Forster wrote:
> On Fri, Mar 19, 2010 at 06:13:14PM +0100, Peter Warasin wrote:
>> I'm searching for something like "ExcludeRegExp".
>
> no, something like that doesn't exist yet. I like the idea though, so
> I've added it to the [[Roadmap]] wiki page.

Attached is a patch which implements this.
The patch is against 4.9.1

Please tell me if you want me to rebase it to current svn

kind regards,
peter

--
:: e n d i a n
:: open source - open minds

:: peter warasin
:: http://www.endian.com   :: peter@endian.com

Adds ExcludeRegex to the tail-match plugin

With this keyword it is possible to exclude a line from a match.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agomemcachec plugin: Add the "ExcludeRegex" config option.
Florian Forster [Wed, 24 Mar 2010 15:58:36 +0000 (16:58 +0100)]
memcachec plugin: Add the "ExcludeRegex" config option.

14 years agocurl plugin: Add the "ExcludeRegex" config option.
Florian Forster [Wed, 24 Mar 2010 15:58:21 +0000 (16:58 +0100)]
curl plugin: Add the "ExcludeRegex" config option.

14 years agoIntroduces ExcludeRegexp to the tail plugin
Peter Warasin [Tue, 23 Mar 2010 20:55:54 +0000 (21:55 +0100)]
Introduces ExcludeRegexp to the tail plugin

Hi Florian

Florian Forster wrote:
> On Fri, Mar 19, 2010 at 06:13:14PM +0100, Peter Warasin wrote:
>> I'm searching for something like "ExcludeRegExp".
>
> no, something like that doesn't exist yet. I like the idea though, so
> I've added it to the [[Roadmap]] wiki page.

Attached is a patch which implements this.
The patch is against 4.9.1

Please tell me if you want me to rebase it to current svn

kind regards,
peter

--
:: e n d i a n
:: open source - open minds

:: peter warasin
:: http://www.endian.com   :: peter@endian.com

Adds ExcludeRegex to the tail-match plugin

With this keyword it is possible to exclude a line from a match.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agosnmp plugin: Fix a format string.
Florian Forster [Wed, 24 Mar 2010 15:37:53 +0000 (16:37 +0100)]
snmp plugin: Fix a format string.

14 years agomodbus plugin: Set the interval when dispatching values.
Florian Forster [Wed, 24 Mar 2010 14:43:42 +0000 (15:43 +0100)]
modbus plugin: Set the interval when dispatching values.

14 years agocollectd.conf(5): Improve the synopsis for the "modbus" plugin.
Florian Forster [Wed, 24 Mar 2010 13:07:48 +0000 (14:07 +0100)]
collectd.conf(5): Improve the synopsis for the "modbus" plugin.

14 years agocollectd.conf(5): Add documentation for the "modbus" plugin.
Florian Forster [Wed, 24 Mar 2010 13:00:56 +0000 (14:00 +0100)]
collectd.conf(5): Add documentation for the "modbus" plugin.

14 years agomodbus plugin: Add some folding markers.
Florian Forster [Wed, 24 Mar 2010 11:09:48 +0000 (12:09 +0100)]
modbus plugin: Add some folding markers.

14 years agomodbus plugin: Implement dispatching of values.
Florian Forster [Wed, 24 Mar 2010 11:09:33 +0000 (12:09 +0100)]
modbus plugin: Implement dispatching of values.

14 years agoMerge branch 'master' into ff/modbus
Florian Forster [Wed, 24 Mar 2010 09:08:51 +0000 (10:08 +0100)]
Merge branch 'master' into ff/modbus

14 years agoMerge branch 'fs/openvpn'
Florian Forster [Mon, 22 Mar 2010 18:29:13 +0000 (19:29 +0100)]
Merge branch 'fs/openvpn'

Conflicts:
src/collectd.conf.pod
src/openvpn.c

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Mon, 22 Mar 2010 18:27:33 +0000 (19:27 +0100)]
Merge branch 'collectd-4.9'

14 years agoopenvpn plugin: Fix a copy'n'paste error in the "new naming schema".
Florian Forster [Mon, 22 Mar 2010 18:22:02 +0000 (19:22 +0100)]
openvpn plugin: Fix a copy'n'paste error in the "new naming schema".

14 years agocollectd.conf(5): Document the "ImprovedNamingSchema" option of the OpenVPN plugin.
Florian Forster [Mon, 22 Mar 2010 18:20:25 +0000 (19:20 +0100)]
collectd.conf(5): Document the "ImprovedNamingSchema" option of the OpenVPN plugin.

14 years agocollectd.conf(5): Document the "Collect{IndividualUsers,UserCount}" options of the...
Florian Forster [Mon, 22 Mar 2010 18:26:30 +0000 (19:26 +0100)]
collectd.conf(5): Document the "Collect{IndividualUsers,UserCount}" options of the OpenVPN plugin.

14 years agoopenvpn plugin: Rename the "OnlyAggregateUsers" option to "CollectIndividualUsers".
Florian Forster [Mon, 22 Mar 2010 18:08:04 +0000 (19:08 +0100)]
openvpn plugin: Rename the "OnlyAggregateUsers" option to "CollectIndividualUsers".

The semantic is inverted: When true (default) statistics for individual
users will be collected.

The "AggregateUsers" is now named "CollectUserCount" and a new name for
"Compression", "CollectCompression", has been added. This makes the names
of the config options consistent with one another.

The module global configuration variables have been changed to _Bool
while I was at it.

14 years agoopenvpn plugin: Added copyright notice for Fabian Schuh.
Florian Forster [Mon, 22 Mar 2010 17:42:29 +0000 (18:42 +0100)]
openvpn plugin: Added copyright notice for Fabian Schuh.

14 years agosrc/openvpn.c: Re-indent the entire file.
Florian Forster [Mon, 22 Mar 2010 17:42:09 +0000 (18:42 +0100)]
src/openvpn.c: Re-indent the entire file.

14 years agoBugfix that made collectd inflooping if no openvpn connection
Fabian Schuh [Fri, 19 Mar 2010 12:53:30 +0000 (13:53 +0100)]
Bugfix that made collectd inflooping if no openvpn connection

14 years agoName changes - removed transfer statistics (doesn't make sense here)
Fabian Schuh [Fri, 19 Mar 2010 09:07:50 +0000 (10:07 +0100)]
Name changes - removed transfer statistics (doesn't make sense here)

14 years agoAdded Users Counter
Fabian Schuh [Thu, 18 Mar 2010 13:41:34 +0000 (14:41 +0100)]
Added Users Counter

14 years agofixed typo
Fabian Schuh [Thu, 18 Mar 2010 11:44:20 +0000 (12:44 +0100)]
fixed typo

14 years agoBugfix with multiple files
Fabian Schuh [Thu, 18 Mar 2010 10:03:54 +0000 (11:03 +0100)]
Bugfix with multiple files

14 years ago[openvpn] new feature 'SumOverAllUsers'
Fabian Schuh [Thu, 18 Mar 2010 09:50:15 +0000 (10:50 +0100)]
[openvpn] new feature 'SumOverAllUsers'

14 years agonetapp plugin: Fix a syntax error in an error message.
Florian Forster [Wed, 17 Mar 2010 18:12:53 +0000 (19:12 +0100)]
netapp plugin: Fix a syntax error in an error message.

Thanks to facade from IRC for the hint.

14 years agomodbus plugin: Actually get into a working state.
Florian Forster [Wed, 17 Mar 2010 17:39:37 +0000 (18:39 +0100)]
modbus plugin: Actually get into a working state.

14 years agoBuild system: Add the "modbus" plugin.
Florian Forster [Wed, 17 Mar 2010 17:36:05 +0000 (18:36 +0100)]
Build system: Add the "modbus" plugin.

14 years agoconfigure.in: Add checks for libmodbus.
Florian Forster [Wed, 17 Mar 2010 17:35:41 +0000 (18:35 +0100)]
configure.in: Add checks for libmodbus.

14 years agoMerge branch 'master' into ff/modbus
Florian Forster [Wed, 17 Mar 2010 12:45:36 +0000 (13:45 +0100)]
Merge branch 'master' into ff/modbus

14 years agoMerge branch 'cstenac'
Florian Forster [Mon, 15 Mar 2010 21:43:05 +0000 (22:43 +0100)]
Merge branch 'cstenac'

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Mon, 15 Mar 2010 21:43:00 +0000 (22:43 +0100)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
src/exec.c

14 years agoExec plugin: Update copyright header.
Florian Forster [Mon, 15 Mar 2010 21:03:14 +0000 (22:03 +0100)]
Exec plugin: Update copyright header.

14 years agoprocesses plugin: Fix a couple of hard-coded array sizes.
Florian Forster [Mon, 15 Mar 2010 21:37:56 +0000 (22:37 +0100)]
processes plugin: Fix a couple of hard-coded array sizes.

Since I was picky when accepting Clément's patch, I felt like I owed it
to clean up the entire file ;)

14 years agoprocesses plugin: Update copyright and author information.
Florian Forster [Mon, 15 Mar 2010 21:33:12 +0000 (22:33 +0100)]
processes plugin: Update copyright and author information.

14 years agocollectd.conf(5): Document the new "PrintSeverity" option.
Florian Forster [Mon, 15 Mar 2010 21:09:46 +0000 (22:09 +0100)]
collectd.conf(5): Document the new "PrintSeverity" option.

14 years agologfile plugin: Rename the "PrintLevel" option to "PrintSeverity".
Florian Forster [Mon, 15 Mar 2010 21:09:08 +0000 (22:09 +0100)]
logfile plugin: Rename the "PrintLevel" option to "PrintSeverity".

14 years agoImpove level print
Clément Stenac [Sun, 14 Mar 2010 08:25:42 +0000 (09:25 +0100)]
Impove level print

14 years agoMisc fixes, thanks to octo for pointing them out
Clément Stenac [Sun, 14 Mar 2010 08:14:11 +0000 (09:14 +0100)]
Misc fixes, thanks to octo for pointing them out

14 years agoAdd missing declarations for anonymous and code
Clément Stenac [Sun, 14 Mar 2010 07:56:55 +0000 (08:56 +0100)]
Add missing declarations for anonymous and code

14 years agoconfigfile: cf_read_dir: Don't abort reading a directory when reading one file fails.
Florian Forster [Wed, 3 Mar 2010 14:44:11 +0000 (15:44 +0100)]
configfile: cf_read_dir: Don't abort reading a directory when reading one file fails.

14 years agoModbus plugin: Started working on a "Modbus-TCP" plugin for collectd.
Florian Forster [Wed, 10 Mar 2010 17:38:58 +0000 (18:38 +0100)]
Modbus plugin: Started working on a "Modbus-TCP" plugin for collectd.

14 years agosrc/configfile.c: Fix a minor typo.
Florian Forster [Wed, 10 Mar 2010 17:37:47 +0000 (18:37 +0100)]
src/configfile.c: Fix a minor typo.

14 years agosrc/configfile.[ch]: Add "cf_util_get_int".
Florian Forster [Wed, 10 Mar 2010 17:37:32 +0000 (18:37 +0100)]
src/configfile.[ch]: Add "cf_util_get_int".

Helper function to parse an "int".

14 years agosrc/configfile.[ch]: Implement "cf_util_get_string_buffer".
Florian Forster [Wed, 10 Mar 2010 16:20:29 +0000 (17:20 +0100)]
src/configfile.[ch]: Implement "cf_util_get_string_buffer".

A function to parse a config node into a char buffer of limited size.

14 years agoProcesses plugin: Fix a minor typo.
Clément Stenac [Sat, 27 Feb 2010 20:22:47 +0000 (21:22 +0100)]
Processes plugin: Fix a minor typo.

14 years agoExec plugin: Add a missing folding marker.
Florian Forster [Tue, 9 Mar 2010 17:51:08 +0000 (18:51 +0100)]
Exec plugin: Add a missing folding marker.

14 years agoExec plugin: Set the "noreturn" attribute on the "exec_child" function.
Florian Forster [Tue, 9 Mar 2010 17:50:55 +0000 (18:50 +0100)]
Exec plugin: Set the "noreturn" attribute on the "exec_child" function.

14 years agoExec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.
Florian Forster [Tue, 9 Mar 2010 17:50:32 +0000 (18:50 +0100)]
Exec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.

14 years agolibiptc: avoid strict-aliasing warnings
Jan Engelhardt [Tue, 16 Feb 2010 20:16:47 +0000 (21:16 +0100)]
libiptc: avoid strict-aliasing warnings

libiptc: avoid strict-aliasing warnings

In file included from libiptc/libip4tc.c:117:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘iptc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip4tc.c: In function ‘dump_entry’:
libiptc/libip4tc.c:157:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
  CC     libiptc/libip6tc.lo
In file included from libiptc/libip6tc.c:112:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘ip6tc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip6tc.c: In function ‘dump_entry’:
libiptc/libip6tc.c:188:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Rebased for collectd/src/owniptc: Alan Pevec <apevec@gmail.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoMerge remote branch 'origin/collectd-4.8' into collectd-4.8
Florian Forster [Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100)]
Merge remote branch 'origin/collectd-4.8' into collectd-4.8

14 years agoconfigure.in: Check for "htonll".
Manuel Sanmartin (no email) [Tue, 9 Mar 2010 15:12:51 +0000 (16:12 +0100)]
configure.in: Check for "htonll".

The first patch adds support to check if the htonl and htonll functions
(which are used in AIX port) are available in configure. Until now the
AIX port used these functions without perform any existence test.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agomemcached plugin: Add hack for AIX compatibility.
Manuel Sanmartin (no email) [Tue, 9 Mar 2010 14:40:00 +0000 (15:40 +0100)]
memcached plugin: Add hack for AIX compatibility.

The second one port memcached plugin to AIX. Since AIX don't have
MSG_DONTWAIT flag support, we use MSG_NONBLOCK... and we hope to work
fine ever :)

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agooracle plugin: Fix semantics of OCIAttrGet.
Florian Forster [Wed, 3 Mar 2010 13:01:30 +0000 (14:01 +0100)]
oracle plugin: Fix semantics of OCIAttrGet.

Apparently it returns success if it could fetch the parameter value and
doesn't interpret the value itself. So returning NULL when querying for
OCI_ATTR_SERVER_STATUS does not result in an error. Handle this as a
lost connection.

Thanks to Sven for pointing this out :)

14 years agoAdd missing fetch of virtual size for Mach
Clément Stenac [Sat, 27 Feb 2010 21:16:58 +0000 (22:16 +0100)]
Add missing fetch of virtual size for Mach

14 years agoAdd support for fetching data (aka anonymous) and code virtual memory size
Clément Stenac [Sat, 27 Feb 2010 21:15:21 +0000 (22:15 +0100)]
Add support for fetching data (aka anonymous) and code virtual memory size

14 years agoMinor typo
Clément Stenac [Sat, 27 Feb 2010 20:22:47 +0000 (21:22 +0100)]
Minor typo

14 years agoAdd an option to add the severity of the message in the logfile plugin
Clément Stenac [Sat, 27 Feb 2010 20:08:53 +0000 (21:08 +0100)]
Add an option to add the severity of the message in the logfile plugin

14 years agowrite_http plugin: Replace tabs with spaces.
Florian Forster [Sat, 27 Feb 2010 08:55:44 +0000 (09:55 +0100)]
write_http plugin: Replace tabs with spaces.

So the entire file is indented the same way.

14 years ago.mailmap: Added Rodolphe Quiedeville <rquiedeville@bearstech.com>.
Sebastian Harl [Thu, 25 Feb 2010 23:31:51 +0000 (00:31 +0100)]
.mailmap: Added Rodolphe Quiedeville <rquiedeville@bearstech.com>.

His name was mis-spelled in one commit as Rodolphe Quiedeville*l*.

14 years agowrite_http plugin: Fixed a memory leak in the "StoreRates" code.
Sebastian Harl [Tue, 16 Feb 2010 22:54:02 +0000 (23:54 +0100)]
write_http plugin: Fixed a memory leak in the "StoreRates" code.

14 years agowrite_http plugin: Add a StoreRates option.
Paul Sadauskas [Mon, 15 Feb 2010 04:18:58 +0000 (21:18 -0700)]
write_http plugin: Add a StoreRates option.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
14 years agoMerge branch 'collectd-4.9'
Florian Forster [Thu, 25 Feb 2010 23:17:18 +0000 (00:17 +0100)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:

src/ping.c

14 years agocontrib/redhat/collectd.spec: Updated for version 4.9.
Stu Hood [Thu, 25 Feb 2010 21:40:53 +0000 (22:40 +0100)]
contrib/redhat/collectd.spec: Updated for version 4.9.

I've attached a patch for the RPM specfile to allow it to build collectd 4.9.0,
including Java support.

14 years agodebian/: Removed ancient Debian package files.
Florian Forster [Thu, 11 Feb 2010 13:03:38 +0000 (14:03 +0100)]
debian/: Removed ancient Debian package files.

You might want to look at git://git.tokkee.org/pkg-collectd.git instead.

14 years agoconfigure.in: Fix three small typos.
Florian Forster [Wed, 10 Feb 2010 14:24:23 +0000 (15:24 +0100)]
configure.in: Fix three small typos.

14 years agoBuild system: Put Java class files into a .jar file.
Amit Gupta [Wed, 10 Feb 2010 13:37:36 +0000 (14:37 +0100)]
Build system: Put Java class files into a .jar file.

Hi,

I was wondering why the java plugin api class files are published under
share/collectd/java. Ideally, a java-plugin.jar file containing all the class
files should get published rather than the individual class files.
Additionally, the jar files IMO should get published to the lib directory where
the so files are sitting rather than the share directory.

Same holds true for jmx class files as well (probably jmx.jar?).

I could work on this if everyone is okay with it.

Regards
Amit

14 years agosrc/utils_cmd_listval.c: Fix a memory leak.
Florian Forster [Wed, 10 Feb 2010 13:01:37 +0000 (14:01 +0100)]
src/utils_cmd_listval.c: Fix a memory leak.

Thanks to Peter Warasin for figuring this out. His "garbage collector" patch
may replace this solution in future versions of collectd.

14 years agoBugfix: correctly handle spurious wakeups in pthread_cond_timedwait
Michael Stapelberg [Sat, 6 Feb 2010 15:10:33 +0000 (16:10 +0100)]
Bugfix: correctly handle spurious wakeups in pthread_cond_timedwait

This fixes problems storing data in rrd files on NetBSD 5.0 with more
than one CPU.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agosrc/utils_format_json.c: Use "isfinite" rather than "isinf".
Florian Forster [Thu, 4 Feb 2010 12:07:43 +0000 (13:07 +0100)]
src/utils_format_json.c: Use "isfinite" rather than "isinf".

Makes it a bit easier to read.

14 years agosrc/collectd.h: Add fallback implementations of "isfinite" and "isinf".
Florian Forster [Thu, 4 Feb 2010 12:07:06 +0000 (13:07 +0100)]
src/collectd.h: Add fallback implementations of "isfinite" and "isinf".

14 years agoutils_format_json: serialize nan and inf as null, as per JSON spec
Chris Buben [Thu, 4 Feb 2010 08:52:30 +0000 (00:52 -0800)]
utils_format_json: serialize nan and inf as null, as per JSON spec

I'm deserializing JSON output from the write_http plugin using ruby-yajl.
yajl was puking on the literal value nan encoded in the output.

[
    {
        "plugin": "memcached",
        "interval": 10,
        "host": "myhost",
        "values": [
            nan,
            5
        ],
        "time": 1265239180,
        "plugin_instance": "",
        "type_instance": "",
        "type": "ps_count"
    }
]

After some research, ECMA-262 15.12.3 says nan and infinite numbers
aren't representable in JSON and should be serialized as the string
null. I figure any strictly-compliant JSON parser will fail on parsing
JSON data containing nans as emitted by collectd's utils_format_json
routines.

This patch makes collectd's JSON output compliant in the case of
infinite or nan gauge values.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agopython: Documented meta data.
Sven Trenkel [Fri, 29 Jan 2010 14:56:38 +0000 (15:56 +0100)]
python: Documented meta data.

14 years agopython: Full meta data support.
Sven Trenkel [Fri, 29 Jan 2010 13:12:41 +0000 (14:12 +0100)]
python: Full meta data support.