Code

collectd.git
11 years agocollectd.conf(5): Improve markup of the aquaero plugin.
Florian Forster [Sun, 18 Aug 2013 09:13:27 +0000 (11:13 +0200)]
collectd.conf(5): Improve markup of the aquaero plugin.

11 years agoREADME: Add dependency "aerotools-ng".
Florian Forster [Sun, 18 Aug 2013 09:05:42 +0000 (11:05 +0200)]
README: Add dependency "aerotools-ng".

11 years agoaquaero plugin: Use the "complex" configuration.
Florian Forster [Sun, 18 Aug 2013 08:56:28 +0000 (10:56 +0200)]
aquaero plugin: Use the "complex" configuration.

Actually less LOC.

11 years agoaquaero plugin: Some coding style fixes.
Florian Forster [Sun, 18 Aug 2013 08:55:38 +0000 (10:55 +0200)]
aquaero plugin: Some coding style fixes.

* Break long lines.
* Rename temperatures. The type instances are now "sensor", "virtual",
  "software" and "other".
* Rename "flow-flow" to "flow-sensor".

11 years agoconfigure.in: Check for the libaquaero5.o file in "obj/".
Florian Forster [Sun, 18 Aug 2013 08:53:25 +0000 (10:53 +0200)]
configure.in: Check for the libaquaero5.o file in "obj/".

This is what the aerotools-ng Makefile is currently using.

11 years agoaquaero: Fix AC_CHECK configure setting for libaquaero5.
Alex Deymo [Tue, 13 Aug 2013 08:08:18 +0000 (01:08 -0700)]
aquaero: Fix AC_CHECK configure setting for libaquaero5.

11 years agoaquaero: Documentation for aquaero plugin.
Alex Deymo [Tue, 13 Aug 2013 07:29:55 +0000 (00:29 -0700)]
aquaero: Documentation for aquaero plugin.

This patch includes the manpage, smaller config sample file and
the README and AUTHORS description.

11 years agoaquaero: Fix sensor names
Alex Deymo [Tue, 13 Aug 2013 07:10:43 +0000 (00:10 -0700)]
aquaero: Fix sensor names

This patch replaces some sensor names to more reasonable ones.

11 years agoaquaero: New Aquaero sensors plugin
Alex Deymo [Thu, 18 Jul 2013 06:55:58 +0000 (23:55 -0700)]
aquaero: New Aquaero sensors plugin

This plugin adds support for the Aquaero 5 sensors.

11 years agoaquaero: Include aquaero plugin in config files.
Alex Deymo [Thu, 18 Jul 2013 06:54:46 +0000 (23:54 -0700)]
aquaero: Include aquaero plugin in config files.

Adds the aquaero plugin into the build system.

11 years agoMerge remote-tracking branch 'origin/pr/371'
Marc Fournier [Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)]
Merge remote-tracking branch 'origin/pr/371'

11 years agodf: remove trailing whitespaces
Marc Fournier [Wed, 17 Jul 2013 10:05:49 +0000 (12:05 +0200)]
df: remove trailing whitespaces

11 years agodf: rename percentage types to a more generic name
Marc Fournier [Wed, 17 Jul 2013 09:59:57 +0000 (11:59 +0200)]
df: rename percentage types to a more generic name

11 years agoAdd support for incr/decr counts
Blake Matheny [Wed, 6 Feb 2013 12:04:47 +0000 (07:04 -0500)]
Add support for incr/decr counts

11 years agoreplace nginx_{accepts,handled} DSs
Marc Fournier [Mon, 15 Jul 2013 16:01:39 +0000 (18:01 +0200)]
replace nginx_{accepts,handled} DSs

reusing an existing DS is preferred. GH#227.

11 years ago* change nginx plugin for collectd to submit "nginx_accepts" and
Patrick Shan [Thu, 3 Jan 2013 03:58:59 +0000 (14:58 +1100)]
* change nginx plugin for collectd to submit "nginx_accepts" and
* "nginx_handled"

11 years agoadd 2 missing data types for df percentages
Marc Fournier [Mon, 15 Jul 2013 09:11:43 +0000 (11:11 +0200)]
add 2 missing data types for df percentages

11 years agotail plugin: Remove custom string config function.
Florian Forster [Sun, 14 Jul 2013 06:27:31 +0000 (08:27 +0200)]
tail plugin: Remove custom string config function.

