collectd.git
7 years agomemcached: Fix CPU usage reporting
Pavel Rochnyack [Mon, 9 Oct 2017 10:22:00 +0000 (17:22 +0700)]
memcached: Fix CPU usage reporting

7 years agostyle
Wilfried Goesgens [Sun, 8 Oct 2017 11:52:15 +0000 (13:52 +0200)]
style

7 years agoCurrently curl_json will barely ignore boolean values in a non erroneous
Wilfried Goesgens [Sat, 7 Oct 2017 19:14:46 +0000 (21:14 +0200)]
Currently curl_json will barely ignore boolean values in a non erroneous
way, so that if you have an array like this:
you will be able to access the 123 number like

We now rather call our number parser with 0 for false, 1 for true.

7 years agoMerge remote-tracking branch 'github/pr/2469'
Florian Forster [Fri, 6 Oct 2017 13:33:29 +0000 (15:33 +0200)]
Merge remote-tracking branch 'github/pr/2469'

7 years agoMerge remote-tracking branch 'github/pr/2453'
Florian Forster [Fri, 6 Oct 2017 13:32:01 +0000 (15:32 +0200)]
Merge remote-tracking branch 'github/pr/2453'

7 years agoMerge remote-tracking branch 'github/pr/2398'
Florian Forster [Fri, 6 Oct 2017 12:50:06 +0000 (14:50 +0200)]
Merge remote-tracking branch 'github/pr/2398'

7 years agolibcollectdclient/network_parse.c: Ensure memory allocated in parse_values() is alway...
Florian Forster [Fri, 6 Oct 2017 12:45:05 +0000 (14:45 +0200)]
libcollectdclient/network_parse.c: Ensure memory allocated in parse_values() is always freed.

Shoutout to scan-build for finding this one!

7 years agoMerge remote-tracking branch 'github/pr/2091'
Florian Forster [Fri, 6 Oct 2017 11:14:01 +0000 (13:14 +0200)]
Merge remote-tracking branch 'github/pr/2091'

7 years agoipmi: Run code through clang-format
Mytnyk, Volodymyr [Thu, 5 Oct 2017 15:12:42 +0000 (16:12 +0100)]
ipmi: Run code through clang-format

Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
7 years agoipmi: Addressed review comments
Mytnyk, Volodymyr [Thu, 5 Oct 2017 13:44:14 +0000 (14:44 +0100)]
ipmi: Addressed review comments

Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
7 years agoMerge branch 'collectd-5.7'
Florian Forster [Fri, 6 Oct 2017 07:50:40 +0000 (09:50 +0200)]
Merge branch 'collectd-5.7'

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Fri, 6 Oct 2017 07:50:06 +0000 (09:50 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agoBump version to 5.6.3; Update ChangeLog. collectd-5.6.3
Florian Forster [Fri, 6 Oct 2017 06:53:37 +0000 (08:53 +0200)]
Bump version to 5.6.3; Update ChangeLog.

7 years agoMerge remote-tracking branch 'github/pr/2466' into collectd-5.7
Florian Forster [Fri, 6 Oct 2017 05:26:57 +0000 (07:26 +0200)]
Merge remote-tracking branch 'github/pr/2466' into collectd-5.7

7 years agointel_pmu: address PR comments
Serhiy Pshyk [Fri, 6 Oct 2017 01:24:11 +0000 (02:24 +0100)]
intel_pmu: address PR comments

Signed-off-by: Serhiy Pshyk <serhiyx.pshyk@intel.com>
7 years agowrite_prometheus plugin: Don't construct struct sockaddr_in6 manually.
Florian Forster [Thu, 5 Oct 2017 20:17:46 +0000 (22:17 +0200)]
write_prometheus plugin: Don't construct struct sockaddr_in6 manually.

On FreeBSD, the struct is an incomplete type.

7 years agowrite_prometheus plugin: Add support for libmicrohttpd < 0.9.0.
Florian Forster [Thu, 5 Oct 2017 18:17:21 +0000 (20:17 +0200)]
write_prometheus plugin: Add support for libmicrohttpd < 0.9.0.

0.9.0 was released in July 2010, yet Precise, which we're still building for,
ships 0.4.6. *sigh*

7 years agowrite_prometheus plugin: Fall back to IPv4 socket if IPv6 fails.
Florian Forster [Thu, 5 Oct 2017 13:23:28 +0000 (15:23 +0200)]
write_prometheus plugin: Fall back to IPv4 socket if IPv6 fails.

Unfortunately, for libmicrohttpd "dual stack" means "enforce IPv6 (but
allow IPv4, too)". That means that on systems without IPv6,
libmicrohttpd'd initialization fails (when the dual stack flag is set).
To work around this limitation we open the socket ourselves and pass it
to libmicrohttpd to use.

