Code

collectd.git
7 years agodpdkstat: don't close already closed fd on failure
Ruben Kerkhof [Sat, 17 Dec 2016 17:50:58 +0000 (18:50 +0100)]
dpdkstat: don't close already closed fd on failure

CID #158525

7 years agoFix parallel build
Ruben Kerkhof [Sat, 17 Dec 2016 16:44:47 +0000 (17:44 +0100)]
Fix parallel build

Fixes #2110

7 years agoAuto-Merge pull request #2111 from octo/cid/157643
Florian Forster [Fri, 16 Dec 2016 18:39:06 +0000 (19:39 +0100)]
Auto-Merge pull request #2111 from octo/cid/157643

Automatically merged due to "Automerge" label

7 years agosrc/utils_cmd_getthreshold.c: Fix formatting.
Florian Forster [Fri, 16 Dec 2016 17:42:13 +0000 (18:42 +0100)]
src/utils_cmd_getthreshold.c: Fix formatting.

7 years agoset target: Avoid casting negative int to size_t.
Florian Forster [Fri, 16 Dec 2016 17:38:34 +0000 (18:38 +0100)]
set target: Avoid casting negative int to size_t.

CID: 157643

7 years agoupdate README to mention write_prometheus & support lib
Marc Fournier [Thu, 15 Dec 2016 22:22:59 +0000 (23:22 +0100)]
update README to mention write_prometheus & support lib

7 years agoAuto-Merge pull request #2096 from rubenk/target-set-plug-leak
Florian Forster [Thu, 15 Dec 2016 10:44:10 +0000 (11:44 +0100)]
Auto-Merge pull request #2096 from rubenk/target-set-plug-leak

Automatically merged due to "Automerge" label

7 years agoAuto-Merge pull request #2092 from rubenk/prometheus-plug-leak
Florian Forster [Thu, 15 Dec 2016 10:27:40 +0000 (11:27 +0100)]
Auto-Merge pull request #2092 from rubenk/prometheus-plug-leak

Automatically merged due to "Automerge" label

7 years agoBump version to 5.7.0; Update ChangeLog. collectd-5.7.0
Florian Forster [Mon, 12 Dec 2016 07:57:37 +0000 (08:57 +0100)]
Bump version to 5.7.0; Update ChangeLog.

7 years agotarget_set: plug leak on error
Ruben Kerkhof [Fri, 9 Dec 2016 17:15:29 +0000 (18:15 +0100)]
target_set: plug leak on error

CID 157645

7 years agoemail plugin: initialize structure
Ruben Kerkhof [Fri, 9 Dec 2016 16:20:43 +0000 (17:20 +0100)]
email plugin: initialize structure

CID 38125

7 years agowrite_prometheus: plug a small leak
Ruben Kerkhof [Fri, 9 Dec 2016 14:41:18 +0000 (15:41 +0100)]
write_prometheus: plug a small leak

Found by scan-build

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agoMerge remote-tracking branch 'github/pr/2081' into collectd-5.7
Florian Forster [Tue, 6 Dec 2016 12:40:09 +0000 (13:40 +0100)]
Merge remote-tracking branch 'github/pr/2081' into collectd-5.7

7 years agosmart plugin: Refactor, demote warnings to debug.
Florian Forster [Tue, 6 Dec 2016 12:28:20 +0000 (13:28 +0100)]
smart plugin: Refactor, demote warnings to debug.

Fixes: #2062
7 years agosrc/utils_cmd_*.[ch]: Remove unused and redundant includes.
Florian Forster [Tue, 6 Dec 2016 09:55:42 +0000 (10:55 +0100)]
src/utils_cmd_*.[ch]: Remove unused and redundant includes.

7 years agosrc/Makefile.am: Fix linking with libcmds.la.
Florian Forster [Tue, 6 Dec 2016 09:55:06 +0000 (10:55 +0100)]
src/Makefile.am: Fix linking with libcmds.la.

Issue: #2067

7 years agodpdkstats: fix detection of local libdpdk
Mytnyk, VolodymyrX [Wed, 30 Nov 2016 14:12:49 +0000 (14:12 +0000)]
dpdkstats: fix detection of local libdpdk

