Code

collectd.git
14 years agopinba plugin: Fix the "request" type and dispatch the document size data.
Florian Forster [Mon, 12 Apr 2010 12:08:33 +0000 (14:08 +0200)]
pinba plugin: Fix the "request" type and dispatch the document size data.

14 years agopinba plugin: Multiply the derive data sources by a factor.
Florian Forster [Sat, 10 Apr 2010 10:25:24 +0000 (12:25 +0200)]
pinba plugin: Multiply the derive data sources by a factor.

Otherwise the change is too slow to be really useful.

14 years agopinba plugin: Fix a sever typo.
Florian Forster [Sat, 10 Apr 2010 10:15:00 +0000 (12:15 +0200)]
pinba plugin: Fix a sever typo.

14 years agosrc/collectd.conf.in: Add the Pinba plugin.
Florian Forster [Sat, 10 Apr 2010 10:14:44 +0000 (12:14 +0200)]
src/collectd.conf.in: Add the Pinba plugin.

14 years agoBuild system: Link the pinba plugin with "protobuf-c".
Florian Forster [Sat, 10 Apr 2010 10:14:30 +0000 (12:14 +0200)]
Build system: Link the pinba plugin with "protobuf-c".

Configure checks are still missing.

14 years agopinba plugin: Looked up the default port on the Pinba homepage.
Florian Forster [Fri, 9 Apr 2010 20:24:31 +0000 (22:24 +0200)]
pinba plugin: Looked up the default port on the Pinba homepage.

14 years agopinba plugin: Coding style changes.
Florian Forster [Fri, 9 Apr 2010 20:20:42 +0000 (22:20 +0200)]
pinba plugin: Coding style changes.

14 years agopinba plugin: Remove unused type definitions.
Florian Forster [Fri, 9 Apr 2010 20:20:21 +0000 (22:20 +0200)]
pinba plugin: Remove unused type definitions.

14 years agopinba plugin: Fix a folding marker.
Florian Forster [Fri, 9 Apr 2010 20:12:35 +0000 (22:12 +0200)]
pinba plugin: Fix a folding marker.

14 years agopinba plugin: Make the config parsing easier to read ...
Florian Forster [Fri, 9 Apr 2010 20:10:24 +0000 (22:10 +0200)]
pinba plugin: Make the config parsing easier to read ...

... by using "cf_util_get_string".

14 years agopinba plugin: Turn most metrics into DERIVEs.
Florian Forster [Fri, 9 Apr 2010 19:57:57 +0000 (21:57 +0200)]
pinba plugin: Turn most metrics into DERIVEs.

This way we don't need to keep track of the time ourselves. The new type
"float_counter_t" is used to convert floats into derive_ts.

14 years agopinba plugin: Remove the "NI_MAXSERV" define.
Florian Forster [Fri, 9 Apr 2010 18:39:09 +0000 (20:39 +0200)]
pinba plugin: Remove the "NI_MAXSERV" define.

14 years agopinba plugin: Turn the "Port" config option into a string.
Florian Forster [Fri, 9 Apr 2010 18:36:48 +0000 (20:36 +0200)]
pinba plugin: Turn the "Port" config option into a string.

This way service names can be used, too.

14 years agopinba plugin: Added folding markers to all functions.
Florian Forster [Fri, 9 Apr 2010 14:52:00 +0000 (16:52 +0200)]
pinba plugin: Added folding markers to all functions.

14 years agopinba plugin: Removed the dependency to libevent.
Florian Forster [Fri, 9 Apr 2010 14:21:23 +0000 (16:21 +0200)]
pinba plugin: Removed the dependency to libevent.

The filedescriptors are now watched using poll(2).

14 years agopinba plugin: Use mutexes rather than R/W-locks.
Florian Forster [Fri, 9 Apr 2010 13:31:55 +0000 (15:31 +0200)]
pinba plugin: Use mutexes rather than R/W-locks.

Mutexes are more portable and since only write locks were used they
act exactly the same way.

14 years agopinba plugin: pinba_socket_open: Rewrote the function ...
Florian Forster [Fri, 9 Apr 2010 13:25:36 +0000 (15:25 +0200)]
pinba plugin: pinba_socket_open: Rewrote the function ...

... with protocol independence (IPv6 support).

14 years agopinba plugin: Rename custom types to follow the "*_t" convention.
Florian Forster [Fri, 9 Apr 2010 13:00:03 +0000 (15:00 +0200)]
pinba plugin: Rename custom types to follow the "*_t" convention.

14 years agopinba plugin: pinba_udp_read_callback_fn: Streamlined the function a bit.
Florian Forster [Fri, 9 Apr 2010 12:53:52 +0000 (14:53 +0200)]
pinba plugin: pinba_udp_read_callback_fn: Streamlined the function a bit.

14 years agopinba plugin: service_statnode_collect: Coding style changes.
Florian Forster [Fri, 9 Apr 2010 12:50:58 +0000 (14:50 +0200)]
pinba plugin: service_statnode_collect: Coding style changes.

