Ruben Kerkhof [Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7
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>
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
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
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
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.
Ruben Kerkhof [Sun, 5 Mar 2017 16:14:53 +0000 (17:14 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
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
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
Ruben Kerkhof [Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
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()
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()
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
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
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
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>
Ruben Kerkhof [Wed, 22 Feb 2017 20:09:46 +0000 (21:09 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
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
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.
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
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
Ruben Kerkhof [Wed, 22 Feb 2017 08:59:02 +0000 (09:59 +0100)]
collectd.spec: enable XFS support in df plugin
Fixes #2178
Ruben Kerkhof [Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)]
Merge branch 'collectd-5.6' into collectd-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
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
Javier Cacheiro [Fri, 10 Feb 2017 10:58:07 +0000 (11:58 +0100)]
Fix release
Javier Cacheiro [Thu, 9 Feb 2017 21:50:01 +0000 (22:50 +0100)]
Fix rpm spec file for 5.7.1
Ruben Kerkhof [Wed, 8 Feb 2017 16:36:46 +0000 (17:36 +0100)]
Merge pull request #2165 from maryamtahhan/feat_rdt_bugfix
intel_rdt: bugfix configuration
Przemyslaw Szczerbik [Wed, 8 Feb 2017 14:28:09 +0000 (14:28 +0000)]
dpdkstat: Fix metrics' types
This patch fixes parsing of metrics' types. Some statistics, such as
rx_q0errors, rx_q0bytes or rx_q0packet, don't contain suffix _errors, _bytes or
_packets. This has caused them to use generic type 'derive', rather than
more specific one, for instance 'if_rx_errors'. Additionally, some
statistics contain string 'error', rather than 'errors'.
Change-Id: I51dfa9c4d98346a654adbc4041b64ebd3897278c
Signed-off-by: Przemyslaw Szczerbik <przemyslawx.szczerbik@intel.com>
Maryam Tahhan [Wed, 8 Feb 2017 13:48:12 +0000 (13:48 +0000)]
intel_rdt: bugfix configuration
Fix the configuration to stop collectd bombing out and deal with configuration
errors gracefully. Otherwise collectd will fail at the configuration phase
with: "Error: Reading the config file failed!".
Signed-off-by: Tahhan, Maryam <maryam.tahhan@intel.com>
Marc Fournier [Sat, 28 Jan 2017 10:47:38 +0000 (11:47 +0100)]
notify_email: don't explicitly link against libssl and libcrypto
libesmtp takes care of this.
Pointed out by https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852924
Marc Fournier [Wed, 25 Jan 2017 06:37:41 +0000 (07:37 +0100)]
daemon/common.c: Fix check_capability() by using cap_get_proc()
Rewrite this function, as
58acba67f made it a no-op.
Marc Fournier [Mon, 23 Jan 2017 19:05:30 +0000 (20:05 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
Ruben Kerkhof [Fri, 23 Dec 2016 17:47:59 +0000 (18:47 +0100)]
dpdkstat plugin: jump to the right label
Florian Forster [Mon, 23 Jan 2017 07:42:35 +0000 (08:42 +0100)]
Bump version to 5.7.1; Update ChangeLog.
Denys Fedoryshchenko [Fri, 6 Jan 2017 01:36:16 +0000 (03:36 +0200)]
mqtt plugin: Fix invalid symbols in topic name.
Denys Fedoryshchenko [Fri, 6 Jan 2017 01:36:16 +0000 (03:36 +0200)]
mqtt plugin: Fix resource leak.
Fixes: #2123
Marc Fournier [Tue, 10 Jan 2017 22:40:43 +0000 (23:40 +0100)]
Merge pull request #2122 from octo/issue/2108
src/daemon/plugin.c: Register plugin_update_internal_statistics() as …
Marc Fournier [Tue, 10 Jan 2017 22:01:43 +0000 (23:01 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
Marc Fournier [Tue, 10 Jan 2017 20:39:22 +0000 (21:39 +0100)]
chrony: add missing build flag
This is a backport of
211bd4843.
Marc Fournier [Tue, 10 Jan 2017 20:22:08 +0000 (21:22 +0100)]
src/daemon/plugin.c: explicitly declare vl.interval
This properly gets rid of the warning reported in #2108
Thanks to @charliesignalfx for suggesting this and reporting the issue !
Marc Fournier [Tue, 10 Jan 2017 20:17:23 +0000 (21:17 +0100)]
src/daemon/plugin.c: avoid deprecated statement
As suggested by @rubenk in #2122
Marc Fournier [Tue, 10 Jan 2017 07:34:08 +0000 (08:34 +0100)]
collectd.spec: ensure write_riemann build deps are installed
Marc Fournier [Mon, 9 Jan 2017 18:53:52 +0000 (19:53 +0100)]
collectd.spec: fixes to previous commit
Marc Fournier [Mon, 9 Jan 2017 17:06:19 +0000 (18:06 +0100)]
collectd.spec: re-enable write_riemann on EL7, as build dep is now available in EPEL7
Marc Fournier [Mon, 9 Jan 2017 10:42:21 +0000 (11:42 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
Marc Fournier [Wed, 4 Jan 2017 00:05:49 +0000 (01:05 +0100)]
curl_json: use configured interval as default timeout value
When no timeout is specified, the default timeout should be set to the
configured interval, not the default timeout (which is -1, no timeout).
This bug got introduced in
bce14a848.
Pshyk, SerhiyX [Thu, 29 Dec 2016 15:46:47 +0000 (15:46 +0000)]
intel_rdt: check libpqos library version.
Change-Id: I83d42b63873569445d4c6339d7a69761e16ead14
Signed-off-by: Serhiy Pshyk <serhiyx.pshyk@intel.com>
Florian Forster [Fri, 23 Dec 2016 08:39:08 +0000 (09:39 +0100)]
src/daemon/plugin.c: Register plugin_update_internal_statistics() as a read callback.
The previous special-snowflake-solution had issues since it didn't set a plugin
context up.
Fixes: #2108
Florian Forster [Thu, 22 Dec 2016 09:57:43 +0000 (10:57 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 22 Dec 2016 09:52:44 +0000 (10:52 +0100)]
src/daemon/common.c: Change swrite() to return errno if possible.
Florian Forster [Thu, 22 Dec 2016 08:13:52 +0000 (09:13 +0100)]
Merge pull request #2121 from octo/netapp
netapp plugin: Fix complation problems.
Florian Forster [Wed, 21 Dec 2016 14:02:05 +0000 (15:02 +0100)]
netapp plugin: Fix compilation problems.
Fixes: #2120
Florian Forster [Mon, 19 Dec 2016 08:09:05 +0000 (09:09 +0100)]
Auto-Merge pull request #2113 from rubenk/dpdk-double-close
Automatically merged due to "Automerge" label
Ruben Kerkhof [Sun, 18 Dec 2016 12:05:59 +0000 (13:05 +0100)]
Merge pull request #2114 from mfournier/dpdkstat-formatstring
dpdkstat: use portable format strings
Marc Fournier [Sun, 18 Dec 2016 10:17:59 +0000 (11:17 +0100)]
dpdkstat: use portable format strings
Florian Forster [Sat, 17 Dec 2016 19:04:15 +0000 (20:04 +0100)]
Merge pull request #2112 from rubenk/battery-plugin-nul-terminate-buffer
Battery plugin: nul-terminate buffer
Ruben Kerkhof [Sat, 17 Dec 2016 17:50:58 +0000 (18:50 +0100)]
dpdkstat: don't close already closed fd on failure
CID #158525
Ruben Kerkhof [Sat, 17 Dec 2016 17:39:39 +0000 (18:39 +0100)]
battery plugin: null-terminate buffer
We call strstripnewline on it, which expects a null-terminated string.
CID #158524
Ruben Kerkhof [Sat, 17 Dec 2016 16:44:47 +0000 (17:44 +0100)]
Fix parallel build
Fixes #2110
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
Florian Forster [Fri, 16 Dec 2016 17:42:13 +0000 (18:42 +0100)]
src/utils_cmd_getthreshold.c: Fix formatting.
Florian Forster [Fri, 16 Dec 2016 17:38:34 +0000 (18:38 +0100)]
set target: Avoid casting negative int to size_t.
CID: 157643
Florian Forster [Fri, 16 Dec 2016 13:39:07 +0000 (14:39 +0100)]
Auto-Merge pull request #2099 from tokkee/sh/booleans
Automatically merged due to "Automerge" label
Marc Fournier [Thu, 15 Dec 2016 22:22:59 +0000 (23:22 +0100)]
update README to mention write_prometheus & support lib
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
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
Florian Forster [Mon, 12 Dec 2016 07:57:37 +0000 (08:57 +0100)]
Bump version to 5.7.0; Update ChangeLog.
Sebastian Harl [Sun, 11 Dec 2016 11:06:58 +0000 (12:06 +0100)]
configfile: Reintroduce support for boolean string config values.
For the network plugin, this was changed in
ac73c75aed7 (which landed in 5.6)
which was a backward incompatible change breaking user configuration. Adding
support back in a central location ensures a more consistent behavior across
plugins. At the same time, we issue a warning message that this behavior is
deprecated.
GH #2083, #2098
Ruben Kerkhof [Fri, 9 Dec 2016 17:15:29 +0000 (18:15 +0100)]
target_set: plug leak on error
CID 157645
Ruben Kerkhof [Fri, 9 Dec 2016 16:20:43 +0000 (17:20 +0100)]
email plugin: initialize structure
CID 38125
Ruben Kerkhof [Fri, 9 Dec 2016 14:41:18 +0000 (15:41 +0100)]
write_prometheus: plug a small leak
Found by scan-build
Florian Forster [Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100)]
Merge branch 'collectd-5.6' 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
Florian Forster [Tue, 6 Dec 2016 12:28:20 +0000 (13:28 +0100)]
smart plugin: Refactor, demote warnings to debug.
Fixes: #2062
Florian Forster [Tue, 6 Dec 2016 09:55:42 +0000 (10:55 +0100)]
src/utils_cmd_*.[ch]: Remove unused and redundant includes.
Florian Forster [Tue, 6 Dec 2016 09:55:06 +0000 (10:55 +0100)]
src/Makefile.am: Fix linking with libcmds.la.
Issue: #2067
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>
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
Florian Forster [Mon, 5 Dec 2016 10:49:34 +0000 (11:49 +0100)]
src/daemon/utils_random.[ch]: Implement cdrand_u().
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.
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
Florian Forster [Wed, 30 Nov 2016 08:44:51 +0000 (09:44 +0100)]
Bump version to 5.6.1; Update ChangeLog.
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
Ruben Kerkhof [Tue, 29 Nov 2016 14:43:22 +0000 (15:43 +0100)]
Fix make distcheck
This was broken by
1d888f3
Kevin Bowling [Wed, 6 Apr 2016 06:17:26 +0000 (23:17 -0700)]
Collected podtypo
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
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.
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
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
Ruben Kerkhof [Tue, 29 Nov 2016 10:43:08 +0000 (11:43 +0100)]
collectd.spec: disable redis plugin on EL6
Florian Forster [Mon, 28 Nov 2016 21:23:24 +0000 (22:23 +0100)]
Even more renormalization.
Florian Forster [Mon, 28 Nov 2016 21:23:04 +0000 (22:23 +0100)]
Merge branch 'collectd-5.6'
Florian Forster [Mon, 28 Nov 2016 21:22:01 +0000 (22:22 +0100)]
More reformatting.
No idea why the previous round missed these files.
Florian Forster [Mon, 28 Nov 2016 21:16:04 +0000 (22:16 +0100)]
Merge branch 'collectd-5.6'
Florian Forster [Mon, 28 Nov 2016 21:15:48 +0000 (22:15 +0100)]
Tree wide: Reformat with clang-format.
Florian Forster [Mon, 28 Nov 2016 21:09:22 +0000 (22:09 +0100)]
Tree wide: Reformat with clang-format.
Florian Forster [Mon, 28 Nov 2016 20:48:36 +0000 (21:48 +0100)]
Merge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Mon, 28 Nov 2016 15:51:37 +0000 (16:51 +0100)]
Bump version to 5.5.3; Update ChangeLog.
Florian Forster [Mon, 28 Nov 2016 08:03:12 +0000 (09:03 +0100)]
Merge branch 'pr/2056'