- Fix typo.

Change-Id: I7cfb6dff4e1c2728650cd1d44aaaa36169880809
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
7 years agowrite_kafka plugin: Use 32bit random number when formatting a random key.
Florian Forster [Mon, 5 Dec 2016 10:52:35 +0000 (11:52 +0100)]
write_kafka plugin: Use 32bit random number when formatting a random key.

Previously, negative numbers would be truncated to "ffffffff" by the
buffer length on architectures where longs are 64 bit.

Fixes: #2074
7 years agosrc/daemon/utils_random.[ch]: Implement cdrand_u().
Florian Forster [Mon, 5 Dec 2016 10:49:34 +0000 (11:49 +0100)]
src/daemon/utils_random.[ch]: Implement cdrand_u().

7 years agoMerge pull request #2069 from octo/issue/2067
Ruben Kerkhof [Fri, 2 Dec 2016 12:59:32 +0000 (13:59 +0100)]
Merge pull request #2069 from octo/issue/2067

src/Makefile.am: Fix dependencies for the "tail" and "match" utilities.

7 years agosrc/Makefile.am: Fix dependencies for the "tail" and "match" utilities.
Florian Forster [Thu, 1 Dec 2016 13:52:06 +0000 (14:52 +0100)]
src/Makefile.am: Fix dependencies for the "tail" and "match" utilities.

Since being pulled out of the core daemon, the daemon no longer provides
all the required symbols for these shared objects. The "tail", "match"
and "tail_match" utils need to be compiled in explicitly. Also, we need
to link with the liblatency.la convenience library for the
"Distribution" handling in the "match" util.

Issue: #2067

7 years agoBump version to 5.6.1; Update ChangeLog. collectd-5.6.2
Florian Forster [Wed, 30 Nov 2016 08:44:51 +0000 (09:44 +0100)]
Bump version to 5.6.1; Update ChangeLog.

7 years agoMerge pull request #2064 from rubenk/fix-make-distcheck
Ruben Kerkhof [Tue, 29 Nov 2016 14:46:52 +0000 (15:46 +0100)]
Merge pull request #2064 from rubenk/fix-make-distcheck

Fix make distcheck

7 years agoFix make distcheck
Ruben Kerkhof [Tue, 29 Nov 2016 14:43:22 +0000 (15:43 +0100)]
Fix make distcheck

This was broken by 1d888f3

7 years agoCollected podtypo
Kevin Bowling [Wed, 6 Apr 2016 06:17:26 +0000 (23:17 -0700)]
Collected podtypo

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Tue, 29 Nov 2016 11:38:59 +0000 (12:38 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
contrib/redhat/collectd.spec

7 years agocollectd.spec: also disable write_redis on EL6
Ruben Kerkhof [Tue, 29 Nov 2016 11:33:20 +0000 (12:33 +0100)]
collectd.spec: also disable write_redis on EL6

This plugin also depends on the hiredis library, which was retired from
EPEL6.

7 years agoMerge branch 'collectd-5.5' into collectd-5.6
Ruben Kerkhof [Tue, 29 Nov 2016 11:31:39 +0000 (12:31 +0100)]
Merge branch 'collectd-5.5' into collectd-5.6

Conflicts:
contrib/redhat/collectd.spec

7 years agocollectd.spec: disable redis plugin on EL6
Ruben Kerkhof [Tue, 29 Nov 2016 10:48:40 +0000 (11:48 +0100)]
collectd.spec: disable redis plugin on EL6

hiredis has been retired from EPEL6

7 years agocollectd.spec: disable redis plugin on EL6
Ruben Kerkhof [Tue, 29 Nov 2016 10:43:08 +0000 (11:43 +0100)]
collectd.spec: disable redis plugin on EL6

7 years agoEven more renormalization.
Florian Forster [Mon, 28 Nov 2016 21:23:24 +0000 (22:23 +0100)]
Even more renormalization.

7 years agoMerge branch 'collectd-5.6'
Florian Forster [Mon, 28 Nov 2016 21:23:04 +0000 (22:23 +0100)]
Merge branch 'collectd-5.6'

7 years agoMore reformatting.
Florian Forster [Mon, 28 Nov 2016 21:22:01 +0000 (22:22 +0100)]
More reformatting.

No idea why the previous round missed these files.

7 years agoMerge branch 'collectd-5.6'
Florian Forster [Mon, 28 Nov 2016 21:16:04 +0000 (22:16 +0100)]
Merge branch 'collectd-5.6'

7 years agoTree wide: Reformat with clang-format.
Florian Forster [Mon, 28 Nov 2016 21:15:48 +0000 (22:15 +0100)]
Tree wide: Reformat with clang-format.

7 years agoTree wide: Reformat with clang-format.
Florian Forster [Mon, 28 Nov 2016 21:09:22 +0000 (22:09 +0100)]
Tree wide: Reformat with clang-format.

7 years agoMerge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Mon, 28 Nov 2016 20:48:36 +0000 (21:48 +0100)]
Merge branch 'collectd-5.5' into collectd-5.6