11 years agoMerge branch 'ym/limit_write_queue_length'
Florian Forster [Sat, 13 Jul 2013 09:24:39 +0000 (11:24 +0200)]
Merge branch 'ym/limit_write_queue_length'

11 years agoMerge branch 'collectd-5.3'
Florian Forster [Sat, 13 Jul 2013 09:24:27 +0000 (11:24 +0200)]
Merge branch 'collectd-5.3'

Conflicts:
src/plugin.c

11 years agoMerge branch 'collectd-5.2' into collectd-5.3
Florian Forster [Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200)]
Merge branch 'collectd-5.2' into collectd-5.3

11 years agosrc/plugin.c: Some fixes for write limits.
Florian Forster [Sat, 13 Jul 2013 09:19:54 +0000 (11:19 +0200)]
src/plugin.c: Some fixes for write limits.

* Log an error once per second.
* Coding style fixes.
* Separate function for calculating drop probability.

11 years agosrc/configfile.c: Rename options to "WriteQueueLimit{High,Low}".
Florian Forster [Sat, 13 Jul 2013 09:15:01 +0000 (11:15 +0200)]
src/configfile.c: Rename options to "WriteQueueLimit{High,Low}".

The original names are a bit long.

11 years agoFixed a bug with WriteQueueLengthLimitHigh is null/uninitialized
Yves Mettier [Fri, 26 Apr 2013 09:50:18 +0000 (11:50 +0200)]
Fixed a bug with WriteQueueLengthLimitHigh is null/uninitialized

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoFixes for code quality
Yves Mettier [Tue, 26 Mar 2013 17:25:33 +0000 (18:25 +0100)]
Fixes for code quality

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agofixed a bug in doc near new WriteQueueLengthLimit*
Yves Mettier [Thu, 14 Mar 2013 15:57:43 +0000 (16:57 +0100)]
fixed a bug in doc near new WriteQueueLengthLimit*

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoAdded new WriteQueueLengthLimit (drop values when bigger)
Yves Mettier [Thu, 14 Mar 2013 15:45:02 +0000 (16:45 +0100)]
Added new WriteQueueLengthLimit (drop values when bigger)

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/plugin.c: Free the "data_sets" AVL tree.
Florian Forster [Sat, 13 Jul 2013 06:20:28 +0000 (08:20 +0200)]
src/plugin.c: Free the "data_sets" AVL tree.

This pops up every time I investigate memory leaks and it's annoying me.

11 years agowrite_graphite plugin: Don't call close() on invalid file descriptors.
Florian Forster [Sat, 13 Jul 2013 05:46:20 +0000 (07:46 +0200)]
write_graphite plugin: Don't call close() on invalid file descriptors.

11 years agowrite_graphite plugin: Don't call close() on invalid file descriptors.
Florian Forster [Sat, 13 Jul 2013 05:42:18 +0000 (07:42 +0200)]
write_graphite plugin: Don't call close() on invalid file descriptors.

11 years agowrite_graphite plugin: Actually check the return value of wg_send_message().
Florian Forster [Sat, 13 Jul 2013 05:38:05 +0000 (07:38 +0200)]
write_graphite plugin: Actually check the return value of wg_send_message().

Assignment to "status" was missing.

11 years agoMerge branch 'collectd-5.3'
Florian Forster [Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200)]
Merge branch 'collectd-5.3'

Conflicts:
src/collectd.conf.pod

11 years agoMerge branch 'collectd-5.2' into collectd-5.3
Florian Forster [Fri, 12 Jul 2013 16:21:31 +0000 (18:21 +0200)]
Merge branch 'collectd-5.2' into collectd-5.3

11 years agorrdtool, rrdcached plugins: Re-implement value_list_to_filename().
Florian Forster [Fri, 12 Jul 2013 16:19:29 +0000 (18:19 +0200)]
rrdtool, rrdcached plugins: Re-implement value_list_to_filename().

Faster version without snprintf().

11 years agocsv plugin: Re-implement value_list_to_filename().
Florian Forster [Fri, 12 Jul 2013 16:17:19 +0000 (18:17 +0200)]
csv plugin: Re-implement value_list_to_filename().

The new implementation is faster, because it doesn't use snprintf().

11 years agosrc/common.c: Reimplement format_name for performance.
Florian Forster [Thu, 11 Jul 2013 15:58:37 +0000 (17:58 +0200)]
src/common.c: Reimplement format_name for performance.