Fixes: #2149

7 years agointel_pmu: refactor pmu_event_get_meta function.
Kim Jones [Thu, 5 Oct 2017 05:54:55 +0000 (06:54 +0100)]
intel_pmu: refactor pmu_event_get_meta function.

Signed-off-by: Serhiy Pshyk <serhiyx.pshyk@intel.com>
7 years agoceph plugin: Fix comment typo.
Florian Forster [Wed, 4 Oct 2017 20:29:28 +0000 (22:29 +0200)]
ceph plugin: Fix comment typo.

7 years agoMerge remote-tracking branch 'github/pr/1558'
Florian Forster [Wed, 4 Oct 2017 18:25:20 +0000 (20:25 +0200)]
Merge remote-tracking branch 'github/pr/1558'

7 years agocurl_xml: Use of xmlFree() for values returned by xmlNodeGetContent()
Pavel Rochnyack [Wed, 4 Oct 2017 16:59:46 +0000 (23:59 +0700)]
curl_xml: Use of xmlFree() for values returned by xmlNodeGetContent()

7 years agocurl_xml: Fixed issues found by review
Pavel Rochnyack [Wed, 4 Oct 2017 16:35:58 +0000 (23:35 +0700)]
curl_xml: Fixed issues found by review

7 years agovarnish plugin: Metrics with invalid data source type. #2462
Denes Matetelki [Mon, 2 Oct 2017 08:37:20 +0000 (10:37 +0200)]
varnish plugin: Metrics with invalid data source type. #2462

7 years agocurl_xml: Updated documentation and default configuration
Pavel Rochnyack [Sat, 30 Sep 2017 13:00:20 +0000 (20:00 +0700)]
curl_xml: Updated documentation and default configuration

7 years agocurl_xml: Code cleanup and fixes
Pavel Rochnyack [Sat, 30 Sep 2017 12:38:15 +0000 (19:38 +0700)]
curl_xml: Code cleanup and fixes

* XPath list creation moved from cx_config_add_xpath() to cx_config_add_url()
* Added missing check for ValuesFrom option presence
* Added missing check for strdup() result
* Removed excessive check for option name in cx_config_add_url()

7 years agocollectd.spec: bzip2 is the default
Ruben Kerkhof [Sat, 30 Sep 2017 12:02:15 +0000 (14:02 +0200)]
collectd.spec: bzip2 is the default

7 years agocurl_xml: Removed excessive operation
Pavel Rochnyack [Sat, 30 Sep 2017 11:10:39 +0000 (18:10 +0700)]
curl_xml: Removed excessive operation

7 years agocurl_xml: Refactored via cx_get_text_node_value()
Pavel Rochnyack [Sat, 30 Sep 2017 09:37:44 +0000 (16:37 +0700)]
curl_xml: Refactored via cx_get_text_node_value()

7 years agocurl_xml: Code cleanup, clang-format
Pavel Rochnyack [Sat, 30 Sep 2017 07:02:22 +0000 (14:02 +0700)]
curl_xml: Code cleanup, clang-format

7 years agocurl_xml: Renamed 'PluginName' option to unified 'Plugin'.
Pavel Rochnyack [Mon, 19 Sep 2016 09:22:36 +0000 (15:22 +0600)]
curl_xml: Renamed 'PluginName' option to unified 'Plugin'.

7 years agocurl_xml: Changed documentation to match proposed changes.
Pavel Rochnyack [Wed, 24 Feb 2016 15:38:30 +0000 (22:38 +0700)]
curl_xml: Changed documentation to match proposed changes.

7 years agocurl_xml: Add ability to set plugin instance from XML data.
Pavel Rochnyack [Wed, 24 Feb 2016 13:20:42 +0000 (20:20 +0700)]
curl_xml: Add ability to set plugin instance from XML data.