7 years agoBump version to 5.5.3; Update ChangeLog. collectd-5.5.3
Florian Forster [Mon, 28 Nov 2016 15:51:37 +0000 (16:51 +0100)]
Bump version to 5.5.3; Update ChangeLog.

7 years agoMerge branch 'pr/2056'
Florian Forster [Mon, 28 Nov 2016 08:03:12 +0000 (09:03 +0100)]
Merge branch 'pr/2056'

7 years agocollectd.conf(5): Improve documentation of the turbostat plugin.
Florian Forster [Mon, 28 Nov 2016 07:58:29 +0000 (08:58 +0100)]
collectd.conf(5): Improve documentation of the turbostat plugin.

7 years agoUpdated to actually honor the boolean and clarified documentation per request
Brock Johnson [Mon, 28 Nov 2016 02:20:02 +0000 (20:20 -0600)]
Updated to actually honor the boolean and clarified documentation per request

7 years agocollectd.conf(5): Add missing blank line.
Florian Forster [Sun, 27 Nov 2016 19:34:25 +0000 (20:34 +0100)]
collectd.conf(5): Add missing blank line.

7 years agosrc/utils_latency_config.c: Avoid nested compound literals.
Florian Forster [Sun, 27 Nov 2016 13:58:42 +0000 (14:58 +0100)]
src/utils_latency_config.c: Avoid nested compound literals.

So GCC 4.6 doesn't crash.

7 years agosrc/daemon/utils_match.[ch]: Rename UTILS_MATCH_CF_GAUGE_LATENCY to UTILS_MATCH_CF_GA...
Florian Forster [Sun, 27 Nov 2016 07:02:39 +0000 (08:02 +0100)]
src/daemon/utils_match.[ch]: Rename UTILS_MATCH_CF_GAUGE_LATENCY to UTILS_MATCH_CF_GAUGE_DIST.

7 years agotail plugin: Rename DSType from Latency to Distribution.
Florian Forster [Sun, 20 Nov 2016 21:53:34 +0000 (22:53 +0100)]
tail plugin: Rename DSType from Latency to Distribution.

This is a more flexible naming owing to the fact that percentiles and other
distribution parameters are interesting for a variety of metrics, not just
latencies.

The config handling is now completely in src/utils_latency_config.c so
that other plugins, such as the cURL plugin, can easily reuse the module
with consistent config handling.

7 years agosrc/utils_latency{,_config}.[ch]: Reformat new code with clang-format.
Florian Forster [Wed, 12 Oct 2016 15:25:13 +0000 (17:25 +0200)]
src/utils_latency{,_config}.[ch]: Reformat new code with clang-format.

7 years agocollectd.conf(5): Update the "LatencyRate" option.
Florian Forster [Wed, 12 Oct 2016 15:15:10 +0000 (17:15 +0200)]
collectd.conf(5): Update the "LatencyRate" option.