14 years agopinba plugin: Add temporary defines for default address and port.
Florian Forster [Fri, 9 Apr 2010 12:50:16 +0000 (14:50 +0200)]
pinba plugin: Add temporary defines for default address and port.

14 years agoPinba plugin: Add Antony Dovgal as copyright holder.
Florian Forster [Thu, 8 Apr 2010 21:21:52 +0000 (23:21 +0200)]
Pinba plugin: Add Antony Dovgal as copyright holder.

A note stating where the original code was taken from has been added,
too.

14 years agoPinba plugin: Reorder the functions to get the callgraph right.
Florian Forster [Thu, 8 Apr 2010 21:09:36 +0000 (23:09 +0200)]
Pinba plugin: Reorder the functions to get the callgraph right.

This fixes build issues introduced by removing the forward declarations.

14 years agoPinba plugin: Picked some low-hanging fruit.
Florian Forster [Thu, 8 Apr 2010 20:39:09 +0000 (22:39 +0200)]
Pinba plugin: Picked some low-hanging fruit.

Removed includes already included via "collectd.h", moved variable
declarations before function declarations, fixed missing return
statements, and removed void statements.

14 years agoBuild system: Make it possible to (conditionally) build the protobuf stuff.
Florian Forster [Thu, 8 Apr 2010 20:38:11 +0000 (22:38 +0200)]
Build system: Make it possible to (conditionally) build the protobuf stuff.

The dependency for the module is still missing, but I don't know how to
specify that from the top of my head.

14 years agosrc/Makefile.am: Order the plugins alphabetically.
Florian Forster [Thu, 8 Apr 2010 19:52:56 +0000 (21:52 +0200)]
src/Makefile.am: Order the plugins alphabetically.

And add "pinba.proto" to the distribution.

14 years agoBuild system: Check for protoc-c and enable the Pinba plugin if it is found.
Florian Forster [Thu, 8 Apr 2010 19:50:21 +0000 (21:50 +0200)]
Build system: Check for protoc-c and enable the Pinba plugin if it is found.

14 years agoWriting autotools rules for pinba.
Phoenix Kayo [Thu, 8 Apr 2010 07:44:49 +0000 (13:44 +0600)]
Writing autotools rules for pinba.

14 years agoAdd pinba plugin.
Phoenix Kayo [Thu, 8 Apr 2010 06:35:09 +0000 (12:35 +0600)]
Add pinba plugin.

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 7 Apr 2010 09:55:15 +0000 (11:55 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9

14 years agonetwork plugin: Fix a severe memory leak.
Florian Forster [Wed, 7 Apr 2010 09:53:32 +0000 (11:53 +0200)]
network plugin: Fix a severe memory leak.

A couple of bytes were leaked with every encrypted packet received.

14 years agorrdtool plugin: Correctly free the cache when shutting down.
Florian Forster [Wed, 7 Apr 2010 09:41:41 +0000 (11:41 +0200)]
rrdtool plugin: Correctly free the cache when shutting down.

14 years agonetwork plugin: Be more strict when checking the return value of "setsockopt".
Florian Forster [Mon, 5 Apr 2010 14:32:45 +0000 (16:32 +0200)]
network plugin: Be more strict when checking the return value of "setsockopt".

14 years agonetwork plugin: Be more strict when checking the return value of "setsockopt".
Florian Forster [Mon, 5 Apr 2010 14:32:45 +0000 (16:32 +0200)]
network plugin: Be more strict when checking the return value of "setsockopt".

14 years agonetwork plugin: Print a warning when setting the interface on a unicast socket is...
Florian Forster [Mon, 5 Apr 2010 14:32:19 +0000 (16:32 +0200)]
network plugin: Print a warning when setting the interface on a unicast socket is not possible.

14 years agoBuild system: Check for the "if_indextoname" function.
Florian Forster [Mon, 5 Apr 2010 14:22:30 +0000 (16:22 +0200)]
Build system: Check for the "if_indextoname" function.

Use this information rather than hard-coding "if Linux …"

14 years agoBuild system: Check for "struct ip_mreqn".
Florian Forster [Mon, 5 Apr 2010 14:20:34 +0000 (16:20 +0200)]
Build system: Check for "struct ip_mreqn".

Use this rather than hard-coding "if Linux …"

14 years agonetwork plugin: Interface option moved to Server/Listen block
Max Henkel [Fri, 2 Apr 2010 10:41:11 +0000 (12:41 +0200)]
network plugin: Interface option moved to Server/Listen block

Hello list!

On Tue, Mar 09, 2010 at 06:17:35PM +0100, Florian Forster wrote:
[...]
> On Fri, Feb 26, 2010 at 12:49:02PM +0100, Max Henkel wrote:
[...]
> > @@ -2842,6 +2929,8 @@ static int network_config (oconfig_item_t *ci) /* {{{ */
> >        network_config_add_server (child);
> >      else if (strcasecmp ("TimeToLive", child->key) == 0)
> >        network_config_set_ttl (child);
> > +    else if (strcasecmp ("Interface", child->key) == 0)
> > +      network_config_set_interface (child);
> >      else if (strcasecmp ("MaxPacketSize", child->key) == 0)
> >        network_config_set_buffer_size (child);
> >      else if (strcasecmp ("Forward", child->key) == 0)
>
> Starting with the signing and encryption option, we have <Server> and
> <Listen> blocks that take socket specific options. It'd be kind of
> inconsistent with the "TimeToLive" and other options, but maybe adding
> this to those blocks would be even better. It would enable to forward
> data from one multicast group on interface-0 to the *same* multicast
> group on interface-1, which I guess could be useful. But maybe it's an
> academic case, I dunno.. Thoughts, anyone?
[...]

This patch provides the configuration possibility inside the
Server/Listen-block, but I'm unsure if the "int interface" is
located properly inside the sockent_t.

Best regards,

Max

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agonetwork plugin: Bind to device for unicast
Max Henkel [Fri, 2 Apr 2010 10:40:01 +0000 (12:40 +0200)]
network plugin: Bind to device for unicast

Hello list!

On Tue, Mar 09, 2010 at 06:17:35PM +0100, Florian Forster wrote:
[...]
> On Fri, Feb 26, 2010 at 12:49:02PM +0100, Max Henkel wrote:
[...]
> > +           if (! IN_MULTICAST (ntohl (addr->sin_addr.s_addr)))
> > +                   return (0);
>
> Doesn't it make sense to be able to set the interface in unicast mode,
> too? For example if the host has multiple default gateways. The
> socket(7) option "SO_BINDTODEVICE" could be used for this I guess.
[...]

Thus this patch binds the socket to a specific interface for unicast
traffic, too. But, as Sebastian already mentioned, the behaviour is
Linux specific.

Best regards,

Max

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agonetwork plugin: Added Interface option
Max Henkel [Fri, 2 Apr 2010 10:39:19 +0000 (12:39 +0200)]
network plugin: Added Interface option

Hello list!

Again I'm providing an interface option for the network plugin for
the manual selection of an incoming or outgoing interface,
incorporating the changes proposed by Florian and Sebastian.

Please look through it and feedback or suggest new changes! :-)

