Code

collectd.git
8 years agocollectd, collectdmon: Store return value of open() and dup().
Florian Forster [Tue, 8 Dec 2015 10:14:28 +0000 (11:14 +0100)]
collectd, collectdmon: Store return value of open() and dup().

This is to make Coverity happy.

CID: 38011, 38012

8 years agoMerge remote-tracking branch 'github/pr/1437'
Florian Forster [Tue, 8 Dec 2015 09:44:13 +0000 (10:44 +0100)]
Merge remote-tracking branch 'github/pr/1437'

8 years agosrc/daemon/utils_time.h: Avoid incorrect rounding in CDTIME_T_TO_TIME{VAL,SPEC}.
Florian Forster [Tue, 8 Dec 2015 09:33:17 +0000 (10:33 +0100)]
src/daemon/utils_time.h: Avoid incorrect rounding in CDTIME_T_TO_TIME{VAL,SPEC}.

This change also partially expands CDTIME_T_TO_{US,NS} to avoid dead
code warnings in Coverity.

Fixes: #1446
CID: 37950, 37951, 37952, 37953, 37954, 41722

8 years agosrc/daemon/utils_time_test.c: Check the "tv_sec" field of struct time{val,spec}.
Florian Forster [Tue, 8 Dec 2015 09:32:40 +0000 (10:32 +0100)]
src/daemon/utils_time_test.c: Check the "tv_sec" field of struct time{val,spec}.

Also fixes an incorrect "expected" test value.

Issue: #1446

8 years agoMerge remote-tracking branch 'github/pr/1440'
Florian Forster [Tue, 8 Dec 2015 09:00:30 +0000 (10:00 +0100)]
Merge remote-tracking branch 'github/pr/1440'

8 years agoMerge remote-tracking branch 'github/pr/1438'
Florian Forster [Tue, 8 Dec 2015 08:24:22 +0000 (09:24 +0100)]
Merge remote-tracking branch 'github/pr/1438'

8 years agointerface plugin: Fix review comments.
Yoga Ramalingam [Mon, 7 Dec 2015 20:59:39 +0000 (15:59 -0500)]
interface plugin: Fix review comments.

Issue: #1416

8 years agointerface plugin: Add UniqueName config property.
Yoga Ramalingam [Mon, 7 Dec 2015 15:09:08 +0000 (10:09 -0500)]
interface plugin: Add UniqueName config property.

Issue: #1416

8 years agointerface plugin: Fix duplicate interface metrics for Solaris.
Yoga Ramalingam [Fri, 4 Dec 2015 21:08:54 +0000 (16:08 -0500)]
interface plugin: Fix duplicate interface metrics for Solaris.

Issue: #1416

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Sun, 6 Dec 2015 15:43:11 +0000 (16:43 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 6 Dec 2015 15:40:36 +0000 (16:40 +0100)]
Merge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5

8 years agoMerge pull request #1441 from chicha/fix-gitignore
Ruben Kerkhof [Sun, 6 Dec 2015 14:36:57 +0000 (15:36 +0100)]
Merge pull request #1441 from chicha/fix-gitignore

.gitignore: ignore test_plugin_ceph

8 years ago.gitignore: ignore test_plugin_ceph
Charles-Henri d'Adhémar [Sun, 6 Dec 2015 14:19:44 +0000 (15:19 +0100)]
.gitignore: ignore test_plugin_ceph

8 years agowrite_kafka: fix two leaks on error
Ruben Kerkhof [Sun, 6 Dec 2015 11:21:45 +0000 (12:21 +0100)]
write_kafka: fix two leaks on error

CID #38124

8 years agoiptables plugin: indent consistently
Ruben Kerkhof [Sun, 6 Dec 2015 09:12:03 +0000 (10:12 +0100)]
iptables plugin: indent consistently

8 years agoiptables plugin: move comment to right place
Ruben Kerkhof [Sun, 6 Dec 2015 08:57:33 +0000 (09:57 +0100)]
iptables plugin: move comment to right place

8 years agomultimeter plugin: Initizliaze "struct termios".
Florian Forster [Sat, 5 Dec 2015 22:37:16 +0000 (23:37 +0100)]
multimeter plugin: Initizliaze "struct termios".

CID: 38036

