Code

collectd.git
14 years agoMerge branch 'collectd-4.9' into collectd-4.10
Sven Trenkel [Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
src/python.c

14 years agoMerge remote branch 'origin/collectd-4.9' into collectd-4.9
Florian Forster [Wed, 19 May 2010 08:47:58 +0000 (10:47 +0200)]
Merge remote branch 'origin/collectd-4.9' into collectd-4.9

14 years agoconfigure.in: htonll check depends on linker
Max Henkel [Tue, 4 May 2010 21:39:18 +0000 (23:39 +0200)]
configure.in: htonll check depends on linker

Fixing a cross-compile issue by depending only on a linker check.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agopython: Fixed some memory leaks in the write and notification callbacks.
Sven Trenkel [Sat, 15 May 2010 20:36:25 +0000 (22:36 +0200)]
python: Fixed some memory leaks in the write and notification callbacks.
Thanks to Volkmar Uhlig for the hint.

14 years agopython: Fixed a crash if the plugin was loaded but not configured.
Sven Trenkel [Mon, 3 May 2010 13:01:56 +0000 (15:01 +0200)]
python: Fixed a crash if the plugin was loaded but not configured.

14 years agosrc/Makefile.am: Fix building / packaging without the Pinba plugin.
Florian Forster [Mon, 3 May 2010 07:47:42 +0000 (09:47 +0200)]
src/Makefile.am: Fix building / packaging without the Pinba plugin.

Getting the dependency right on generated sources wasn't quite as easy as I
hoped.

14 years agocollectd-python(5): Fix POD syntax error.
Florian Forster [Mon, 3 May 2010 07:34:27 +0000 (09:34 +0200)]
collectd-python(5): Fix POD syntax error.

14 years agorrdtool plugin: Degrade a less than helpful warning to a debug message.
Florian Forster [Mon, 3 May 2010 07:23:55 +0000 (09:23 +0200)]
rrdtool plugin: Degrade a less than helpful warning to a debug message.

14 years agopython plugin: Disable strict aliasing.
Florian Forster [Mon, 3 May 2010 07:22:39 +0000 (09:22 +0200)]
python plugin: Disable strict aliasing.

"Py_True" and "Py_False" have some weird implementation that GCC can't cope
with. Disable strict aliasing (and warnings relating to it) in order to avoid
those problems at the cost of optimization.

14 years agopython plugin: Remove "const" of usage strings.
Florian Forster [Mon, 3 May 2010 07:21:45 +0000 (09:21 +0200)]
python plugin: Remove "const" of usage strings.

The struct member isn't const, resulting in a warning.

14 years agoChangeLog: Add attribution for the Pinba plugin.
Florian Forster [Sat, 1 May 2010 13:17:52 +0000 (15:17 +0200)]
ChangeLog: Add attribution for the Pinba plugin.

14 years agosrc/Makefile.am: Fix build-dependencies for the pinba plugin. collectd-4.10.0
Florian Forster [Sat, 1 May 2010 09:14:32 +0000 (11:14 +0200)]
src/Makefile.am: Fix build-dependencies for the pinba plugin.

Using BUILT_SOURCES, pinba.pb-c.[ch] are built *before* the regular
build step.

14 years agoversion-gen.sh: Bump version to 4.10.0.
Florian Forster [Sat, 1 May 2010 09:03:47 +0000 (11:03 +0200)]
version-gen.sh: Bump version to 4.10.0.

14 years agoMerge remote branch 'powdahound/master'
Florian Forster [Sat, 1 May 2010 09:02:57 +0000 (11:02 +0200)]
Merge remote branch 'powdahound/master'

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Sat, 1 May 2010 09:00:26 +0000 (11:00 +0200)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Sat, 1 May 2010 09:00:22 +0000 (11:00 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9

14 years agoChangeLog: Add the pinba plugin.
Florian Forster [Sat, 1 May 2010 08:56:29 +0000 (10:56 +0200)]
ChangeLog: Add the pinba plugin.

14 years agoREADME: Added the pinba plugin and its dependency.
Florian Forster [Sat, 1 May 2010 08:55:22 +0000 (10:55 +0200)]
README: Added the pinba plugin and its dependency.

14 years agoAUTHORS: Added "Phoenix Kayo".
Florian Forster [Sat, 1 May 2010 08:55:10 +0000 (10:55 +0200)]
AUTHORS: Added "Phoenix Kayo".

14 years agoMerge branch 'ka/pinba'
Florian Forster [Sat, 1 May 2010 08:49:45 +0000 (10:49 +0200)]
Merge branch 'ka/pinba'

14 years agoChangeLog: Updated for version 4.10.0.
Florian Forster [Sat, 1 May 2010 08:47:05 +0000 (10:47 +0200)]
ChangeLog: Updated for version 4.10.0.

14 years agorouteros plugin: Removed some "FIXME"s that no longer need fixing.
Florian Forster [Sat, 1 May 2010 08:12:43 +0000 (10:12 +0200)]
routeros plugin: Removed some "FIXME"s that no longer need fixing.

14 years agorrdcached.c needs to include rrd.h
Thorsten von Eicken [Sat, 1 May 2010 08:03:15 +0000 (10:03 +0200)]
rrdcached.c needs to include rrd.h

14 years agoBuild system: Check for "strtok_r" availability with "-Wall -Werror" when using GCC.
Florian Forster [Sat, 1 May 2010 07:53:12 +0000 (09:53 +0200)]
Build system: Check for "strtok_r" availability with "-Wall -Werror" when using GCC.

Previously, the check was done without "-Werror" which resulted in a
warning and success. When the daemon was later built with "-Werror" set,
that warning would result in an error and abort the build.

Thanks to Aurélien Reynaud for reporting the problem.

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Sat, 1 May 2010 07:36:08 +0000 (09:36 +0200)]
Merge branch 'collectd-4.9'

Conflicts:
configure.in

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Sat, 1 May 2010 07:35:01 +0000 (09:35 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9

14 years agoconfigure.in: Put conditionals around <inttypes.h>, too, for consistency's sake.
Florian Forster [Thu, 29 Apr 2010 07:57:18 +0000 (09:57 +0200)]
configure.in: Put conditionals around <inttypes.h>, too, for consistency's sake.

14 years agoSolaris 8 fixes: Check for <stdint.h> before inclusion.
Aurélien Reynaud [Thu, 29 Apr 2010 07:39:48 +0000 (09:39 +0200)]
Solaris 8 fixes: Check for <stdint.h> before inclusion.

14 years agoSolaris 8 fixes: Fall back to putenv(3).
Aurélien Reynaud [Thu, 29 Apr 2010 07:37:57 +0000 (09:37 +0200)]
Solaris 8 fixes: Fall back to putenv(3).

14 years agocollectd-nagios.c: Output performance data with the "%f" format string.
Florian Forster [Sun, 25 Apr 2010 13:32:50 +0000 (15:32 +0200)]
collectd-nagios.c: Output performance data with the "%f" format string.

Apparently the parser used by nagios is dumb as bread. Thanks to Lao Wai
for pointing this out. For more information, see:
<http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201>

14 years agosrc/collectd.c: Fix initialization of the "timeout_g" variable.
Florian Forster [Sun, 25 Apr 2010 12:46:44 +0000 (14:46 +0200)]
src/collectd.c: Fix initialization of the "timeout_g" variable.

The default value is "2", not "10".

14 years agocollectd.conf(5): Document the "Timeout" option.
Florian Forster [Sun, 25 Apr 2010 12:45:05 +0000 (14:45 +0200)]
collectd.conf(5): Document the "Timeout" option.

14 years agoTimeout for missing values
Andrés J. Díaz [Thu, 17 Dec 2009 22:21:14 +0000 (23:21 +0100)]
Timeout for missing values

Hi!

I attach here a patch which adds Timeout option in configuration file.
This option is global (i.e. at the same level as Interval) and it's
the max number of intervals that a package can be missed before a
missing notification would be raised. By dafault collectd wait 2
intervals and it's a hardcoded value AFAIK, if plugin cannot get data
for more than 2 intervals, then (if it's an interesting value),
collectd send a missing notification. Setting Timeout to an high value
you can be more tolerant with that missing.

It's usefull on large networks. In my case, the company LAN is
distributed on distant locations and sometimes (due to network issues)
UDP packages are lost, I use the Timeout to be more tolerant to this
networks fails. For example setting Internval to 10 and Timeout to 6,
a  missing notification will be raised only if none data was reported
in last 60s.

I hope that things explained well enough, and (who knows!) maybe this
could be usefull to anybody ;)

Regards,
  Andrés

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agopython plugin: Try to work around a "dereferencing type-punned pointer" warning.
Florian Forster [Fri, 23 Apr 2010 07:44:44 +0000 (09:44 +0200)]
python plugin: Try to work around a "dereferencing type-punned pointer" warning.

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Thu, 22 Apr 2010 09:29:19 +0000 (11:29 +0200)]
Merge branch 'collectd-4.9'

14 years agoBumped version to 4.9.2; Updated ChangeLog. collectd-4.9.2
Florian Forster [Thu, 22 Apr 2010 09:28:19 +0000 (11:28 +0200)]
Bumped version to 4.9.2; Updated ChangeLog.

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Thu, 22 Apr 2010 09:14:25 +0000 (11:14 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog

14 years agoBumped version to 4.8.5; Updated ChangeLog. collectd-4.8.5
Florian Forster [Thu, 22 Apr 2010 09:06:16 +0000 (11:06 +0200)]
Bumped version to 4.8.5; Updated ChangeLog.

14 years agoMerge remote branch 'trenkel/st/python'
Florian Forster [Thu, 22 Apr 2010 08:45:58 +0000 (10:45 +0200)]
Merge remote branch 'trenkel/st/python'

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 21 Apr 2010 17:04:01 +0000 (19:04 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog

14 years agopython: Added documentation and an example on how to handle SIGCHLD.
Sven Trenkel [Wed, 21 Apr 2010 16:26:55 +0000 (18:26 +0200)]
python: Added documentation and an example on how to handle SIGCHLD.

14 years agopython: Fix a metadata memleak and a missing include (for some versions of python)
Sven Trenkel [Wed, 21 Apr 2010 16:12:19 +0000 (18:12 +0200)]
python: Fix a metadata memleak and a missing include (for some versions of python)

14 years agosrc/plugin.c: plugin_log: Append newline to message …
Florian Forster [Wed, 21 Apr 2010 14:23:46 +0000 (16:23 +0200)]
src/plugin.c: plugin_log: Append newline to message …

… even when no log-plugin was loaded.

14 years agomodbus plugin: Adapt for the new "plugin_register_complex_read" interface.
Florian Forster [Wed, 21 Apr 2010 14:22:42 +0000 (16:22 +0200)]
modbus plugin: Adapt for the new "plugin_register_complex_read" interface.

14 years agonetwork plugin: Don't access values in an already freed array.
Florian Forster [Wed, 21 Apr 2010 14:19:53 +0000 (16:19 +0200)]
network plugin: Don't access values in an already freed array.

14 years agocontrib/exec-nagios.px: Whitespace and POD fixes.
Florian Forster [Mon, 19 Apr 2010 11:05:15 +0000 (13:05 +0200)]
contrib/exec-nagios.px: Whitespace and POD fixes.

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 agonetwork plugin: Add the "network:username" meta data.
Florian Forster [Thu, 8 Apr 2010 19:36:06 +0000 (21:36 +0200)]
network plugin: Add the "network:username" meta data.

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 agoBumped version to 4.8.2; Updated ChangeLog. collectd-4.8.4
Florian Forster [Wed, 7 Apr 2010 10:55:03 +0000 (12:55 +0200)]
Bumped version to 4.8.2; Updated ChangeLog.

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