This is used from uc_update(), i.e. for every value list dispatched, and was
one of the most expensive functions thanks to snprintf().

This reduces total time spent in the format_name() function from 7.78% to 1.89%
during a network stress test.

11 years agoTest for end of oid tree without breaking collection loop.
Pierre-Yves Ritschard [Mon, 8 Jul 2013 07:06:35 +0000 (09:06 +0200)]
Test for end of oid tree without breaking collection loop.

11 years agoMerge branch 'fix-stringio-python2.7' of git://github.com/aelse/collectd
Florian Forster [Wed, 3 Jul 2013 16:21:08 +0000 (18:21 +0200)]
Merge branch 'fix-stringio-python2.7' of git://github.com/aelse/collectd

11 years agoMerge branch 'fix-dstype-ordinal-decode_network_values' of git://github.com/aelse...
Florian Forster [Wed, 3 Jul 2013 09:51:46 +0000 (11:51 +0200)]
Merge branch 'fix-dstype-ordinal-decode_network_values' of git://github.com/aelse/collectd

11 years agoMerge branch 'vbartoni/df'
Florian Forster [Wed, 3 Jul 2013 05:46:40 +0000 (07:46 +0200)]
Merge branch 'vbartoni/df'

11 years agodf plugin: Remove trailing white space.
Florian Forster [Wed, 3 Jul 2013 05:46:15 +0000 (07:46 +0200)]
df plugin: Remove trailing white space.

11 years agofixes StringIO unicode handling in python 2.7
Alexander Else [Mon, 1 Jul 2013 07:02:19 +0000 (17:02 +1000)]
fixes StringIO unicode handling in python 2.7

11 years agodecode_network_values dstype is ordinal value of string literal
Alexander Else [Mon, 1 Jul 2013 06:17:12 +0000 (16:17 +1000)]
decode_network_values dstype is ordinal value of string literal

11 years agocollectd-threshold(5): Correct the description of the "Interesting" config option.
Florian Forster [Tue, 18 Jun 2013 15:25:46 +0000 (17:25 +0200)]
collectd-threshold(5): Correct the description of the "Interesting" config option.

11 years agothreshold plugin: Fix the "Interesting" configuration option.
Björn [Tue, 18 Jun 2013 14:43:46 +0000 (16:43 +0200)]
threshold plugin: Fix the "Interesting" configuration option.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'feature-write_graphite-udp' of git://github.com/jjmaestro/collectd
Florian Forster [Tue, 18 Jun 2013 06:14:59 +0000 (08:14 +0200)]
Merge branch 'feature-write_graphite-udp' of git://github.com/jjmaestro/collectd

11 years agowrite_graphite plugin: avoid flooding the log with the protocol error check
J. Javier Maestro [Sun, 16 Jun 2013 17:37:32 +0000 (19:37 +0200)]
write_graphite plugin: avoid flooding the log with the protocol error check

Moving the protocol error checking from `wg_callback_init` to `wg_config_node`.
This avoids flooding the log, as suggested by Florian Forster (@octo).

11 years agowrite_graphite plugin: config should fail on error
J. Javier Maestro [Sun, 16 Jun 2013 16:05:53 +0000 (18:05 +0200)]
write_graphite plugin: config should fail on error

This is the preferred way of handling config, as it can be seen in snmp.c. It's
important to fail on a config error to simplify code in other callbacks.

11 years agoUnbreak type_inst value in collectd psql view.
Bernd Ahlers [Mon, 10 Jun 2013 13:48:14 +0000 (15:48 +0200)]
Unbreak type_inst value in collectd psql view.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoFix typo
Cyril Plisko [Sun, 9 Jun 2013 16:11:04 +0000 (19:11 +0300)]
Fix typo

recive -> receive

11 years agoPlugin df - reporting both percentage and absolute values
Vedran Bartonicek [Thu, 6 Jun 2013 09:23:19 +0000 (12:23 +0300)]
Plugin df - reporting both percentage and absolute values

11 years agowrite_graphite plugin: Adding myself to AUTHORS :)
J. Javier Maestro [Mon, 3 Jun 2013 17:32:56 +0000 (19:32 +0200)]
write_graphite plugin: Adding myself to AUTHORS :)