8 years agoconfigure.ac: fix previous change to detect libjvm
Ruben Kerkhof [Sat, 5 Dec 2015 21:17:43 +0000 (22:17 +0100)]
configure.ac: fix previous change to detect libjvm

This worked on OSX but failed on Linux.

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoMerge branch 'collectd-5.5'
Florian Forster [Sat, 5 Dec 2015 22:08:22 +0000 (23:08 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Sat, 5 Dec 2015 22:07:14 +0000 (23:07 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agometa_data.c: check return value of md_entry_alloc
Ruben Kerkhof [Sat, 5 Dec 2015 13:20:29 +0000 (14:20 +0100)]
meta_data.c: check return value of md_entry_alloc

CID #37986

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoiptables plugin: remove dead code
Ruben Kerkhof [Sat, 5 Dec 2015 14:07:40 +0000 (15:07 +0100)]
iptables plugin: remove dead code

ip version is either IPv4 or IPv6

CID #37962

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agosrc/filter_chain.c: Refactor fc_process_chain() a wee bit.
Florian Forster [Sat, 5 Dec 2015 21:49:05 +0000 (22:49 +0100)]
src/filter_chain.c: Refactor fc_process_chain() a wee bit.

8 years agosrc/filter_chain.c: Delete dead code.
Florian Forster [Sat, 5 Dec 2015 21:48:18 +0000 (22:48 +0100)]
src/filter_chain.c: Delete dead code.

CID: 37961

8 years agosrc/common.c: Check arguments of parse_values().
Florian Forster [Sat, 5 Dec 2015 21:30:39 +0000 (22:30 +0100)]
src/common.c: Check arguments of parse_values().

CID: 37965

8 years agolibcollectdclient: Check return value of setsockopt().
Florian Forster [Sat, 5 Dec 2015 21:23:05 +0000 (22:23 +0100)]
libcollectdclient: Check return value of setsockopt().

Coverity CID 37944.

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoMerge branch 'collectd-5.5'
Florian Forster [Sat, 5 Dec 2015 21:06:46 +0000 (22:06 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Sat, 5 Dec 2015 21:06:35 +0000 (22:06 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoconfigure.ac: fix libjvm detection on OSX
Ruben Kerkhof [Sat, 5 Dec 2015 14:50:46 +0000 (15:50 +0100)]
configure.ac: fix libjvm detection on OSX

Shared libraries have the extension .dylib instead of .so

Ideally we look at shrext_cmds from libtool to find the shared library
extension but this works too.

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agounixsock: check return value of chmod
Ruben Kerkhof [Sat, 5 Dec 2015 14:16:36 +0000 (15:16 +0100)]
unixsock: check return value of chmod

CID #37948

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agozookeeper plugin: remove dead code
Ruben Kerkhof [Sat, 5 Dec 2015 14:02:43 +0000 (15:02 +0100)]
zookeeper plugin: remove dead code

status cannot be 0 inside the loop

CID #37964

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agowrite_tsdb plugin: don't close a closed socket
Ruben Kerkhof [Sat, 5 Dec 2015 13:28:23 +0000 (14:28 +0100)]
write_tsdb plugin: don't close a closed socket

CID #37979 and #37980

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agozfs-arc plugin: check return value of malloc
Ruben Kerkhof [Sat, 5 Dec 2015 13:14:54 +0000 (14:14 +0100)]
zfs-arc plugin: check return value of malloc

CID #37989

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agobind plugin: plug small leak
Ruben Kerkhof [Sat, 5 Dec 2015 13:09:12 +0000 (14:09 +0100)]
bind plugin: plug small leak

CID #37992

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agocurl_xml plugin: plug a few leaks on error
Ruben Kerkhof [Sat, 5 Dec 2015 13:03:58 +0000 (14:03 +0100)]
curl_xml plugin: plug a few leaks on error

CID #37993

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agostats plugin: close fd on error
Ruben Kerkhof [Sat, 5 Dec 2015 12:42:33 +0000 (13:42 +0100)]
stats plugin: close fd on error

CID #37995

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoutils_cache.c: plug leak on error
Ruben Kerkhof [Sat, 5 Dec 2015 12:39:03 +0000 (13:39 +0100)]
utils_cache.c: plug leak on error

CID #38000

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoAggregration plugin: plug leak on error
Ruben Kerkhof [Sat, 5 Dec 2015 12:33:54 +0000 (13:33 +0100)]
Aggregration plugin: plug leak on error

CID #38005

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agovarnish plugin: fix two resource leaks on error
Ruben Kerkhof [Sat, 5 Dec 2015 12:21:25 +0000 (13:21 +0100)]
varnish plugin: fix two resource leaks on error

CID #42774

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agowrite_riemann plugin: plug leak on error
Ruben Kerkhof [Sat, 5 Dec 2015 11:11:26 +0000 (12:11 +0100)]
write_riemann plugin: plug leak on error

CID #37996

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agolibcollectdclient: free result of getaddrinfo
Ruben Kerkhof [Sat, 5 Dec 2015 11:09:00 +0000 (12:09 +0100)]
libcollectdclient: free result of getaddrinfo

CID #37997

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agowrite_sensu plugin: fix two resource leaks on error
Ruben Kerkhof [Sat, 5 Dec 2015 10:47:46 +0000 (11:47 +0100)]
write_sensu plugin: fix two resource leaks on error

CID #37999

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agomadwifi: make code a little bit clearer
Ruben Kerkhof [Fri, 4 Dec 2015 20:03:44 +0000 (21:03 +0100)]
madwifi: make code a little bit clearer

buf2 is initialized to zero, readlink
will write at most sizeof(buf2) -1 bytes,
so the trailing null should not be overwritten.

Coverity doesn't see that, rewrite the code
differently so it does.

CID #38027

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agomosquitto plugin: fixup flag handling
Ruben Kerkhof [Sat, 5 Dec 2015 16:09:00 +0000 (17:09 +0100)]
mosquitto plugin: fixup flag handling

Split build flags in _LDFLAGS and _LIBS
Keep existing CPPFLAGS and LDFLAGS set from the command line.

This ensures we will pick up libmosquitto when running
./configure CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib",
just like we do for other plugins.

8 years agoMerge branch 'collectd-5.5'
Florian Forster [Sat, 5 Dec 2015 07:57:07 +0000 (08:57 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into 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

8 years agoPinba plugin: close fd on error
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>
8 years agoMerge remote-tracking branch 'github/pr/1419'
Florian Forster [Sat, 5 Dec 2015 07:55:10 +0000 (08:55 +0100)]
Merge remote-tracking branch 'github/pr/1419'

8 years agoconfigfile.c: close dir on error
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>
8 years agoturbostat plugin: close fd on error
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>
8 years agoutils_fbhash.c: fix resource leak on error
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>
8 years agomultimeter plugin: fix fd leak
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>
8 years agoMerge remote-tracking branch 'github/pr/1413'
Florian Forster [Sat, 5 Dec 2015 07:51:41 +0000 (08:51 +0100)]
Merge remote-tracking branch 'github/pr/1413'

8 years agopostgresql plugin: don't exit on malloc failure
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>
8 years agoperl: Check for NULL before dereferencing
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>
8 years agotable plugin: fix check for realloc
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>
8 years agoutils_mount.c: check for null before dereferencing
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>
8 years agoutils_mount.c: check for null before dereferencing
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>
8 years agozfs_arc plugin: leave enough room for terminating null
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>
8 years agoteamspeak2: fix potential use after close
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>
8 years agoMerge remote-tracking branch 'github/pr/1403'
Florian Forster [Sat, 5 Dec 2015 07:40:41 +0000 (08:40 +0100)]
Merge remote-tracking branch 'github/pr/1403'

8 years agoprocesses plugin: plug leak on error
Ruben Kerkhof [Fri, 4 Dec 2015 22:17:13 +0000 (23:17 +0100)]
processes plugin: plug leak on error

CID #38004

8 years agotypes_list.c: fix two resource leaks
Ruben Kerkhof [Fri, 4 Dec 2015 20:50:55 +0000 (21:50 +0100)]
types_list.c: fix two resource leaks

CID #38017

8 years agoMerge pull request #1404 from rubenk/libcollectdclient-fix-double-close
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

8 years agoMerge pull request #1406 from rubenk/snmp-uninitialized-read
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

8 years agosnmp 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

8 years agolibcollectdclient: don't close socket twice
Ruben Kerkhof [Fri, 4 Dec 2015 18:02:32 +0000 (19:02 +0100)]
libcollectdclient: don't close socket twice

CID #38039

8 years agogit ignore src/daemon/test_utils_time
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

8 years agothreshold plugin: Register callbacks only once.
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>
8 years agodf plugin: Fix the duplicate detection.
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
8 years agodf plugin: skip duplicate entries, fixes "uc_update: Value too old" error
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

8 years agoMerge branch 'pr/1395'
Florian Forster [Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)]
Merge branch 'pr/1395'

8 years agoping plugin: Limit payload to 65487 bytes.
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.

8 years agoMerge branch 'pr/846'
Florian Forster [Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)]
Merge branch 'pr/846'

8 years agowrite_graphite plugin: Rename "ForceReconnectTimeout" to "ReconnectInterval".
Florian Forster [Fri, 4 Dec 2015 10:55:09 +0000 (11:55 +0100)]
write_graphite plugin: Rename "ForceReconnectTimeout" to "ReconnectInterval".

8 years agowrite_graphite plugin: Coding style fixes.
Florian Forster [Fri, 4 Dec 2015 10:47:43 +0000 (11:47 +0100)]
write_graphite plugin: Coding style fixes.

8 years agoMerge pull request #1391 from rubenk/openvpn
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().

8 years agoceph plugin: Rewrite handling of JSON state.
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
8 years agosnmp plugin: Use the PRIu8 macro to format uint8_t values.
Florian Forster [Thu, 3 Dec 2015 06:17:15 +0000 (07:17 +0100)]
snmp plugin: Use the PRIu8 macro to format uint8_t values.

8 years agoMerge remote-tracking branch 'github/pr/1397'
Florian Forster [Thu, 3 Dec 2015 06:14:15 +0000 (07:14 +0100)]
Merge remote-tracking branch 'github/pr/1397'

8 years agovmem plugin: Fix pgsteal for newer Linux kernels.
Jakub Jankowski [Thu, 15 Oct 2015 23:30:33 +0000 (23:30 +0000)]
vmem plugin: Fix pgsteal for newer Linux kernels.

Fixes: #1307
8 years agoceph plugin: Refactor ceph_cb_number().
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
8 years agoGenericJMX plugin: memory leak, indent and compile warn fixes
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

8 years agosnmp: accept to use IpAddress for instances
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>
8 years agoLink collectd-tg with pthreads
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>
8 years agoMerge branch 'ff/statsd'
Florian Forster [Wed, 2 Dec 2015 09:49:36 +0000 (10:49 +0100)]
Merge branch 'ff/statsd'

8 years agoMerge branch 'pr/1394'
Florian Forster [Wed, 2 Dec 2015 09:44:43 +0000 (10:44 +0100)]
Merge branch 'pr/1394'

8 years agovarnish plugin: Fix implicit cast from int to bool.
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.

8 years agoutils_time.[ch]: Control mocking by preprocessor define.
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().

8 years agosrc/daemon/utils_time.[ch]: Create RFC 3339 strings.
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.

8 years agoMerge pull request #1293 from mfournier/read-threads-timing
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

8 years agoGenericJMX plugin: fix indentation/bracket error
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);
```

8 years agoAllow Size 0 in ping plugin, and fix minor style issues there
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

8 years agoAdd config option "Size" to ping plugin
Witold Baryluk [Wed, 2 Dec 2015 00:43:00 +0000 (01:43 +0100)]
Add config option "Size" to ping plugin

8 years agoCleaning conditional directives that break statements.
lzmths [Wed, 2 Dec 2015 00:40:36 +0000 (21:40 -0300)]
Cleaning conditional directives that break statements.

8 years agocollectd-java(5): Document the new "PluginName" option.
Florian Forster [Tue, 1 Dec 2015 20:57:30 +0000 (21:57 +0100)]
collectd-java(5): Document the new "PluginName" option.

8 years agoGenericJMX plugin: Implement the "PluginName" config 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>
8 years agoGenericJMX plugin: Support TabularData for java.lang:type=GarbageCollector.
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>
8 years agoMerge remote-tracking branch 'github/pr/1336' into collectd-5.5
Florian Forster [Tue, 1 Dec 2015 20:33:41 +0000 (21:33 +0100)]
Merge remote-tracking branch 'github/pr/1336' into collectd-5.5

8 years agoMerge remote-tracking branch 'github/pr/1370'
Florian Forster [Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)]
Merge remote-tracking branch 'github/pr/1370'