collectd.git
6 years agopostgresql: fix last sum() related parse errors
Marc Fournier [Wed, 8 Nov 2017 16:26:51 +0000 (17:26 +0100)]
postgresql: fix last sum() related parse errors

These queries return empty values when a database doesn't have any
tables yet, which results in collectd logging this error every Interval:

```
db query utils: udb_result_submit: Parsing `' as derive failed.
```

Related to #1905

6 years agoAuto-Merge pull request #2518 from octo/issue/2510
collectd bot [Sun, 5 Nov 2017 06:26:30 +0000 (07:26 +0100)]
Auto-Merge pull request #2518 from octo/issue/2510

Automatically merged due to "Automerge" label

6 years agonetlink plugin: Improve error reporting for mnl_attr_validate2() and mnl_socket_recvf...
Florian Forster [Sun, 5 Nov 2017 05:23:24 +0000 (06:23 +0100)]
netlink plugin: Improve error reporting for mnl_attr_validate2() and mnl_socket_recvfrom().

Issue: #2510

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Pavel Rochnyack [Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years ago[2475] write_prometheus plugin: Fix port listening
tcarreira [Thu, 12 Oct 2017 15:37:28 +0000 (16:37 +0100)]
[2475] write_prometheus plugin: Fix port listening

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agowrite_prometheus plugin: Implement logging callback.
Florian Forster [Tue, 10 Oct 2017 20:38:05 +0000 (22:38 +0200)]
write_prometheus plugin: Implement logging callback.

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

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agostatsd: Document collectd behaviour when receiving the 0.000 timer value
Pavel Rochnyack [Sun, 20 Mar 2016 08:51:26 +0000 (14:51 +0600)]
statsd: Document collectd behaviour when receiving the 0.000 timer value

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agocollectd-python(5): Fix documentation of Notification.dispatch().
Mytnyk, VolodymyrX [Thu, 5 Jan 2017 17:14:07 +0000 (17:14 +0000)]
collectd-python(5): Fix documentation of Notification.dispatch().

Cherry-picked from PR #2135
Signed-off-by: Florian Forster <octo@collectd.org>
6 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

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

6 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

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

6 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*

6 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

6 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

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

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

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

6 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

6 years agoperl plugin: Improve error message.
Florian Forster [Wed, 20 Sep 2017 17:38:10 +0000 (19:38 +0200)]
perl plugin: Improve error message.

6 years agoMerge remote-tracking branch 'github/pr/2391' into collectd-5.6
Florian Forster [Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)]
Merge remote-tracking branch 'github/pr/2391' into collectd-5.6

6 years agoMerge pull request #2417 from bluca/dpdk_pkgconfig_backport
Florian Forster [Mon, 18 Sep 2017 06:58:44 +0000 (08:58 +0200)]
Merge pull request #2417 from bluca/dpdk_pkgconfig_backport

configure.ac: dpdk: use pkg-config - 5.7

6 years agocollectd.spec: avoid accidentally picking an ancient/unsupported java version
Marc Fournier [Mon, 4 Sep 2017 09:51:04 +0000 (11:51 +0200)]
collectd.spec: avoid accidentally picking an ancient/unsupported java version

6 years agontpd: Correct loop offset and error calculation
Neil Wilson [Thu, 23 Feb 2017 17:03:34 +0000 (17:03 +0000)]
ntpd: Correct loop offset and error calculation

Stop the scaling calculation dropping the sign of the underlying value

Fixes: #2188

6 years agoconfigure.ac: dpdk: use pkg-config
Christian Ehrhardt [Thu, 17 Aug 2017 19:11:30 +0000 (20:11 +0100)]
configure.ac: dpdk: use pkg-config

To detect cflags and libs use the sometimes provided pkg-config for
libdpdk. That avoids build errors on systems where special flags are
needed and provided by dpdk via pkg-config, but not yet considered by
the collectd build system.

6 years agoperl plugin: Added check of proper interpreter initialization.
Pavel Rochnyack [Wed, 2 Aug 2017 05:15:50 +0000 (12:15 +0700)]
perl plugin: Added check of proper interpreter initialization.

Closes: #927

6 years agoMerge pull request #2375 from rpv-tomsk/small-fix
Ruben Kerkhof [Fri, 21 Jul 2017 19:09:58 +0000 (21:09 +0200)]
Merge pull request #2375 from rpv-tomsk/small-fix

network: Fix free() before use

6 years agonetwork: Fix free() before use
Pavel Rochnyack [Fri, 21 Jul 2017 18:06:58 +0000 (01:06 +0700)]
network: Fix free() before use

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 20 Jul 2017 07:11:09 +0000 (09:11 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
src/rrdtool.c

6 years agorrdtool plugin: Changes after review
Pavel Rochnyack [Wed, 19 Jul 2017 12:28:15 +0000 (19:28 +0700)]
rrdtool plugin: Changes after review

* Handle "CacheFlush" as a double
* Updated documentation spelling

6 years agorrdtool plugin: Respect RandomTimeout while calling CacheFlush handler
Pavel Rochnyack [Mon, 17 Jul 2017 05:26:16 +0000 (12:26 +0700)]
rrdtool plugin: Respect RandomTimeout while calling CacheFlush handler

The CacheFlush implementation does not respect RandomTimeout value.
All cache values, whose flush is deferred by RandomTimeout variance,
will be flushed. That can cause a partial or full cache flush,
depending on the value of RandomTimeout.

6 years agorrdtool plugin: Configuration check moved to init callback
Pavel Rochnyack [Mon, 17 Jul 2017 04:26:04 +0000 (11:26 +0700)]
rrdtool plugin: Configuration check moved to init callback

The "RandomTimeout" option value check moved from rrd_get_random_variation()
to rrd_init(). This will save few CPU cycles.

6 years agorrdtool plugin: Remove excessive complain
Pavel Rochnyack [Mon, 17 Jul 2017 04:15:52 +0000 (11:15 +0700)]
rrdtool plugin: Remove excessive complain

The plugin complains `Adjusting "RandomTimeout" to 0.000 seconds.` even
if no 'CacheTimeout' was set.

6 years agorrdtool plugin: Raise interval of random_variation to match documentation
Pavel Rochnyack [Mon, 17 Jul 2017 04:13:53 +0000 (11:13 +0700)]
rrdtool plugin: Raise interval of random_variation to match documentation

Documentation states what the actual timeout for each value is chosen randomly
between <CacheTimeout>-<RandomTimeout> and <CacheTimeout>+<RandomTimeout>.

The implementation did not match this.

6 years agorrdtool plugin: Fix flushing
Pavel Rochnyack [Sun, 16 Jul 2017 15:56:05 +0000 (22:56 +0700)]
rrdtool plugin: Fix flushing

* Value from wrong option was passed to rrd_cache_flush()
* Variable cache_flush_timeout was used as cdtime_t type time while value was set as simple seconds
* Added info message about CacheFlush ajusting
* Documentation updated

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Wed, 12 Jul 2017 16:58:18 +0000 (18:58 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years agocollectd.service: remove NoNewPrivileges setting
Ruben Kerkhof [Wed, 12 Jul 2017 16:54:49 +0000 (18:54 +0200)]
collectd.service: remove NoNewPrivileges setting

There are various issues with it in combination with SELinux.
See https://marc.info/?l=selinux&m=149971836431361&w=2 for some
background.

6 years agoMerge pull request #2357 from rpv-tomsk/issue-2305
Ruben Kerkhof [Wed, 12 Jul 2017 15:44:34 +0000 (17:44 +0200)]
Merge pull request #2357 from rpv-tomsk/issue-2305

Fixed failed compilation on AIX

6 years agoFixed failed compilation on AIX
Pavel Rochnyack [Tue, 11 Jul 2017 04:08:56 +0000 (11:08 +0700)]
Fixed failed compilation on AIX

Caused by typo in 2761915bed8c6caea41018be3e675aa712cc0b0a / #1842.

Closes: #2305

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Fri, 7 Jul 2017 16:40:55 +0000 (18:40 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years agoMerge pull request #2341 from rpv-tomsk/issue-2328
Ruben Kerkhof [Tue, 4 Jul 2017 15:27:03 +0000 (17:27 +0200)]
Merge pull request #2341 from rpv-tomsk/issue-2328

curl plugins: Use configured URL for all poll cycles

6 years agocurl plugins: Use configured URL for all poll cycles
Pavel Rochnyack [Tue, 4 Jul 2017 10:31:46 +0000 (17:31 +0700)]
curl plugins: Use configured URL for all poll cycles

After redirect received, Collectd send subsequent requests to new location.
That is wrong - Collectd should use configured URL for all poll cycles, regardless of the responses received previously.

Problem was caused by libcurl issue 1631. To avoid that we set request url in each poll cycle.

Closes: #2328

6 years agotcpconns plugin: fix build on FreeBSD current
Ruben Kerkhof [Sun, 2 Jul 2017 18:34:59 +0000 (20:34 +0200)]
tcpconns plugin: fix build on FreeBSD current

FreeBSD commit https://github.com/freebsd/freebsd/commit/3a5c9aaf2b2ea107bcaf0ba28b706238d92bdbbd
hides inpcb and tcpcb from userland.

Patch taken from FreeBSD ports tree, thanks glebius@.

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Fri, 30 Jun 2017 14:17:06 +0000 (16:17 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years agoemail, exec and unixsock plugins: enlarge buffer for getgrnam_r result
Ruben Kerkhof [Fri, 30 Jun 2017 14:15:25 +0000 (16:15 +0200)]
email, exec and unixsock plugins: enlarge buffer for getgrnam_r result

Thanks to Jeremie Courreges-Anglas and Daniel Jakots.

6 years agoemail, exec and unixsock plugins: fix error handling
Ruben Kerkhof [Fri, 30 Jun 2017 14:12:57 +0000 (16:12 +0200)]
email, exec and unixsock plugins: fix error handling

Diff from Jeremie Courreges-Anglas, via Daniel Jakots

6 years agoMerge pull request #2331 from mfournier/ldap_unbind-segfault
Ruben Kerkhof [Wed, 28 Jun 2017 17:38:12 +0000 (19:38 +0200)]
Merge pull request #2331 from mfournier/ldap_unbind-segfault

openldap: check ld structure before passing it to ldap_unbind()

6 years agoopenldap: check ld structure before passing it to ldap_unbind()
Marc Fournier [Wed, 28 Jun 2017 11:46:59 +0000 (13:46 +0200)]
openldap: check ld structure before passing it to ldap_unbind()

This prevents collectd from segfaulting when the ldap session setup
fails before opening a connection to openldap (syntax error in the URL
option for example).

6 years agoBump version to 5.7.2; Update ChangeLog. collectd-5.7.2
Florian Forster [Tue, 6 Jun 2017 18:11:05 +0000 (20:11 +0200)]
Bump version to 5.7.2; Update ChangeLog.

6 years agoMerge pull request #2310 from octo/ff/intel_rdt
Ruben Kerkhof [Tue, 6 Jun 2017 08:28:19 +0000 (10:28 +0200)]
Merge pull request #2310 from octo/ff/intel_rdt

intel_rdt plugin: Remove unnecessary goto.

6 years agointel_rdt plugin: Remove unnecessary goto.
Florian Forster [Mon, 5 Jun 2017 05:33:36 +0000 (07:33 +0200)]
intel_rdt plugin: Remove unnecessary goto.

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Thu, 1 Jun 2017 18:37:49 +0000 (20:37 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years agoBind plugin: plug a few leaks
Ruben Kerkhof [Tue, 30 May 2017 15:25:17 +0000 (17:25 +0200)]
Bind plugin: plug a few leaks

Fixes: #2303

6 years agoformat_graphite: Error if call to uc_get_rate fails to return a value.
Iain Buclaw [Fri, 19 May 2017 10:55:37 +0000 (12:55 +0200)]
format_graphite: Error if call to uc_get_rate fails to return a value.

This prevents a wrong value being sent to graphite for DERIVE types.

See #2209

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agosrc/daemon/utils_cache.c: Add debug message for lookup of missing metrics.
Florian Forster [Fri, 19 May 2017 06:39:45 +0000 (08:39 +0200)]
src/daemon/utils_cache.c: Add debug message for lookup of missing metrics.

Issue: #1234

6 years agosrc/daemon/utils_cache.c: Remove unnecessary cast.
Florian Forster [Fri, 19 May 2017 06:34:37 +0000 (08:34 +0200)]
src/daemon/utils_cache.c: Remove unnecessary cast.

(data_set_t).ds_num has been changed to be a size_t.

6 years agosrc/daemon/utils_cache.c: Read time *after* acquiring the lock.
Florian Forster [Thu, 18 May 2017 07:23:32 +0000 (09:23 +0200)]
src/daemon/utils_cache.c: Read time *after* acquiring the lock.

Fixes: #1193

6 years agoamqp plugin: Enable the "ExchangeType" for publishers, too.
Florian Forster [Wed, 17 May 2017 06:01:29 +0000 (08:01 +0200)]
amqp plugin: Enable the "ExchangeType" for publishers, too.

Fixes: #2286

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Tue, 16 May 2017 17:34:25 +0000 (19:34 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years agocurl_json plugin: Fix array index and key handling.
Florian Forster [Mon, 15 May 2017 12:40:26 +0000 (14:40 +0200)]
curl_json plugin: Fix array index and key handling.

Previously, the "key" was loaded by calling cj_cb_map_key() from
cj_cb_inc_array_index(). That means that the key for the previous element
was loaded as the array index was updated for the next element, resulting
in an off-by-one error. Also the key was not unset in time, resulting in
two metrics with the same identifier being created.

This patch fixes this with the following changes:

*   cj_advance_array() (nee cj_cb_inc_array_index()) now loads the key for
    the new index position instead of the previous one.
*   The initial "0" key is loaded from cj_cb_start_array().
*   cj_advance_array() always updates the key. The "update_key" argument
    has been removed.
*   Refactoring: key loading has been moved out of cj_cb_map_key() and
    into its own function, cj_load_key().

Unit tests are in a separate commit for easier cherry-picking.

Fixes: #2266

6 years agocollectd.conf(5): Fix typo ("queries" vs. "queried").
Florian Forster [Mon, 15 May 2017 06:14:03 +0000 (08:14 +0200)]
collectd.conf(5): Fix typo ("queries" vs. "queried").

By avoiding the word: "metrics" is bettern than "statistics".

6 years agoMerge pull request #2278 from octo/ff/perl
Ruben Kerkhof [Sun, 14 May 2017 10:38:58 +0000 (12:38 +0200)]
Merge pull request #2278 from octo/ff/perl

perl plugin: Fix potential double-free.

6 years agoperl plugin: Fix potential double-free.
Florian Forster [Sun, 14 May 2017 06:24:51 +0000 (08:24 +0200)]
perl plugin: Fix potential double-free.

The av2notification_meta() function updated it's parameter by doing

    (*m) = malloc();

Afterwards, if an error occurred, it would call `free(*m);` and (potentially)
return, leaving an invalid pointer stored in `m`. The caller would then try to
free the returned pointer because it was non-NULL.

This patch fixes this by doing several code cleanups:

*   The meta argument is not updated unnecessarily. Instead, a local variable
    is allocated and used within the loop and only on success is the return
    pointer updated.
*   Introduce additional local variables instead of re-using the `tmp` variable
    multiple times.
*   Name the variable pointing to the end of the linked list appropriately
    `tail` and remove one level of indirection. Reading code that is using
    pointers to pointers is unnecessarily hard.

6 years agoMerge pull request #2275 from octo/ff/prometheus
Florian Forster [Fri, 12 May 2017 13:17:13 +0000 (15:17 +0200)]
Merge pull request #2275 from octo/ff/prometheus

write_prometheus plugin: Fix incorrect use of realloc().

6 years agoMerge pull request #2274 from octo/ff/putval
Florian Forster [Fri, 12 May 2017 13:16:50 +0000 (15:16 +0200)]
Merge pull request #2274 from octo/ff/putval

src/utils_cmd_putval.c: Fix multi-value PUTVAL.

6 years agosrc/utils_cmd_putval.c: Fix multi-value PUTVAL.
Florian Forster [Fri, 12 May 2017 10:08:55 +0000 (12:08 +0200)]
src/utils_cmd_putval.c: Fix multi-value PUTVAL.

vl.values was allocated outside of the loop and then copied into each
ret_putval->vl[]. This means that later values overwrote the values
stored in previous ret_putval->vl[].

6 years agowrite_prometheus plugin: Fix incorrect use of realloc().
Florian Forster [Fri, 12 May 2017 11:05:37 +0000 (13:05 +0200)]
write_prometheus plugin: Fix incorrect use of realloc().

Calling realloc(ptr, 0) is undefined. Call free() explicitly.

6 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

6 years agobind plugin: Use timegm() to convert to time_t if available.
Florian Forster [Sun, 7 May 2017 18:34:09 +0000 (20:34 +0200)]
bind plugin: Use timegm() to convert to time_t if available.

FreeBSD doesn't provide the "extern long timezone", presumably because
it's "only" an XSI extension, leading to a portability issue with the
previous approach.

timegm() is a non-standard function available in GNU's and BSD's libc
which is doing exactly what we need. The previous code is left as a
fallback.

Fixes: #1268

6 years agofix BIND timezone parsing issue
Ed Ravin [Sat, 6 May 2017 02:53:59 +0000 (22:53 -0400)]
fix BIND timezone parsing issue

6 years agocollectd.conf(5): Add section documenting the ignorelist functionality.
Florian Forster [Sun, 7 May 2017 10:06:47 +0000 (12:06 +0200)]
collectd.conf(5): Add section documenting the ignorelist functionality.

Fixes: #2267

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agonetwork plugin: Fix endless loop DOS in parse_packet()
Pavel Rochnyack [Mon, 3 Apr 2017 05:57:09 +0000 (11:57 +0600)]
network plugin: Fix endless loop DOS in parse_packet()

When correct 'Signature part' is received by Collectd, configured without
AuthFile option, condition for endless loop occurs due to missing increase
of pointer to next unprocessed part.

This is a forward-port of #2233.

Fixes: CVE-2017-7401
Closes: #2174
Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoMerge pull request #2210 from rpv-tomsk/processes-fix-init
Ruben Kerkhof [Fri, 10 Mar 2017 14:36:09 +0000 (15:36 +0100)]
Merge pull request #2210 from rpv-tomsk/processes-fix-init

processes plugin: Fix broken compilation on AIX

7 years agoprocesses plugin: Fix broken compilation on AIX
Pavel Rochnyack [Thu, 9 Mar 2017 17:57:41 +0000 (23:57 +0600)]
processes plugin: Fix broken compilation on AIX

After a bb0000acfc57e230fc1c26099bc7acb913680f1a an extra pse.cpu_system
statement was left in the AIX / elif HAVE_PROCINFO_H section, which caused
the compilation to fail.

Fixes: #1981

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Sun, 5 Mar 2017 17:34:37 +0000 (18:34 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
contrib/redhat/collectd.spec

7 years agocollectd.spec: Don't enable XFS support on RHEL6
Ruben Kerkhof [Sun, 5 Mar 2017 17:30:23 +0000 (18:30 +0100)]
collectd.spec: Don't enable XFS support on RHEL6

It is missing for i386.
If there's strong interest in having support for xfs in the df plugin in
RHEL6 we can do some macro magic to only BuildRequire xfsprogs-devel if
were not on rhel6 i386, but this was the easiest fix and unblocks our
package builds.

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Sun, 5 Mar 2017 16:14:53 +0000 (17:14 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agoMerge pull request #2204 from collectd/check-for-cap-is-supported
Ruben Kerkhof [Sun, 5 Mar 2017 16:14:18 +0000 (17:14 +0100)]
Merge pull request #2204 from collectd/check-for-cap-is-supported

Check for the CAP_IS_SUPPORTED macro

7 years agoCheck for the CAP_IS_SUPPORTED macro
Ruben Kerkhof [Sun, 5 Mar 2017 15:46:47 +0000 (16:46 +0100)]
Check for the CAP_IS_SUPPORTED macro

On EPEL6:
src/daemon/common.c: In function 'check_capability':
src/daemon/common.c:1571: error: implicit declaration of function 'CAP_IS_SUPPORTED'
make[1]: *** [src/daemon/common.lo] Error 1

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agolook for cap_get_proc instead of cap_get_bound
Ruben Kerkhof [Fri, 24 Feb 2017 16:42:59 +0000 (17:42 +0100)]
look for cap_get_proc instead of cap_get_bound

a2ddc38 switched the capability check from cap_get_bound() to
cap_get_proc()

7 years agoMerge pull request #2151 from mfournier/check_capability-rewrite-fix
Ruben Kerkhof [Fri, 24 Feb 2017 16:40:41 +0000 (17:40 +0100)]
Merge pull request #2151 from mfournier/check_capability-rewrite-fix

daemon/common.c: Fix check_capability() by using cap_get_proc()

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Fri, 24 Feb 2017 16:28:28 +0000 (17:28 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
src/utils_match.c

7 years agosmart: log warning if CAP_SYS_RAWIO is missing
Marc Fournier [Wed, 25 Jan 2017 07:10:48 +0000 (08:10 +0100)]
smart: log warning if CAP_SYS_RAWIO is missing

Related to #2143

7 years agoMerge pull request #2192 from maryamtahhan/bugfix_regex_memleak
Ruben Kerkhof [Fri, 24 Feb 2017 15:52:17 +0000 (16:52 +0100)]
Merge pull request #2192 from maryamtahhan/bugfix_regex_memleak

fix for memory leak in utils_match.c

7 years agofix for memory leak in utils_match.c
Krzysztof Matczak [Fri, 24 Feb 2017 09:38:14 +0000 (09:38 +0000)]
fix for memory leak in utils_match.c

Change-Id: I058afae8c0a99115bda70e125840fc6bd224b358
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Wed, 22 Feb 2017 20:09:46 +0000 (21:09 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agolog_logstash: send log messages to STDERR by default
Marc Fournier [Wed, 11 Jan 2017 12:39:27 +0000 (13:39 +0100)]
log_logstash: send log messages to STDERR by default

See also dec394e08

7 years agosrc/daemon/collectd.c: do not refer to syslog in error message
Marc Fournier [Tue, 10 Jan 2017 21:58:21 +0000 (22:58 +0100)]
src/daemon/collectd.c: do not refer to syslog in error message

... as the message the user would be looking for can be found on
stderr/stdout or in any configured logfile.

7 years agologfile: send log messages to STDERR by default
Marc Fournier [Tue, 10 Jan 2017 21:23:55 +0000 (22:23 +0100)]
logfile: send log messages to STDERR by default

This prevents early startup log messages from going unnoticed if the
default logfile isn't writeable.

Fixes: #2057

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Wed, 22 Feb 2017 10:17:58 +0000 (11:17 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
contrib/redhat/collectd.spec

7 years agocollectd.spec: enable XFS support in df plugin
Ruben Kerkhof [Wed, 22 Feb 2017 08:59:02 +0000 (09:59 +0100)]
collectd.spec: enable XFS support in df plugin

Fixes #2178

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agoMerge pull request #2167 from maryamtahhan/feat_dpdkstat_bugfix_5_7
Ruben Kerkhof [Tue, 14 Feb 2017 10:12:28 +0000 (11:12 +0100)]
Merge pull request #2167 from maryamtahhan/feat_dpdkstat_bugfix_5_7

dpdkstat: Fix metrics' types

7 years agoMerge pull request #2170 from javicacheiro/fix_redhat_spec_file
Marc Fournier [Mon, 13 Feb 2017 14:39:00 +0000 (15:39 +0100)]
Merge pull request #2170 from javicacheiro/fix_redhat_spec_file

Fix rpm spec file for 5.7.1