7 years agosrc/utils_latency.[ch]: get_rate(): Make lower bound exclusive.
Florian Forster [Wed, 12 Oct 2016 07:15:49 +0000 (09:15 +0200)]
src/utils_latency.[ch]: get_rate(): Make lower bound exclusive.

This has a bunch of benefits:
* You can easily iterate over a range of latencies without counting
  latencies twice. This was previously tricky because both borders were
  considered to be inclusive.
* When lower equals upper, the returned value is now zero.
  Previously, it was a value very close to zero, but not zero. The exact
  value depended on the bucket width, an information not easily
  available to the caller.

7 years agosrc/utils_latency.[ch]: Remove latency_counter_get_start_time().
Florian Forster [Tue, 11 Oct 2016 15:27:11 +0000 (17:27 +0200)]
src/utils_latency.[ch]: Remove latency_counter_get_start_time().

7 years agosrc/utils_latency.[ch]: Improve accuracy, update unit test.
Florian Forster [Tue, 11 Oct 2016 15:25:58 +0000 (17:25 +0200)]
src/utils_latency.[ch]: Improve accuracy, update unit test.

7 years agoDSType latency: Improved after PR code review
Pavel Rochnyack [Mon, 19 Sep 2016 17:32:54 +0000 (23:32 +0600)]
DSType latency: Improved after PR code review

7 years ago+ liblatency: Added utils_latency_config code
Pavel Rochnyack [Sat, 7 May 2016 17:26:15 +0000 (23:26 +0600)]
+ liblatency: Added utils_latency_config code
+ tail plugin: DSType Latency added

7 years ago+ utils_latency: Cleaned latency_counter_get_rate() from debugging
Pavel Rochnyack [Sat, 7 May 2016 16:09:09 +0000 (22:09 +0600)]
+ utils_latency: Cleaned latency_counter_get_rate() from debugging

7 years ago+ utils_latency: Added latency_counter_get_rate()
Pavel Rochnyack [Sat, 7 May 2016 15:55:16 +0000 (21:55 +0600)]
+ utils_latency: Added latency_counter_get_rate()

7 years ago+ User_data destroy callback added to match_create_callback() in utils_match
Pavel Rochnyack [Sat, 7 May 2016 07:01:33 +0000 (13:01 +0600)]
+ User_data destroy callback added to match_create_callback() in utils_match

7 years agoMerge remote-tracking branch 'github/pr/2058'
Florian Forster [Sun, 27 Nov 2016 06:24:55 +0000 (07:24 +0100)]
Merge remote-tracking branch 'github/pr/2058'

7 years agoamqp, write_graphite and write_kafka plugins: Implement the "[Graphite]PreserveSepara...
Florian Forster [Sat, 26 Nov 2016 18:00:19 +0000 (19:00 +0100)]
amqp, write_graphite and write_kafka plugins: Implement the "[Graphite]PreserveSeparator" option.

Fixes: #419
7 years agosrc/utils_format_graphite.[ch]: Implement the GRAPHITE_PRESERVE_SEPARATOR flag.
Florian Forster [Sat, 26 Nov 2016 17:46:36 +0000 (18:46 +0100)]
src/utils_format_graphite.[ch]: Implement the GRAPHITE_PRESERVE_SEPARATOR flag.

7 years agoAdd config boolean for logical CPU naming for turbostat plugin
brockcj [Sat, 26 Nov 2016 03:32:54 +0000 (21:32 -0600)]
Add config boolean for logical CPU naming for turbostat plugin

7 years agoMerge remote-tracking branch 'github/pr/2052'
Florian Forster [Fri, 25 Nov 2016 19:59:53 +0000 (20:59 +0100)]
Merge remote-tracking branch 'github/pr/2052'

7 years agoMerge remote-tracking branch 'github/pr/2054'
Florian Forster [Fri, 25 Nov 2016 16:27:10 +0000 (17:27 +0100)]
Merge remote-tracking branch 'github/pr/2054'

7 years agosrc/utils_format_graphite.[ch]: Add unit test.
Florian Forster [Fri, 25 Nov 2016 09:08:49 +0000 (10:08 +0100)]
src/utils_format_graphite.[ch]: Add unit test.

