Ruben Kerkhof [Fri, 4 Dec 2015 22:17:13 +0000 (23:17 +0100)]
processes plugin: plug leak on error
CID #38004
Ruben Kerkhof [Fri, 4 Dec 2015 20:12:06 +0000 (21:12 +0100)]
Merge pull request #1404 from rubenk/libcollectdclient-fix-double-close
libcollectdclient: don't close socket twice
Ruben Kerkhof [Fri, 4 Dec 2015 20:11:51 +0000 (21:11 +0100)]
Merge pull request #1406 from rubenk/snmp-uninitialized-read
snmp plugin: don't read from uninitialized pointer
Ruben Kerkhof [Fri, 4 Dec 2015 18:31:16 +0000 (19:31 +0100)]
snmp plugin: don't read from uninitialized pointer
if the first snmp_pdu_create inside the loop returns an error,
we exit the loop with res uninitialized and then call snmp_free_pdu on it.
CID #38037
Ruben Kerkhof [Fri, 4 Dec 2015 18:02:32 +0000 (19:02 +0100)]
libcollectdclient: don't close socket twice
CID #38039
Florian Forster [Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)]
Merge branch 'pr/1395'
Florian Forster [Fri, 4 Dec 2015 15:38:16 +0000 (16:38 +0100)]
ping plugin: Limit payload to 65487 bytes.
A couple of coding style fixes have also been applied.
Florian Forster [Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)]
Merge branch 'pr/846'
Florian Forster [Fri, 4 Dec 2015 10:55:09 +0000 (11:55 +0100)]
write_graphite plugin: Rename "ForceReconnectTimeout" to "ReconnectInterval".
Florian Forster [Fri, 4 Dec 2015 10:47:43 +0000 (11:47 +0100)]
write_graphite plugin: Coding style fixes.
Ruben Kerkhof [Thu, 3 Dec 2015 14:14:37 +0000 (15:14 +0100)]
Merge pull request #1391 from rubenk/openvpn
openvpn plugin: Check return value of malloc().
Florian Forster [Thu, 3 Dec 2015 06:17:15 +0000 (07:17 +0100)]
snmp plugin: Use the PRIu8 macro to format uint8_t values.
Florian Forster [Thu, 3 Dec 2015 06:14:15 +0000 (07:14 +0100)]
Merge remote-tracking branch 'github/pr/1397'
Frank de Jong [Wed, 2 Dec 2015 10:55:26 +0000 (11:55 +0100)]
GenericJMX plugin: memory leak, indent and compile warn fixes
- call close() on JMXConnector if JMX connection fails; fixes memory leak
- fix indentation errors
- fix "unchecked" compile warnings
- some refactoring
Vincent Bernat [Wed, 2 Dec 2015 09:55:39 +0000 (10:55 +0100)]
snmp: accept to use IpAddress for instances
Some interesting MIB are indexed with an IP address (for example,
BGP4-MIB). Make collectd able to use those indexes as instances. Format
the IP as string. IPv6 are usually encoded as Octet String, so, they
should be already supported.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
Florian Forster [Wed, 2 Dec 2015 09:49:36 +0000 (10:49 +0100)]
Merge branch 'ff/statsd'
Florian Forster [Wed, 2 Dec 2015 09:44:43 +0000 (10:44 +0100)]
Merge branch 'pr/1394'
Florian Forster [Wed, 2 Dec 2015 09:43:42 +0000 (10:43 +0100)]
varnish plugin: Fix implicit cast from int to bool.
Also revert the inclusion of <stdbool.h> as per our coding guidelines.
The native C99 _Bool is used instead.
Florian Forster [Thu, 26 Nov 2015 09:33:07 +0000 (10:33 +0100)]
utils_time.[ch]: Control mocking by preprocessor define.
This allows us to test rfc3339() while mocking out cdtime().
Florian Forster [Tue, 24 Nov 2015 12:43:58 +0000 (13:43 +0100)]
src/daemon/utils_time.[ch]: Create RFC 3339 strings.
RFC 3339 is a "profile" of ISO 8601, i.e. (almost) all valid RFC 3339
strings are also valid ISO 8601 strings.
Marc Fournier [Wed, 2 Dec 2015 08:14:59 +0000 (09:14 +0100)]
Merge pull request #1293 from mfournier/read-threads-timing
Read threads timing
Marc Fournier [Wed, 2 Dec 2015 07:53:53 +0000 (08:53 +0100)]
GenericJMX plugin: fix indentation/bracket error
1e2ad9c0 contained a mistake which resulted in the following build
error. It seems to be a bad copy-paste when creating #1330 from the
patch in #1291.
```
./org/collectd/java/GenericJMXConfValue.java:535: error: variable tmp is already defined in constructor GenericJMXConfValue(OConfigItem)
String tmp = getConfigString (child);
```
Witold Baryluk [Wed, 2 Dec 2015 00:51:36 +0000 (01:51 +0100)]
Allow Size 0 in ping plugin, and fix minor style issues there
Witold Baryluk [Wed, 2 Dec 2015 00:43:00 +0000 (01:43 +0100)]
Add config option "Size" to ping plugin
lzmths [Wed, 2 Dec 2015 00:40:36 +0000 (21:40 -0300)]
Cleaning conditional directives that break statements.
Florian Forster [Tue, 1 Dec 2015 20:57:30 +0000 (21:57 +0100)]
collectd-java(5): Document the new "PluginName" option.
David Crane [Sun, 4 Oct 2015 02:33:00 +0000 (02:33 +0000)]
GenericJMX plugin: Implement the "PluginName" config option.
Issue: #1291
Signed-off-by: Florian Forster <octo@collectd.org>
David Crane [Sun, 4 Oct 2015 00:20:37 +0000 (00:20 +0000)]
GenericJMX plugin: Support TabularData for java.lang:type=GarbageCollector.
Issue: #1290
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)]
Merge remote-tracking branch 'github/pr/1370'
Marc Fournier [Tue, 1 Dec 2015 17:14:57 +0000 (18:14 +0100)]
RPM specfile: include new notify_nagios plugin in package
toni-moreno [Tue, 7 Apr 2015 10:51:52 +0000 (12:51 +0200)]
fixed typo
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:27:56 +0000 (18:27 +0100)]
openvpn: free resource on error
Ruben Kerkhof [Sun, 29 Nov 2015 17:23:17 +0000 (18:23 +0100)]
openvpn: fix error message
Ruben Kerkhof [Sun, 29 Nov 2015 17:22:30 +0000 (18:22 +0100)]
openvpn: check return value of malloc
CID 37987
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.
Ruben Kerkhof [Sat, 28 Nov 2015 12:02:35 +0000 (13:02 +0100)]
write_kafka: fix indentation
It was all over the place.
I went with 4 spaces since that's what the majority
of code used.
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 11:49:44 +0000 (12:49 +0100)]
statsd plugin: Implement the "CounterSum" option.
Issues: #929, #1282, #1311
Florian Forster [Fri, 27 Nov 2015 09:06:20 +0000 (10:06 +0100)]
Merge branch 'pr/1345'