11 years agoMerge branch 'xl/zfs'
Florian Forster [Tue, 4 Jun 2013 06:42:25 +0000 (08:42 +0200)]
Merge branch 'xl/zfs'

11 years agozfs_arc plugin: Fix indentation.
Florian Forster [Tue, 4 Jun 2013 06:36:10 +0000 (08:36 +0200)]
zfs_arc plugin: Fix indentation.

11 years agozfs_arc plugin: Use a buffer with fixed size rather than allocating on the heap.
Florian Forster [Tue, 4 Jun 2013 06:35:09 +0000 (08:35 +0200)]
zfs_arc plugin: Use a buffer with fixed size rather than allocating on the heap.

The key length is very predicable, so buffer length is not a problem.

11 years agozfs_arc plugin: Add copyright information for Xin Li.
Florian Forster [Tue, 4 Jun 2013 06:11:26 +0000 (08:11 +0200)]
zfs_arc plugin: Add copyright information for Xin Li.

11 years agowrite_graphite plugin: Adding LogSendErrors to docs, README, etc.
J. Javier Maestro [Mon, 3 Jun 2013 17:31:48 +0000 (19:31 +0200)]
write_graphite plugin: Adding LogSendErrors to docs, README, etc.

11 years agowrite_graphite plugin: Adding LogSendErrors boolean flag
J. Javier Maestro [Mon, 3 Jun 2013 17:24:38 +0000 (19:24 +0200)]
write_graphite plugin: Adding LogSendErrors boolean flag

Sometimes we don't want to hog the syslog with errors that are produced
when the graphite server is down.

Especially for UDP, we want to be able to truly fire-and-forget
(remember to monitor UDP packet receipt failures though :) and having
errors written to the syslog is a burden that should be avoided.

11 years agowrite_graphite plugin: Adding UDP support to docs, README, etc.
J. Javier Maestro [Mon, 3 Jun 2013 17:04:29 +0000 (19:04 +0200)]
write_graphite plugin: Adding UDP support to docs, README, etc.

11 years agowrite_graphite plugin: Adding TCP/UDP support via config
J. Javier Maestro [Mon, 3 Jun 2013 17:03:44 +0000 (19:03 +0200)]
write_graphite plugin: Adding TCP/UDP support via config

UDP allows to "fire-and-forget" data while not bringing the servers down
due to TCP's connection oriented overhead.

The new versions of Graphite support both TCP and UDP streams so it made
sense to add UDP support.

11 years agowrite_riemann plugin: Implement the "TTLFactor" option.
Florian Forster [Mon, 3 Jun 2013 07:07:15 +0000 (09:07 +0200)]
write_riemann plugin: Implement the "TTLFactor" option.

Github: #336

11 years agoMerge branch 'yaccz/curl-status'
Florian Forster [Sat, 1 Jun 2013 07:25:28 +0000 (09:25 +0200)]
Merge branch 'yaccz/curl-status'

11 years agoMerge branch 'vb/df'
Florian Forster [Sat, 1 Jun 2013 07:25:19 +0000 (09:25 +0200)]
Merge branch 'vb/df'

11 years agocurl plugin: Fix compiler warning.
Florian Forster [Sat, 1 Jun 2013 07:23:04 +0000 (09:23 +0200)]
curl plugin: Fix compiler warning.

The compiler thinks the "start" variable may be used uninitialized.

11 years agocollectd.conf(5): Minor fixes.
Florian Forster [Sat, 1 Jun 2013 07:20:59 +0000 (09:20 +0200)]
collectd.conf(5): Minor fixes.

11 years agodf plugin: Rename the percent metrics.
Florian Forster [Sat, 1 Jun 2013 07:19:07 +0000 (09:19 +0200)]
df plugin: Rename the percent metrics.

* Change type to "percent".
* Use "<disk>-bytes" and "<disk>-inodes" as plugin instance. This way we're
  able to use "percent" for both.
