toni-moreno [Sat, 24 Jan 2015 06:34:23 +0000 (07:34 +0100)]
fixed metric lost on forced reconnects because of data buffer reset
toni-moreno [Tue, 9 Dec 2014 05:35:43 +0000 (06:35 +0100)]
added new ForceReconnectTimeout to write_graphite plugin
Florian Forster [Tue, 1 Dec 2015 15:07:44 +0000 (16:07 +0100)]
Merge branch 'ff/nagios'
Florian Forster [Tue, 1 Dec 2015 10:27:13 +0000 (11:27 +0100)]
src/daemon/plugin.c: Use sfree() exclusively.
Fixes: #1110
Marc Fournier [Mon, 30 Nov 2015 21:22:51 +0000 (22:22 +0100)]
processes: initialize cswitch counters on unsupported platforms
This is a follow-up to
e61f047e.
Florian Forster [Mon, 30 Nov 2015 10:45:51 +0000 (11:45 +0100)]
src/ceph_test.c: Use the EXPECT_EQ_STR() macro.
Florian Forster [Mon, 30 Nov 2015 10:35:40 +0000 (11:35 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Mon, 30 Nov 2015 10:25:48 +0000 (11:25 +0100)]
ceph plugin: Rewrite parse_keys() and compact_ds_name().
This rewrite removes the logic to add the original length to the end of
the buffer in case of truncation. This logic was guarded by:
tmp[DATA_MAX_NAME_LEN - 1] = '\0';
if(strlen(tmp) > DATA_MAX_NAME_LEN - 1) { ... }
and was therefore dead code.
Fixes: #1350
Florian Forster [Mon, 30 Nov 2015 09:15:06 +0000 (10:15 +0100)]
ceph plugin: Add unit test for parse_keys().
This is used to demonstrate a buffer overflow: when the first part of a
key is >63 characters, key_chars_remaining underflows and causes a buffer
overflow in the following iteration.
Issue: #1350
Ruben Kerkhof [Sun, 29 Nov 2015 18:08:58 +0000 (19:08 +0100)]
Merge pull request #1388 from rubenk/curl_json
curl_json: remove dead code
Ruben Kerkhof [Sun, 29 Nov 2015 18:08:40 +0000 (19:08 +0100)]
Merge pull request #1386 from rubenk/rrdtool-unlock-on-error
rrdtool: unlock mutex on error
Ruben Kerkhof [Sun, 29 Nov 2015 18:08:27 +0000 (19:08 +0100)]
Merge pull request #1387 from rubenk/redis-null-terminate-buffer
redis plugin: make sure buffer is null-terminated
Ruben Kerkhof [Sat, 28 Nov 2015 19:27:22 +0000 (20:27 +0100)]
curl_json: remove dead code
CID 37963
Ruben Kerkhof [Sun, 29 Nov 2015 18:05:09 +0000 (19:05 +0100)]
Merge pull request #1389 from rubenk/perl-unlock-on-error
perl: unlock mutex on error
Ruben Kerkhof [Sun, 29 Nov 2015 18:04:54 +0000 (19:04 +0100)]
Merge pull request #1385 from rubenk/gcrypt-fix
configure.ac: remove wrong gcrypt check
Ruben Kerkhof [Sun, 29 Nov 2015 17:06:33 +0000 (18:06 +0100)]
perl: unlock mutex on error
CID 37970
Ruben Kerkhof [Sun, 29 Nov 2015 16:52:26 +0000 (17:52 +0100)]
redis plugin: make sure buffer is null-terminated
CID 37938
Ruben Kerkhof [Sun, 29 Nov 2015 15:40:50 +0000 (16:40 +0100)]
rrdtool: unlock mutex on error
CID 37972
Ruben Kerkhof [Sun, 29 Nov 2015 12:35:12 +0000 (13:35 +0100)]
Merge pull request #1384 from rubenk/irq-close-file-descriptor-on-failure
irq plugin: close file descriptor on failure
Ruben Kerkhof [Sun, 29 Nov 2015 12:34:56 +0000 (13:34 +0100)]
Merge pull request #1383 from rubenk/fhcount-close-file-descriptor-on-failure
fhcount plugin: close file descriptor on failure
Ruben Kerkhof [Sun, 29 Nov 2015 12:34:42 +0000 (13:34 +0100)]
Merge pull request #1382 from rubenk/modbus-fix-resource-leaks
modbus plugin: fix 2 leaks on error paths
Ruben Kerkhof [Sun, 29 Nov 2015 12:34:11 +0000 (13:34 +0100)]
Merge pull request #1381 from rubenk/filecount-fix-resource-leak
filecount plugin: fix leak on error path
Ruben Kerkhof [Sun, 29 Nov 2015 11:27:36 +0000 (12:27 +0100)]
configure.ac: remove wrong gcrypt check
After all the effort to detect GCRYPT_CPPFLAGS and GCRYPT_LIBS
in previous checks, this check blindly overwrites them, even
if the AM_PATH_LIBGCRYPT macro isn't found.
Also, I think it's better to check for specific functionality in a library
than an explicit minimum version, which we already did.
Ruben Kerkhof [Sat, 28 Nov 2015 22:17:59 +0000 (23:17 +0100)]
irq plugin: close file descriptor on failure
CID 38018
Ruben Kerkhof [Sat, 28 Nov 2015 22:15:24 +0000 (23:15 +0100)]
fhcount plugin: close file descriptor on failure
Ruben Kerkhof [Sat, 28 Nov 2015 22:13:01 +0000 (23:13 +0100)]
filecount plugin: fix leak on error path
Ruben Kerkhof [Sat, 28 Nov 2015 22:07:31 +0000 (23:07 +0100)]
modbus plugin: fix 2 leaks on error paths
Ruben Kerkhof [Sat, 28 Nov 2015 20:44:05 +0000 (21:44 +0100)]
Merge pull request #1380 from rubenk/csv-plug-leak-on-error-path
Csv plug leak on error path
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:55 +0000 (21:43 +0100)]
Merge pull request #1379 from rubenk/ceph-close-fd-on-error
ceph plugin: close fd on error
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:44 +0000 (21:43 +0100)]
Merge pull request #1378 from rubenk/bind-dont-free-invalid-pointer
bind: tmp doesn't point to start of allocated memory
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:29 +0000 (21:43 +0100)]
Merge pull request #1377 from rubenk/mqtt-fix-out-of-bounds-write
mqtt: fix an out-of-bounds write
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:17 +0000 (21:43 +0100)]
Merge pull request #1376 from rubenk/amqp-fix-buffer-size
amqp: use the right buffer size for sstrncpy
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:02 +0000 (21:43 +0100)]
Merge pull request #1375 from rubenk/redis-unlock-lock
write_redis: don't return with lock held
Ruben Kerkhof [Sat, 28 Nov 2015 20:42:50 +0000 (21:42 +0100)]
Merge pull request #1374 from rubenk/powerdns-fix-array-initialization
powerdns plugin: fix array initialization
Ruben Kerkhof [Sat, 28 Nov 2015 19:21:16 +0000 (20:21 +0100)]
csv plugin: remove trailing whitespace
Ruben Kerkhof [Sat, 28 Nov 2015 19:19:26 +0000 (20:19 +0100)]
csv plugin: plug memory leak on error
CID 38015
Ruben Kerkhof [Sat, 28 Nov 2015 19:07:03 +0000 (20:07 +0100)]
ceph plugin: close fd on error
Ruben Kerkhof [Sat, 28 Nov 2015 18:45:42 +0000 (19:45 +0100)]
bind: tmp doesn't point to start of allocated memory
Ruben Kerkhof [Sat, 28 Nov 2015 17:59:17 +0000 (18:59 +0100)]
mqtt: fix an out-of-bounds write
CID 37990
Ruben Kerkhof [Sat, 28 Nov 2015 17:48:20 +0000 (18:48 +0100)]
amqp: use the right buffer size for sstrncpy
buffer is a char *, not an array, so size_of returns the size
of the pointer.
Ruben Kerkhof [Sat, 28 Nov 2015 17:37:15 +0000 (18:37 +0100)]
write_redis: don't return with lock held
Ruben Kerkhof [Sat, 28 Nov 2015 17:30:58 +0000 (18:30 +0100)]
powerdns plugin: fix array initialization
Ruben Kerkhof [Sat, 28 Nov 2015 16:16:44 +0000 (17:16 +0100)]
Merge pull request #1371 from rubenk/mqtt-plug-leak
mqtt: plug leak on error path
Ruben Kerkhof [Sat, 28 Nov 2015 13:54:54 +0000 (14:54 +0100)]
Fix build with older version of libprotobuf-c
Ruben Kerkhof [Sat, 28 Nov 2015 13:07:29 +0000 (14:07 +0100)]
Revert "Set bugreport url and homepage url"
The net-snmp public headers are generated by autoconf
so they also define PACKAGE_URL (and lots more).
Apparently this is completely normal and documented at
http://www.net-snmp.org/tutorial/tutorial-5/toolkit/autoconf/index.html
This reverts commit
e16e805eae42f911a6f9ab81420fcaf1a957810f.
Ruben Kerkhof [Sat, 28 Nov 2015 12:33:02 +0000 (13:33 +0100)]
Merge pull request #1199 from rubenk/remove-gcrypt-exec-prefix-check
Remove gcrypt exec prefix check
Ruben Kerkhof [Sat, 28 Nov 2015 12:32:24 +0000 (13:32 +0100)]
Merge pull request #1210 from rubenk/protoc
Protoc
Ruben Kerkhof [Sat, 28 Nov 2015 12:29:08 +0000 (13:29 +0100)]
mqtt: plug leak on error path
Ruben Kerkhof [Sat, 28 Nov 2015 12:25:10 +0000 (13:25 +0100)]
Merge pull request #958 from rubenk/fix-version-gen-sh
Only run git describe when we're in a git repo
Ruben Kerkhof [Wed, 4 Mar 2015 13:54:52 +0000 (14:54 +0100)]
Only run git describe when we're in a git repo
This fixes an issue I see when extracting a collectd
tarball into another git repo (the Fedora collectd rpm one).
In that case version-gen.sh picked up the last tag from the Fedora
repo, which is the wrong one.
Ruben Kerkhof [Sat, 28 Nov 2015 12:17:38 +0000 (13:17 +0100)]
Merge pull request #1219 from rubenk/version-gen
Some more version-gen.sh tweaks
Ruben Kerkhof [Sat, 28 Nov 2015 12:15:44 +0000 (13:15 +0100)]
Merge pull request #1220 from rubenk/set-package-bugreport-and-homepage
Set bugreport url and homepage url
Ruben Kerkhof [Sun, 9 Aug 2015 17:05:25 +0000 (19:05 +0200)]
protoc: check for headers in new location as well
Newer versions of protobuf-c have their headers in
/usr/include/protobuf-c, and a symlink from
/usr/include/google/protobuf-c/.
These symlinks will eventually disappear however, so be prepared.
Ruben Kerkhof [Sun, 9 Aug 2015 17:02:25 +0000 (19:02 +0200)]
protoc: check for libprotobuf-c as well
Ruben Kerkhof [Sun, 9 Aug 2015 16:28:30 +0000 (18:28 +0200)]
protoc: simplify configure check
Ruben Kerkhof [Sun, 9 Aug 2015 15:23:11 +0000 (17:23 +0200)]
protoc: slightly nicer output in silent mode
make[1]: Entering directory '/home/ruben/src/collectd/src'
PROTOC-C pinba.pb-c.c
PROTOC-C riemann.pb-c.c
Ruben Kerkhof [Sun, 9 Aug 2015 15:02:33 +0000 (17:02 +0200)]
protoc: log when compiler is missing
In the case where we do have the required headers
but don't have the compiler, this makes it more clear
that we're missing the latter.
Ruben Kerkhof [Sun, 9 Aug 2015 14:09:57 +0000 (16:09 +0200)]
Silence protoc-c in silence mode
Instead of showing the full command line, this shows:
GEN pinba.pb-c.c
GEN riemann.pb-c.c
Ruben Kerkhof [Sun, 9 Aug 2015 13:52:33 +0000 (15:52 +0200)]
write_riemann: only compile .proto files when enabled
If the write_riemann plugin is not enabled there's no
need to compile the protobuf files.
Ruben Kerkhof [Sun, 9 Aug 2015 13:50:55 +0000 (15:50 +0200)]
Pinba: only compile .proto files when enabled
If the pinba plugin is not enabled there's no
need to compile the protobuf files.
Florian Forster [Sat, 28 Nov 2015 06:56:14 +0000 (07:56 +0100)]
Merge remote-tracking branch 'github/pr/1366'
Ruben Kerkhof [Fri, 27 Nov 2015 21:14:08 +0000 (22:14 +0100)]
snmp plugin: plug leak in error path.
Partial back port of #1368.
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 27 Nov 2015 16:01:15 +0000 (17:01 +0100)]
Travis: switch to new Trusty environment
https://docs.travis-ci.com/user/trusty-ci-environment
Florian Forster [Fri, 27 Nov 2015 09:06:20 +0000 (10:06 +0100)]
Merge branch 'pr/1345'
Florian Forster [Fri, 27 Nov 2015 09:05:48 +0000 (10:05 +0100)]
mqtt plugin: Add TLS options to the example config and improve documentation.
Florian Forster [Fri, 27 Nov 2015 09:04:35 +0000 (10:04 +0100)]
mqtt plugin: Rename "TLSprotocol" to "TLSProtocol".
Florian Forster [Fri, 27 Nov 2015 09:03:54 +0000 (10:03 +0100)]
mqtt plugin: Rename "CACertificateFile" to "CACert".
This way the option name is consistent with the name used by the cURL
plugins.
Sorry for previous comments in #1345 that pushed towards copying Apache
HTTPd's naming schema -- being consistent within collectd is more
important.
Florian Forster [Fri, 27 Nov 2015 06:42:25 +0000 (07:42 +0100)]
Merge commit 'refs/pull/1360/head' of github.com:collectd/collectd
Florian Forster [Thu, 26 Nov 2015 21:46:30 +0000 (22:46 +0100)]
Merge remote-tracking branch 'github/pr/1355'
Ruben Kerkhof [Sat, 25 Jul 2015 13:21:52 +0000 (15:21 +0200)]
utils_mount: use reentrant getmntent_r when we can
Fixes #1162
(cherry picked from commit
a916ae72b89d0bcb5fe28d55def7327e8a1f6ce0)
Nicholas Humfrey [Thu, 26 Nov 2015 20:29:30 +0000 (20:29 +0000)]
Allow MQTT payloads without NULL string termination
Ruben Kerkhof [Thu, 26 Nov 2015 20:28:10 +0000 (21:28 +0100)]
Merge pull request #1163 from rubenk/fix-data-race-in-df-and-cgroup-plugins
utils_mount: use reentrant getmntent_r when we can
fanyeren [Thu, 26 Nov 2015 13:50:24 +0000 (21:50 +0800)]
table plugin: log_warn is better than log_err
Florian Forster [Thu, 26 Nov 2015 13:22:28 +0000 (14:22 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Thu, 26 Nov 2015 13:22:20 +0000 (14:22 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Corey Kosak [Wed, 25 Nov 2015 21:54:30 +0000 (16:54 -0500)]
c_avl_pick needs to update the 'size' field of the tree when it deletes
a node.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 26 Nov 2015 13:13:17 +0000 (14:13 +0100)]
utils_avltree_test.c: Extend unit test to test c_avl_pick().
This demonstrates the bug that c_avl_pick() does not decrease the AVL
tree's size.
Issue: #1353
Corey Kosak [Wed, 25 Nov 2015 22:03:47 +0000 (17:03 -0500)]
Remove duplicate call to pthread_mutex_destroy.
Florian Forster [Wed, 25 Nov 2015 10:51:04 +0000 (11:51 +0100)]
statsd plugin: Correctly free metrics at shutdown.
The previous shutdown handler leaked "timer" and "set" metrics. This is
not a huge problem in itself, as the daemon is exiting shortly after
anyway, but it makes debugging of memory leaks very hard.
Issue: #997
Florian Forster [Fri, 20 Nov 2015 10:01:38 +0000 (11:01 +0100)]
apache plugin: DRY: use macro to determine number of fields.
Jan-Piet Mens [Tue, 17 Nov 2015 13:44:20 +0000 (14:44 +0100)]
Add TLS support
addresses #1265
protect for newer libmosquitto
address octo's comments
Marc Fournier [Sun, 15 Nov 2015 10:49:06 +0000 (11:49 +0100)]
apache: parse whole response, not only the first 16 lines
mod_status recently started reporting more statistics. According to
http://www.apache.org/dist/httpd/CHANGES_2.4 `mod_proxy, mod_ssl,
mod_cache_socache, mod_socache_*: Support machine readable server-status
produced when using the "?auto" query string.` for version 2.4.13
onwards.
As we can't assume everything we need will be included in the first 16
lines of output anymore, we now simply scan through the whole output.
Tamás Földesi [Wed, 8 Jul 2015 15:02:14 +0000 (17:02 +0200)]
Remove POLLRDNORM (equivalent to POLLIN)
Tamás Földesi [Tue, 30 Jun 2015 17:06:28 +0000 (19:06 +0200)]
Checking for closed peer connection before send
Marc Fournier [Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)]
Merge branch 'collectd-5.5'
Benjamin Drung [Tue, 27 Oct 2015 09:23:46 +0000 (10:23 +0100)]
Add utils_ignorelist back to daemon (#1323)
commit
216c6246b73645ac093de15b87aedc9abc6ebc80 moves the collectd
daemon files into the src/daemon/ directory, but also silently drops
utils_ignorelist. Dropping utils_ignorelist from the daemon has the
drawback that it cannot be used by plugins any more and that 16 plugins
need to bundle ignorelist.
Thus add utils_ignorelist back to the collectd daemon.
Marc Fournier [Sun, 8 Nov 2015 16:14:54 +0000 (17:14 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Nathan Ward [Thu, 29 Oct 2015 01:22:44 +0000 (14:22 +1300)]
Fix clang complaining about extraneous parenthesis.
Nathan Ward [Wed, 28 Oct 2015 12:46:29 +0000 (01:46 +1300)]
ASN_GAUGE (SNMP-SMIv2 Gauge32) is unsigned, not signed.
Jan Andres [Wed, 21 Oct 2015 11:50:43 +0000 (13:50 +0200)]
Start write threads after plugin initialization.
Some plugins such as "network" create own threads from within their
init callbacks which can then start submitting data to the queue
right away, even if the read threads haven't been started yet.
If write threads are started before plugin initialization, this can
result in a race where a plugin's write callback gets called before
that plugin's init callback has completed.
To fix this, delay starting the write threads until after all plugins
have been initialized.
Pierre-Yves Ritschard [Fri, 6 Nov 2015 09:32:55 +0000 (10:32 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Pierre-Yves Ritschard [Mon, 19 Oct 2015 09:53:26 +0000 (11:53 +0200)]
statsd: provide a gauge for counters, holding the absolute count.
When not using StoreRates false, this allows statsd aggregators
to hold on to the absolute count, if needed.
Marc Fournier [Fri, 6 Nov 2015 08:42:11 +0000 (09:42 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 6 Nov 2015 08:32:40 +0000 (09:32 +0100)]
battery: add missing capacity type to types.db
For the record, "capacity" was introduced by
a2e732f8.
Also fix a bogus example in collectd.conf.
Thanks to @ryan-williams for reporting the problem !
Fix #1338
Florian Forster [Thu, 5 Nov 2015 13:42:29 +0000 (14:42 +0100)]
notify_nagios plugin: Add plugin for writing Nagios passive check results.
Sergey [Tue, 3 Nov 2015 06:19:50 +0000 (07:19 +0100)]
apcups: prefix plugin name in INFO and DEBUG statements
Fixes #1329
Pierre-Yves Ritschard [Mon, 2 Nov 2015 08:20:54 +0000 (09:20 +0100)]
Merge pull request #1311 from pyr/fix/1282
statsd: provide a gauge for counters, holding the absolute count.
Marc Fournier [Fri, 30 Oct 2015 21:33:19 +0000 (22:33 +0100)]
Merge pull request #1309 from baryonix/time_fix
Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.
Brian Kelly [Thu, 30 Jul 2015 13:42:36 +0000 (09:42 -0400)]
write_redis plugin: Add support for StoreRates option