7 years agocurl_xml: Add ability to set custom plugin name in collected data.
Pavel Rochnyack [Wed, 24 Feb 2016 13:20:27 +0000 (20:20 +0700)]
curl_xml: Add ability to set custom plugin name in collected data.

7 years agoUpdating the varnish plugin to use varnish-plus counters (mainly MSE)
Denes Matetelki [Fri, 22 Sep 2017 15:25:04 +0000 (17:25 +0200)]
Updating the varnish plugin to use varnish-plus counters (mainly MSE)

7 years agoMerge branch 'pr/2454'
Florian Forster [Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)]
Merge branch 'pr/2454'

7 years agoprocesses plugin: Format with clang-format.
Florian Forster [Fri, 29 Sep 2017 14:24:31 +0000 (16:24 +0200)]
processes plugin: Format with clang-format.

Also a small manpage formatting tweak.

7 years agoMerge branch 'collectd-5.7'
Florian Forster [Fri, 29 Sep 2017 11:08:25 +0000 (13:08 +0200)]
Merge branch 'collectd-5.7'

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Fri, 29 Sep 2017 11:05:26 +0000 (13:05 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agouse existing type to publish the data
Wilfried Goesgens [Fri, 29 Sep 2017 10:47:27 +0000 (12:47 +0200)]
use existing type to publish the data

7 years agothere no such command in make make-dist-bz2
Default [Fri, 29 Sep 2017 09:32:47 +0000 (12:32 +0300)]
there no such command in make make-dist-bz2

7 years agocollectd.conf(5): Move towards unifying "string literals".
Florian Forster [Fri, 29 Sep 2017 06:50:19 +0000 (08:50 +0200)]
collectd.conf(5): Move towards unifying "string literals".

7 years agoMerge remote-tracking branch 'github/pr/1707'
Florian Forster [Fri, 29 Sep 2017 06:49:29 +0000 (08:49 +0200)]
Merge remote-tracking branch 'github/pr/1707'

7 years agodbi plugin: Fix additional memory leaks.
Florian Forster [Fri, 29 Sep 2017 06:44:22 +0000 (08:44 +0200)]
dbi plugin: Fix additional memory leaks.

7 years agodbi plugin: Fix memory leak.
Pavel Rochnyack [Thu, 12 May 2016 10:24:00 +0000 (16:24 +0600)]
dbi plugin: Fix memory leak.

Some memory was leaked when shutting down.

This is a partial back-port of 5ee365a.

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agocollectd.conf(5): Move towards unifying "string literals".
Florian Forster [Fri, 29 Sep 2017 06:31:11 +0000 (08:31 +0200)]
collectd.conf(5): Move towards unifying "string literals".

7 years agoMerge remote-tracking branch 'github/pr/1681'
Florian Forster [Fri, 29 Sep 2017 06:29:24 +0000 (08:29 +0200)]
Merge remote-tracking branch 'github/pr/1681'

7 years agocurl_json: Added example configuration for PHP-FPM.
Pavel Rochnyack [Thu, 25 Feb 2016 14:44:02 +0000 (21:44 +0700)]
curl_json: Added example configuration for PHP-FPM.

7 years agocurl_json: Add ability to set custom plugin name in collected data.
Pavel Rochnyack [Thu, 25 Feb 2016 14:31:46 +0000 (21:31 +0700)]
curl_json: Add ability to set custom plugin name in collected data.

7 years agofix indention, revert merge failures
Wilfried Goesgens [Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)]
fix indention, revert merge failures

7 years agoadd documentation
Wilfried Goesgens [Thu, 28 Sep 2017 09:34:26 +0000 (11:34 +0200)]
add documentation

7 years agowrite_redis_plugin: Add document for MaxSetDuration
Tomofumi Hayashi [Thu, 28 Sep 2017 03:57:46 +0000 (12:57 +0900)]
write_redis_plugin: Add document for MaxSetDuration

This change adds description for MaxSetDuration, which is
introduced at #2440.

7 years agoMerge remote-tracking branch 'github/pr/2449'
Florian Forster [Wed, 27 Sep 2017 20:24:21 +0000 (22:24 +0200)]
Merge remote-tracking branch 'github/pr/2449'