First step towards fixing issue #419.

8 years agocollectd.spec: enable write_prometheus
Marc Fournier [Wed, 23 Nov 2016 06:00:12 +0000 (07:00 +0100)]
collectd.spec: enable write_prometheus

8 years agouse deterministic time values in MockDaemon
Matthias Bethke [Tue, 22 Nov 2016 17:36:12 +0000 (00:36 +0700)]
use deterministic time values in MockDaemon

8 years agorecognize seconds with and without fractional part
Matthias Bethke [Tue, 22 Nov 2016 16:53:30 +0000 (23:53 +0700)]
recognize seconds with and without fractional part

8 years agopass fractional seconds upwards as floats
Matthias Bethke [Tue, 22 Nov 2016 16:37:33 +0000 (23:37 +0700)]
pass fractional seconds upwards as floats

8 years agoallow fractional seconds in listval_filter()
Matthias Bethke [Tue, 22 Nov 2016 16:35:36 +0000 (23:35 +0700)]
allow fractional seconds in listval_filter()

8 years agoupdate MockDaemon to report fractional seconds
Matthias Bethke [Tue, 22 Nov 2016 16:30:37 +0000 (23:30 +0700)]
update MockDaemon to report fractional seconds

8 years agofix indentation (consistently use tabs)
Matthias Bethke [Tue, 22 Nov 2016 16:22:19 +0000 (23:22 +0700)]
fix indentation (consistently use tabs)

8 years agoMerge pull request #2046 from rubenk/cleanup-dpdk-detection
Ruben Kerkhof [Mon, 21 Nov 2016 13:37:53 +0000 (14:37 +0100)]
Merge pull request #2046 from rubenk/cleanup-dpdk-detection

Cleanup dpdk detection

8 years agoMerge remote-tracking branch 'github/pr/2040'
Florian Forster [Mon, 21 Nov 2016 07:33:42 +0000 (08:33 +0100)]
Merge remote-tracking branch 'github/pr/2040'

8 years agoFix Lua header detection
Ruben Kerkhof [Sat, 19 Nov 2016 10:47:00 +0000 (11:47 +0100)]
Fix Lua header detection

checking lua.h usability... yes
checking lua.h presence... no
configure: WARNING: lua.h: accepted by the compiler, rejected by the
preprocessor!
configure: WARNING: lua.h: proceeding with the compiler's result
checking for lua.h... yes
checking lauxlib.h usability... yes
checking lauxlib.h presence... no
configure: WARNING: lauxlib.h: accepted by the compiler, rejected by the
preprocessor!
configure: WARNING: lauxlib.h: proceeding with the compiler's result
checking for lauxlib.h... yes
checking lualib.h usability... yes
checking lualib.h presence... no
configure: WARNING: lualib.h: accepted by the compiler, rejected by the
preprocessor!
configure: WARNING: lualib.h: proceeding with the compiler's result
checking for lualib.h... yes

AC_CHECK_HEADERS uses the preprocessor directly, which doesn't use
CFLAGS. Fixes detection of the lua-5.1 compat libs on Fedora Rawhide.

8 years agosrc/daemon/plugin.c: Address review comments.
Florian Forster [Sat, 19 Nov 2016 13:26:27 +0000 (14:26 +0100)]
src/daemon/plugin.c: Address review comments.

8 years agoRewrite the check for libdpdk
Ruben Kerkhof [Sat, 19 Nov 2016 16:31:23 +0000 (17:31 +0100)]
Rewrite the check for libdpdk

This fixes various issues, like us not picking up the right include path
and testing for the library in the wrong location.

We now allow you to override the CPPFLAGS and LDFLAGS by doing
./configure LIBDPDK_CPPFLAGS="-I/path/to/your/libdpdk_headers" LIBDPDK_LDFLAGS="-L/path/to/your/libdpdk.so -Wl,--no-as-needed"

The nice thing is that these settings are now logged and remembered
between configure runs.