Best regards,

Max

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoMerge branch 'ff/modbus'
Florian Forster [Mon, 5 Apr 2010 12:10:44 +0000 (14:10 +0200)]
Merge branch 'ff/modbus'

14 years agoREADME: Fix a typo.
Florian Forster [Mon, 5 Apr 2010 12:09:39 +0000 (14:09 +0200)]
README: Fix a typo.

14 years agoREADME: Add information about the modbus plugin.
Florian Forster [Mon, 5 Apr 2010 12:09:06 +0000 (14:09 +0200)]
README: Add information about the modbus plugin.

14 years agoMerge branch 'schmurfy/re_invert'
Florian Forster [Mon, 5 Apr 2010 12:04:18 +0000 (14:04 +0200)]
Merge branch 'schmurfy/re_invert'

14 years agocollectd.conf(5): Document the new "Invert" option …
Florian Forster [Mon, 5 Apr 2010 12:02:59 +0000 (14:02 +0200)]
collectd.conf(5): Document the new "Invert" option …

… of the Regex match.

14 years agoRegex match: Whitespace fixes.
Florian Forster [Mon, 5 Apr 2010 11:56:21 +0000 (13:56 +0200)]
Regex match: Whitespace fixes.

14 years agonow using cf_util_get_boolean
Schmurfy [Wed, 31 Mar 2010 21:41:40 +0000 (23:41 +0200)]
now using cf_util_get_boolean

14 years agoMerge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Florian Forster [Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8

14 years agopostgresql plugin: Relicensed to (2-clause) BSD license.
Sebastian Harl [Tue, 30 Mar 2010 21:01:26 +0000 (23:01 +0200)]
postgresql plugin: Relicensed to (2-clause) BSD license.

All (most?) of PostgreSQL is licensed under a BSD license …

Florian, the only other copyright holder, agreed with this.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agocollectd.conf.in: Change the basename of the Perl plugin to "Collectd::Plugins".
Florian Forster [Wed, 31 Mar 2010 07:06:13 +0000 (09:06 +0200)]
collectd.conf.in: Change the basename of the Perl plugin to "Collectd::Plugins".

14 years agocollectd-perl(5): Fix the synopsis.
Florian Forster [Wed, 31 Mar 2010 07:01:05 +0000 (09:01 +0200)]
collectd-perl(5): Fix the synopsis.

I think this is a left-over from a switch from "Collectd::Plugin" to
"Collectd::Plugins". Thanks to Denis Yagofarov for reporting the bug and
Michael Shigorin for relaying it to me.

14 years agotarget_scale: Fixed a `break strict-aliasing rules' compiler warning.
Sebastian Harl [Tue, 30 Mar 2010 20:55:06 +0000 (22:55 +0200)]
target_scale: Fixed a `break strict-aliasing rules' compiler warning.

… identified by GCC 4.4.3 using -O3.

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 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.