7 years agosnmp plugin: Use array instead of cycle in res->errstat check
Pavel Rochnyack [Wed, 27 Sep 2017 12:15:13 +0000 (19:15 +0700)]
snmp plugin: Use array instead of cycle in res->errstat check

7 years agoadd option to collect the count of active memory maps for linux processes
Wilfried Goesgens [Wed, 27 Sep 2017 14:52:12 +0000 (16:52 +0200)]
add option to collect the count of active memory maps for linux processes

7 years agoMerge remote-tracking branch 'github/pr/2452'
Florian Forster [Wed, 27 Sep 2017 14:37:16 +0000 (16:37 +0200)]
Merge remote-tracking branch 'github/pr/2452'

7 years agoMerge remote-tracking branch 'github/pr/2437'
Florian Forster [Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)]
Merge remote-tracking branch 'github/pr/2437'

7 years agoMerge remote-tracking branch 'github/pr/2034'
Florian Forster [Wed, 27 Sep 2017 09:37:57 +0000 (11:37 +0200)]
Merge remote-tracking branch 'github/pr/2034'

7 years agoUpdating the varnish plugin
Denes Matetelki [Fri, 22 Sep 2017 15:25:04 +0000 (17:25 +0200)]
Updating the varnish plugin

7 years agosrc/utils_match.c: Reset UTILS_MATCH_CF_GAUGE_INC matches to zero (was: NaN)
Florian Forster [Wed, 27 Sep 2017 09:08:50 +0000 (11:08 +0200)]
src/utils_match.c: Reset UTILS_MATCH_CF_GAUGE_INC matches to zero (was: NaN)

Fixes: #2448

7 years agoMerge remote-tracking branch 'github/pr/2451' into collectd-5.6
Florian Forster [Wed, 27 Sep 2017 08:23:40 +0000 (10:23 +0200)]
Merge remote-tracking branch 'github/pr/2451' into collectd-5.6

7 years agoMerge remote-tracking branch 'github/pr/2388'
Florian Forster [Wed, 27 Sep 2017 06:23:51 +0000 (08:23 +0200)]
Merge remote-tracking branch 'github/pr/2388'

7 years agosnmp plugin: Style fix
Pavel Rochnyack [Tue, 26 Sep 2017 15:30:52 +0000 (22:30 +0700)]
snmp plugin: Style fix

Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
7 years agosnmp plugin: Fix double free of request PDU
Pavel Rochnyack [Wed, 31 May 2017 16:27:13 +0000 (23:27 +0700)]
snmp plugin: Fix double free of request PDU

snmp_sess_synch_response() always frees request PDU, in both case of request
error and success. If error condition occurs inside of `while (status == 0)`
loop, double free of `req` happens.

Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoemail, exec and unixsock plugins: Use _SC_GETPW_R_SIZE_MAX.
Florian Forster [Wed, 27 Sep 2017 06:07:10 +0000 (08:07 +0200)]
email, exec and unixsock plugins: Use _SC_GETPW_R_SIZE_MAX.

Fixes: #2208

7 years agoProper return value from 'swrite()' when connection has been closed
Pavel Rochnyack [Mon, 31 Jul 2017 05:21:24 +0000 (12:21 +0700)]
Proper return value from 'swrite()' when connection has been closed

According to POSIX, errno is set only if 'recv()' returns -1.
When connection has been closed, 'recv()' returns 0 and errno left untouched.
For functions which check errno value after 'swrite()', errno now is set to ECONNRESET,
so they produce correct message 'Connection reset by peer'.

7 years agomemcached: Style fix
Pavel Rochnyack [Tue, 26 Sep 2017 19:41:18 +0000 (02:41 +0700)]
memcached: Style fix

7 years agosnmp plugin: Reworked/fixed res->errstat check
Pavel Rochnyack [Tue, 26 Sep 2017 19:01:14 +0000 (02:01 +0700)]
snmp plugin: Reworked/fixed res->errstat check

7 years agosnmp plugin: Added res->errstat check
Pavel Rochnyack [Thu, 1 Jun 2017 07:39:24 +0000 (14:39 +0700)]
snmp plugin: Added res->errstat check

Collectd does not check for `res->errstat` value after
`snmp_sess_synch_response()` call. In case of error, there is no any data in
`res->variables` actually, but variables are tried to be processed as usual.
Suffix calculation will fail, so all subtrees will be marked as failed, not
only one subtree which caused an error.