* Remove one level of indentation.
* Make casting more explicit (e.g. don't divide a float by a size_t).

11 years agodf plugin: Remove trailing whitespace.
Florian Forster [Fri, 31 May 2013 16:18:40 +0000 (18:18 +0200)]
df plugin: Remove trailing whitespace.

And fix indentation.

11 years agoPlugin df: ReportPercentage
Vedran Bartonicek [Fri, 31 May 2013 10:40:59 +0000 (13:40 +0300)]
Plugin df: ReportPercentage

11 years agoPlugin df free space as percentage.
Vedran Bartonicek [Mon, 27 May 2013 19:42:08 +0000 (22:42 +0300)]
Plugin df free space as percentage.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoImplement ARC data collection on FreeBSD.
Xin Li [Thu, 30 May 2013 18:25:09 +0000 (11:25 -0700)]
Implement ARC data collection on FreeBSD.

11 years agoMerge branch 'collectd-5.2' into collectd-5.3
Florian Forster [Thu, 30 May 2013 07:00:09 +0000 (09:00 +0200)]
Merge branch 'collectd-5.2' into collectd-5.3

11 years agosrc/configfile.c: Let errors in included files propagate up to cf_read().
Florian Forster [Thu, 30 May 2013 06:58:06 +0000 (08:58 +0200)]
src/configfile.c: Let errors in included files propagate up to cf_read().

cf_read_generic() returned NULL in two cases: Unable to read file and
file was empty. Since we wanted to allow empty includes, the "include
file with errors" case was not handled properly.

Github: #323

11 years agocontrib/redhat/init.d-collectd: Rename variable to …PIDDIR.
Florian Forster [Thu, 30 May 2013 06:26:09 +0000 (08:26 +0200)]
contrib/redhat/init.d-collectd: Rename variable to …PIDDIR.

Github: #298

11 years agoallow for non-root user to run script.
Fabien Wernli [Thu, 11 Apr 2013 08:43:29 +0000 (10:43 +0200)]
allow for non-root user to run script.
As collectdmon handles its pidfile, this would require to change
COLLECTMONPIDIR to something else than only-root writeable /var/run

Change-Id: I45d2de9dcc976f3b1e18cef5b6b78eeca1d270b2
Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'collectd-4.10' into collectd-5.2
Florian Forster [Thu, 30 May 2013 06:10:42 +0000 (08:10 +0200)]
Merge branch 'collectd-4.10' into collectd-5.2

11 years agoDon't notify continuously when MySQL slave SQL thread is running
Joaquín Cuenca Abela [Wed, 29 May 2013 14:22:09 +0000 (16:22 +0200)]
Don't notify continuously when MySQL slave SQL thread is running

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoAdd "=encoding" header to all manual pages.
Florian Forster [Wed, 29 May 2013 07:26:28 +0000 (09:26 +0200)]
Add "=encoding" header to all manual pages.

http://bugs.debian.org/708718

11 years agoMerge branch 'yaccz/curl-status'
Florian Forster [Sun, 26 May 2013 15:35:17 +0000 (17:35 +0200)]
Merge branch 'yaccz/curl-status'

11 years agocurl plugin: Use cdtime to calculate response times.
Florian Forster [Sun, 26 May 2013 15:34:07 +0000 (17:34 +0200)]
curl plugin: Use cdtime to calculate response times.

11 years agocurl plugin: Don't abort when reading the response code failed.
Florian Forster [Sun, 26 May 2013 15:28:13 +0000 (17:28 +0200)]
curl plugin: Don't abort when reading the response code failed.

11 years agocurl plugin: Remove the curl-only auxiliary configuration functions.
Florian Forster [Sun, 26 May 2013 15:23:42 +0000 (17:23 +0200)]
curl plugin: Remove the curl-only auxiliary configuration functions.

11 years agocurl plugin: Fix compile issue (long vs. long*).
Florian Forster [Sun, 26 May 2013 15:22:48 +0000 (17:22 +0200)]
curl plugin: Fix compile issue (long vs. long*).

11 years agoexec plugin: Document that defaulting to PUTVAL is no longer done
Dan Fandrich [Tue, 14 May 2013 21:58:40 +0000 (23:58 +0200)]
exec plugin: Document that defaulting to PUTVAL is no longer done

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'more-varnish-stats'
Florian Forster [Sat, 25 May 2013 18:20:48 +0000 (20:20 +0200)]
Merge branch 'more-varnish-stats'

11 years agoMerge branch 'document-varnish-instance-block' into collectd-5.2
Florian Forster [Sat, 25 May 2013 18:15:59 +0000 (20:15 +0200)]
Merge branch 'document-varnish-instance-block' into collectd-5.2

11 years agomodbus plugin: Refactor the new reconnection code.
Florian Forster [Sat, 25 May 2013 09:15:29 +0000 (11:15 +0200)]
modbus plugin: Refactor the new reconnection code.

Avoid the goto() and switch() statements.

Github: #294

11 years agoCleanup modbus connection if wrong result
Fabien Wernli [Tue, 15 May 2012 11:59:10 +0000 (13:59 +0200)]
Cleanup modbus connection if wrong result

Change-Id: I1b7520442d7663d5bc2529369e27e3e858fe2168
Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoFix modbus segfault / New strategy for connecting
Stefan Nickl [Sat, 28 Jan 2012 18:21:10 +0000 (19:21 +0100)]
Fix modbus segfault / New strategy for connecting

The previous implementation had a reconnection loop which should not
really be necessary. Idea tried here is to check if connection is alive,
and establish it if not. Change was begun because previously connection
would only be attempted as a retry, so on first pass a NULL was handed to
libmodbus which caused segmentation faults reproducibly.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/configfile.c: Add the "AutoLoadPlugin" option.
Florian Forster [Sat, 25 May 2013 08:57:58 +0000 (10:57 +0200)]
src/configfile.c: Add the "AutoLoadPlugin" option.

When enabled, <Plugin ...> blocks will automatically load plugins.
Thanks to Tim Bunce for suggesting this!

Github: #333

11 years agosrc/plugin.c: Fix a comment regarding duplicate plugin_load() calls.
Florian Forster [Sat, 25 May 2013 08:32:23 +0000 (10:32 +0200)]
src/plugin.c: Fix a comment regarding duplicate plugin_load() calls.

11 years agosrc/plugin.c: Move the perl and python "global" magic to plugin_load().
Florian Forster [Sat, 25 May 2013 08:31:54 +0000 (10:31 +0200)]
src/plugin.c: Move the perl and python "global" magic to plugin_load().

The config file handling is really not the best place to have this. Also,
the feature I'm working on would have to copy this magic if left in the
config code, and I *really* don't want that.

11 years agocollectd.conf(5): Document the new "LoadPlugin" behavior.
Florian Forster [Sat, 25 May 2013 07:58:46 +0000 (09:58 +0200)]
collectd.conf(5): Document the new "LoadPlugin" behavior.

Github: #333

11 years agosrc/plugin.c: Make plugin_load() idempotent, i.e. don't load plugins twice.
Florian Forster [Sat, 25 May 2013 07:46:36 +0000 (09:46 +0200)]
src/plugin.c: Make plugin_load() idempotent, i.e. don't load plugins twice.

Previously, multiple 'LoadPlugin "foo"' lines would dlopen the same .so file
twice and call its module_register function twice. This would eventually result
in complaints about callbacks with the same name being registered. With this
patch each plugin is only loaded only once, allowing people to write "self
contained" configuration segments.

Thanks to Tim Bunce for suggesting this!

Github: #333

11 years agoMerge branch 'ef/mic'
Florian Forster [Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)]
Merge branch 'ef/mic'