8 years agoEnable detection of libdpdk by default
Ruben Kerkhof [Sat, 19 Nov 2016 10:58:36 +0000 (11:58 +0100)]
Enable detection of libdpdk by default

Otherwise we never exercise this check and it will just bitrot.

8 years agodpdkstat: Added support for dpdk 16.07.
Taras Chornyi [Sat, 19 Nov 2016 16:02:22 +0000 (17:02 +0100)]
dpdkstat: Added support for dpdk 16.07.

8 years agoconfigure.ac: Improve detection and usage of pthread_set_name_np(3).
Florian Forster [Sat, 19 Nov 2016 07:10:47 +0000 (08:10 +0100)]
configure.ac: Improve detection and usage of pthread_set_name_np(3).

8 years agocontrib/README: sort items
Marc Fournier [Wed, 16 Nov 2016 09:12:10 +0000 (10:12 +0100)]
contrib/README: sort items

8 years agomqtt, gps: add name parameter to plugin_thread_create()
Marc Fournier [Wed, 16 Nov 2016 06:49:25 +0000 (07:49 +0100)]
mqtt, gps: add name parameter to plugin_thread_create()

8 years agoExplain the need for _GNU_SOURCE
Manuel Luis Sanmartín Rozada [Sun, 9 Feb 2014 15:03:03 +0000 (16:03 +0100)]
Explain the need for _GNU_SOURCE

8 years agoAdd support to set the thread name.
Manuel Luis Sanmartín Rozada [Sat, 8 Feb 2014 22:13:01 +0000 (23:13 +0100)]
Add support to set the thread name.

8 years agowrite_prometheus plugin: Escape label values.
Florian Forster [Tue, 15 Nov 2016 08:34:57 +0000 (09:34 +0100)]
write_prometheus plugin: Escape label values.

Fixes: #2035
8 years agoMerge remote-tracking branch 'github/pr/1967'
Florian Forster [Fri, 11 Nov 2016 20:24:21 +0000 (21:24 +0100)]
Merge remote-tracking branch 'github/pr/1967'

8 years agowrite_prometheus plugin: Use the "static" macro to specify PROMETHEUS_DEFAULT_STALENE...
Florian Forster [Fri, 11 Nov 2016 19:42:36 +0000 (20:42 +0100)]
write_prometheus plugin: Use the "static" macro to specify PROMETHEUS_DEFAULT_STALENESS_DELTA.

Fixes:

    write_prometheus.c:56:1: error: initializer element is not constant
     static cdtime_t staleness_delta = PROMETHEUS_DEFAULT_STALENESS_DELTA;
     ^

8 years agowrite_prometheus plugin: Don't allocate metric families in prom_missing().
Florian Forster [Mon, 24 Oct 2016 07:03:32 +0000 (09:03 +0200)]
write_prometheus plugin: Don't allocate metric families in prom_missing().

8 years agowrite_prometheus: add support for libmicrohttpd 0.9.45+
Marc Fournier [Tue, 1 Nov 2016 10:15:24 +0000 (11:15 +0100)]
write_prometheus: add support for libmicrohttpd 0.9.45+

Add switch on MHD_VERSION to support both legacy and modern MHD functions.

`MHD_create_response_from_data()` is deprecated since libmicrohttpd
0.9.5 and makes the build fail since 0.9.45.

8 years agowrite_prometheus plugin: Improve performance of metric_cmp().
Florian Forster [Sat, 1 Oct 2016 19:22:12 +0000 (21:22 +0200)]
write_prometheus plugin: Improve performance of metric_cmp().

This function is a hotspot because it is used by bsearch() to look up
metrics in a metric family. This simple (though non-obvious) change
brings prom_write() complexity down from 3000 instructions/call to 2640
instructions/call, i.e. a 12% improvement.

8 years agowrite_prometheus plugin: Optimize metric_family_get_metric().
Florian Forster [Sat, 1 Oct 2016 08:12:41 +0000 (10:12 +0200)]
write_prometheus plugin: Optimize metric_family_get_metric().

Profiling showed that prom_write() spent 73% of its time in this
function. 36% of time was spent in metric_create() and 19% was spent in
metric_destroy().