The csnmp_instance_list_add() call will fail too, and, as result,
`csnmp_read_table` will finish it's work without any data submission.

The log message like
"snmp plugin: host HOSTNAME: csnmp_instance_list_add failed",
which is put into logs in this case, also has no enough diagnostic data.

Added code to proper check for `res->errstat` and to try to get available data.

Issue: #2291

7 years agoMerge remote-tracking branch 'github/pr/2446'
Florian Forster [Tue, 26 Sep 2017 17:47:01 +0000 (19:47 +0200)]
Merge remote-tracking branch 'github/pr/2446'

7 years agomsr-index: include GPLv2 header
Vincent Brillault [Tue, 26 Sep 2017 17:34:03 +0000 (19:34 +0200)]
msr-index: include GPLv2 header

7 years agomemcached: Report connections rate
Pavel Rochnyack [Sun, 30 Jul 2017 11:10:00 +0000 (18:10 +0700)]
memcached: Report connections rate

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoMerge remote-tracking branch 'github/pr/1979'
Florian Forster [Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)]
Merge remote-tracking branch 'github/pr/1979'

7 years agoturbostat: better support for mutli packages
Vincent Brillault [Mon, 25 Sep 2017 19:35:50 +0000 (21:35 +0200)]
turbostat: better support for mutli packages

If multiple packages are defined, support non-logical core enumeration
by prefixing each core id by its package id

7 years agoturbostat: import msr-index header from linux
Vincent Brillault [Mon, 25 Sep 2017 19:21:45 +0000 (21:21 +0200)]
turbostat: import msr-index header from linux

Since Linux 4.12, the kernel does not expose msr-index.h to the userland
anymore. This commit pulls and hardcode the required definitions.

7 years agoMerge remote-tracking branch 'github/pr/2440'
Florian Forster [Mon, 25 Sep 2017 18:58:35 +0000 (20:58 +0200)]
Merge remote-tracking branch 'github/pr/2440'

7 years agoAdd max_set_duration to set duration for value
Tomofumi Hayashi [Thu, 21 Sep 2017 09:10:30 +0000 (18:10 +0900)]
Add max_set_duration to set duration for value

This change introduces max_set_duration, the duration for the value
as max_set_size. max_set_size can keep the db size, however, sometime
max_set_size allows to contain old data. max_set_duration can keep
the latest data.

7 years agouptime plugin: don't cache boot time and simplify Linux code
Marcin Jurkowski [Tue, 11 Jul 2017 13:00:25 +0000 (15:00 +0200)]
uptime plugin: don't cache boot time and simplify Linux code

Caching boottime on startup yields incorrect uptime values if system
date changes after the daemon is started.
This is almost certain to happen on embedded systems without RTC, where
clock is set from NTP server at some point after boot process.