11 years agoREADME: Document power consumption being collected by the mic plugin.
Florian Forster [Fri, 17 May 2013 14:45:30 +0000 (16:45 +0200)]
README: Document power consumption being collected by the mic plugin.

11 years agomic plugin: Fix indentation issue.
Florian Forster [Fri, 17 May 2013 14:44:02 +0000 (16:44 +0200)]
mic plugin: Fix indentation issue.

11 years agomic plugin: Change the name of the power settings …
Florian Forster [Fri, 17 May 2013 14:26:23 +0000 (16:26 +0200)]
mic plugin: Change the name of the power settings …

… to reflec the names documented in the manpage.

11 years agovarnish plugin: update config docs for new collectors
Nick Stenning [Fri, 17 May 2013 12:04:59 +0000 (13:04 +0100)]
varnish plugin: update config docs for new collectors

11 years agovarnish: hint about missing <Instance> block
Marc Fournier [Fri, 17 May 2013 11:13:43 +0000 (13:13 +0200)]
varnish: hint about missing <Instance> block

The warning when the Collect* configuration options where used outside
of an <Instance> block was confusing. This patch warns the user the same
way the apache plugin does.

11 years agoImprove varnish section in manpage.
Marc Fournier [Fri, 17 May 2013 10:54:16 +0000 (12:54 +0200)]
Improve varnish section in manpage.

There previously was no mention of the mandatory <Instance> block.