This patch replaces these two calls by a stack allocation, reducing the
time prom_write() spends in metric_family_get_metric() to 42%.

8 years agowrite_prometheus plugin: New plugin for exposing metrics to Prometheus.
Florian Forster [Thu, 29 Sep 2016 19:38:24 +0000 (21:38 +0200)]
write_prometheus plugin: New plugin for exposing metrics to Prometheus.

8 years agocollectd-tg: Fix sleep interval.
Florian Forster [Fri, 11 Nov 2016 13:34:20 +0000 (14:34 +0100)]
collectd-tg: Fix sleep interval.

nanosleep() was called with the current time, meaning that it would
block for years. This correctly subtracts "now" from the metric's time
and only sleeps for the duration between the two.

8 years agoMerge branch 'collectd-5.6'
Florian Forster [Mon, 7 Nov 2016 07:52:38 +0000 (08:52 +0100)]
Merge branch 'collectd-5.6'

8 years agoMerge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Mon, 7 Nov 2016 07:43:17 +0000 (08:43 +0100)]
Merge branch 'collectd-5.5' into collectd-5.6

8 years agoMerge remote-tracking branch 'github/pr/2026' into collectd-5.5
Florian Forster [Mon, 7 Nov 2016 06:03:17 +0000 (07:03 +0100)]
Merge remote-tracking branch 'github/pr/2026' into collectd-5.5

8 years agoapcups plugin: Skip metrics not reported by the UPS.
Florian Forster [Sat, 5 Nov 2016 21:32:49 +0000 (22:32 +0100)]
apcups plugin: Skip metrics not reported by the UPS.

Fixes: #2025
8 years agowrite_kafka plugin: Fix support for librdkafka 0.9.0.
Florian Forster [Sun, 6 Nov 2016 21:17:02 +0000 (22:17 +0100)]
write_kafka plugin: Fix support for librdkafka 0.9.0.

Use rd_kafka_set_logger() only when rd_kafka_conf_set_log_cb() is not
available:

    write_kafka.c: In function 'kafka_handle':
    write_kafka.c:119:6: error: 'rd_kafka_set_logger' is deprecated (declared at /usr/local/include/librdkafka/rdkafka.h:2400) [-Werror=deprecated-declarations]
          rd_kafka_set_logger(ctx->kafka, kafka_log);
          ^

Fixes: #2029
8 years agoMerge remote-tracking branch 'github/pr/2027' into collectd-5.5
Florian Forster [Sun, 6 Nov 2016 19:40:36 +0000 (20:40 +0100)]
Merge remote-tracking branch 'github/pr/2027' into collectd-5.5

8 years agomodbus plugin: Avoid sizeof(struct sockaddr).
Florian Forster [Sun, 6 Nov 2016 09:21:35 +0000 (10:21 +0100)]
modbus plugin: Avoid sizeof(struct sockaddr).

The previous version failed on FreeBSD with:

    modbus.c: In function 'mb_read_data':
    modbus.c:476:21: error: storage size of 'sockaddr' isn't known
         struct sockaddr sockaddr;
                         ^

8 years agosrc/write_riemann_threshold.h: Various fixes.
Florian Forster [Sun, 6 Nov 2016 10:10:54 +0000 (11:10 +0100)]
src/write_riemann_threshold.h: Various fixes.

* Add license header. Simply copied src/write_riemann_threadhold.c's license.
* Make header self-contained. "plugin.h" is needed for data_source_t and
  value_list_t.
* Add names to the parameters and write documentation for the only exported
  function.

8 years agowrite_riemann plugin: Fix order of includes.
Florian Forster [Sun, 6 Nov 2016 09:34:22 +0000 (10:34 +0100)]
write_riemann plugin: Fix order of includes.

The previous version failed on Solaris with:

    In file included from ./daemon/collectd.h:31:0,
                     from write_riemann.c:36:
    ./config.h:1619:0: error: "_FILE_OFFSET_BITS" redefined [-Werror]
     #define _FILE_OFFSET_BITS 64
     ^