On Linux, we can retrieve uptime directly by either reading /proc/uptime
(it's sufficient to read a few bytes) or calling sysinfo() function.
Use the latter since it's the most efficient way in speed, memory
requirements and code simplicity terms.

7 years agoMerge remote-tracking branch 'github/pr/2442'
Florian Forster [Mon, 25 Sep 2017 07:36:23 +0000 (09:36 +0200)]
Merge remote-tracking branch 'github/pr/2442'

7 years agozfs_arc plugin: Avoid resetting global variables from init().
Florian Forster [Mon, 25 Sep 2017 07:28:34 +0000 (09:28 +0200)]
zfs_arc plugin: Avoid resetting global variables from init().

Fixes: #973

7 years agozfs_arc: derive hit/miss stats for ratio calculations
Richard Kojedzinszky [Sat, 14 Jan 2017 08:41:12 +0000 (09:41 +0100)]
zfs_arc: derive hit/miss stats for ratio calculations

7 years agotail plugin: Allow to set "bucket" metrics type
Pavel Rochnyack [Sun, 24 Sep 2017 14:00:53 +0000 (21:00 +0700)]
tail plugin: Allow to set "bucket" metrics type

When several distributions needs to be calculated in one 'tail' instance,
all their metrics will be reported as single 'bucket' type with the same plugin instance value.
That is confusing and this patch allows to split these metrics to their own types.

7 years agoMerge remote-tracking branch 'github/pr/2439'
Florian Forster [Sat, 23 Sep 2017 20:14:18 +0000 (22:14 +0200)]
Merge remote-tracking branch 'github/pr/2439'

7 years agocpu plugin: add new options to the default configuration file.
Xavier G [Sat, 23 Sep 2017 19:57:13 +0000 (21:57 +0200)]
cpu plugin: add new options to the default configuration file.

7 years agocpu plugin: adjust numfields conditions in cpu_read().
Xavier G [Sat, 23 Sep 2017 19:27:20 +0000 (21:27 +0200)]
cpu plugin: adjust numfields conditions in cpu_read().

7 years agocpu plugin: adjust coding style (variable declaration).
Xavier G [Sat, 23 Sep 2017 17:38:30 +0000 (19:38 +0200)]
cpu plugin: adjust coding style (variable declaration).

7 years agocpu plugin: update documentation.
Xavier G [Sat, 23 Sep 2017 16:58:51 +0000 (18:58 +0200)]
cpu plugin: update documentation.

7 years agocpu plugin: subtract guest states from user/nice.
Xavier G [Sat, 23 Sep 2017 16:34:11 +0000 (18:34 +0200)]
cpu plugin: subtract guest states from user/nice.

7 years agoMerge pull request #2441 from zerkms/ISSUE-2433
Florian Forster [Sat, 23 Sep 2017 06:03:03 +0000 (08:03 +0200)]
Merge pull request #2441 from zerkms/ISSUE-2433

Added `ReportIO` option to the `swap` plugin

7 years agoswap plugin: Added `ReportIO` option
Ivan Kurnosov [Sat, 23 Sep 2017 05:32:14 +0000 (17:32 +1200)]
swap plugin: Added `ReportIO` option

lxc/lxd containers at the moment cannot properly report the swap io (the corresponding /proc/vmstat are not virtualized), so added an option to disable that reporting.
Enabled by default.

Closes: #2433

7 years agoMerge remote-tracking branch 'github/pr/2377'
Florian Forster [Fri, 22 Sep 2017 06:55:18 +0000 (08:55 +0200)]
Merge remote-tracking branch 'github/pr/2377'

7 years agoFilecount plugin: Code style changes, clang-format
Pavel Rochnyack [Fri, 22 Sep 2017 06:40:28 +0000 (13:40 +0700)]
Filecount plugin: Code style changes, clang-format

7 years agoFilecount plugin: Custom values for reported plugin, type and type instance
Pavel Rochnyack [Sun, 9 Oct 2016 14:28:52 +0000 (20:28 +0600)]
Filecount plugin: Custom values for reported plugin, type and type instance

* Allow to set plugin name;
* Allow to set empty plugin instance;
* Allow to set metric types: Added 'FilesSizeType' and 'FilesCountType' options;
* Allow to disable metric reporting;
* Allow to set metrics type instance

7 years agoMerge remote-tracking branch 'github/pr/2434'
Florian Forster [Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)]
Merge remote-tracking branch 'github/pr/2434'

7 years agoMerge remote-tracking branch 'github/pr/2435'
Florian Forster [Thu, 21 Sep 2017 17:59:46 +0000 (19:59 +0200)]
Merge remote-tracking branch 'github/pr/2435'

7 years agoMerge branch 'collectd-5.7'
Florian Forster [Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200)]
Merge branch 'collectd-5.7'

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 21 Sep 2017 15:22:39 +0000 (17:22 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agosrc/daemon/collectd.c: Fix implementation of the -B option.
Florian Forster [Thu, 21 Sep 2017 15:18:05 +0000 (17:18 +0200)]
src/daemon/collectd.c: Fix implementation of the -B option.

Also add a manual page entry.

Issue: #2421
Pull-Request: #2422

7 years agoMerge remote-tracking branch 'github/pr/2422'
Florian Forster [Thu, 21 Sep 2017 15:10:46 +0000 (17:10 +0200)]
Merge remote-tracking branch 'github/pr/2422'

Fixes: #2421

7 years agotable: Allow custom plugin name to be reported
Pavel Rochnyack [Thu, 21 Sep 2017 06:24:14 +0000 (13:24 +0700)]
table: Allow custom plugin name to be reported