Florian Forster [Sat, 5 Dec 2015 07:57:07 +0000 (08:57 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Sat, 5 Dec 2015 07:56:17 +0000 (08:56 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 4 Dec 2015 22:21:31 +0000 (23:21 +0100)]
Pinba plugin: close fd on error
CID #38001
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 5 Dec 2015 07:55:10 +0000 (08:55 +0100)]
Merge remote-tracking branch 'github/pr/1419'
Ruben Kerkhof [Fri, 4 Dec 2015 22:14:06 +0000 (23:14 +0100)]
configfile.c: close dir on error
CID #38006
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 22:08:46 +0000 (23:08 +0100)]
turbostat plugin: close fd on error
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 21:02:29 +0000 (22:02 +0100)]
utils_fbhash.c: fix resource leak on error
CID #38014
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 20:56:40 +0000 (21:56 +0100)]
multimeter plugin: fix fd leak
If open returns 0 we leak fd.
CID #38016
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 5 Dec 2015 07:51:41 +0000 (08:51 +0100)]
Merge remote-tracking branch 'github/pr/1413'
Ruben Kerkhof [Fri, 4 Dec 2015 20:40:16 +0000 (21:40 +0100)]
postgresql plugin: don't exit on malloc failure
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 20:30:14 +0000 (21:30 +0100)]
perl: Check for NULL before dereferencing
CID #38023
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 20:22:42 +0000 (21:22 +0100)]
table plugin: fix check for realloc
We were checking the wrong thing.
CID #38024
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 20:18:27 +0000 (21:18 +0100)]
utils_mount.c: check for null before dereferencing
CID #38025
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 20:18:27 +0000 (21:18 +0100)]
utils_mount.c: check for null before dereferencing
CID #38025
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 20:09:02 +0000 (21:09 +0100)]
zfs_arc plugin: leave enough room for terminating null
CID #38028
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Fri, 4 Dec 2015 18:09:28 +0000 (19:09 +0100)]
teamspeak2: fix potential use after close
If connecting to the last host fails, we exit the loop
with a closed fd, which we try to fdopen() later on.
CID #38038
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 5 Dec 2015 07:40:41 +0000 (08:40 +0100)]
Merge remote-tracking branch 'github/pr/1403'
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:50:55 +0000 (21:50 +0100)]
types_list.c: fix two resource leaks
CID #38017
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
Charles-Henri d'Adhémar [Fri, 4 Dec 2015 16:46:31 +0000 (17:46 +0100)]
git ignore src/daemon/test_utils_time
Add src/daemon/test_utils_time to .gitignore.
Probably forgotten when introducing
db1391aaa66b8b8fad82219494f61f3452441f62
Michael Salmon [Thu, 16 Jul 2015 07:05:54 +0000 (09:05 +0200)]
threshold plugin: Register callbacks only once.
Fixes: #551
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 4 Dec 2015 16:18:24 +0000 (17:18 +0100)]
df plugin: Fix the duplicate detection.
Not that multiple devices could be mounted at the same mount point ... I think.
Fixes: #1402
Stefan Brüns [Mon, 1 Aug 2011 11:50:52 +0000 (11:50 +0000)]
df plugin: skip duplicate entries, fixes "uc_update: Value too old" error
Issue: #1402
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 12:05:03 +0000 (13:05 +0100)]
ceph plugin: Rewrite handling of JSON state.
The previous code didn't handle non-numeric map values correctly,
leaking state and resulting in ridiculously long key strings. This
rewrite fixes this and adds a unit test to ensure that this is actually
working as intended.
Fixes: #1350
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'
Jakub Jankowski [Thu, 15 Oct 2015 23:30:33 +0000 (23:30 +0000)]
vmem plugin: Fix pgsteal for newer Linux kernels.
Fixes: #1307
Florian Forster [Wed, 2 Dec 2015 19:37:28 +0000 (20:37 +0100)]
ceph plugin: Refactor ceph_cb_number().
The previous implementation was very prone to buffer overflows.
Fixes: #1350
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>
Manuel Luis Sanmartín Rozada [Sat, 8 Feb 2014 20:30:21 +0000 (21:30 +0100)]
Link collectd-tg with pthreads
Signed-off-by: Florian Forster <octo@collectd.org>
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 20:33:41 +0000 (21:33 +0100)]
Merge remote-tracking branch 'github/pr/1336' into collectd-5.5
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:25:41 +0000 (16:25 +0100)]
memcached plugin: Use a DERIVE type for the "listen disabled" metric.
Fixes: #1356
Florian Forster [Tue, 1 Dec 2015 15:18:38 +0000 (16:18 +0100)]
exec plugin: Revert file mode to 0644.
This fixes a regression from
94e562250296b1435e3e48cd302055d89c4c702b.
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:58:29 +0000 (22:58 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
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:07:31 +0000 (23:07 +0100)]
modbus plugin: fix 2 leaks on error paths
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 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: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:30:58 +0000 (18:30 +0100)]
powerdns plugin: fix array initialization
Ruben Kerkhof [Sat, 28 Nov 2015 13:54:54 +0000 (14:54 +0100)]
Fix build with older version of libprotobuf-c
Ruben Kerkhof [Tue, 4 Aug 2015 13:40:34 +0000 (15:40 +0200)]
gcrypt: take search path into account
Ruben Kerkhof [Tue, 4 Aug 2015 13:28:03 +0000 (15:28 +0200)]
gcrypt: remove exec-prefix check
libgcrypt-config --libs already includes the correct library include path.
Also, we hardcoded it to $exec-prefix/lib, which is just plain wrong on
64bit architectures.
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, 25 Jul 2015 13:21:52 +0000 (15:21 +0200)]
utils_mount: use reentrant getmntent_r when we can
Fixes #1162
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 19:27:24 +0000 (20:27 +0100)]
Set locale environment variables at startup.
Fixes: #1237
Florian Forster [Mon, 30 Nov 2015 19:02:23 +0000 (20:02 +0100)]
ntp plugin: Unify casting to gauge_t.
Also add note about STA_NANO.
Issue: #1314.
Pierre Fersing [Tue, 20 Oct 2015 09:27:41 +0000 (11:27 +0200)]
Fix NTP kerninfo offset/estimated error scaling
Florian Forster [Mon, 30 Nov 2015 12:31:49 +0000 (13:31 +0100)]
cpu plugin: Improve error message for host_processors() failing.
Issue: #22
Ruben Kerkhof [Sun, 29 Nov 2015 15:40:50 +0000 (16:40 +0100)]
rrdtool: unlock mutex on error
CID 37972
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 28 Nov 2015 19:19:26 +0000 (20:19 +0100)]
csv plugin: plug memory leak on error
CID 38015
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sun, 29 Nov 2015 17:14:28 +0000 (18:14 +0100)]
rrdtool: release another lock on error
CID 37973
Signed-off-by: Florian Forster <octo@collectd.org>
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