collectd.git
8 years agoMerge pull request #1672 from collectd/feature/recent-rdkafka
Pierre-Yves Ritschard [Mon, 18 Apr 2016 12:51:32 +0000 (14:51 +0200)]
Merge pull request #1672 from collectd/feature/recent-rdkafka

write_kafka: do not call depreciated functions unless necessary

8 years agowrite_kafka: do not call depreciated functions unless necessary
Pierre-Yves Ritschard [Mon, 18 Apr 2016 12:50:28 +0000 (14:50 +0200)]
write_kafka: do not call depreciated functions unless necessary

8 years agoMerge pull request #986 from algernon/f/riemann/rcc
Pierre-Yves Ritschard [Mon, 18 Apr 2016 08:11:36 +0000 (10:11 +0200)]
Merge pull request #986 from algernon/f/riemann/rcc

write_riemann: TLS support via riemann-c-client

8 years agoMerge branch 'master' into f/riemann/rcc
Pierre-Yves Ritschard [Mon, 18 Apr 2016 08:10:47 +0000 (10:10 +0200)]
Merge branch 'master' into f/riemann/rcc

8 years agoplugin.c: fix indentation of comment
Ruben Kerkhof [Sat, 16 Apr 2016 13:14:09 +0000 (15:14 +0200)]
plugin.c: fix indentation of comment

8 years agovirt plugin: compare pointer to NULL, not 0
Ruben Kerkhof [Sat, 16 Apr 2016 11:54:16 +0000 (13:54 +0200)]
virt plugin: compare pointer to NULL, not 0

Found with coccinelle

8 years agoturbostat plugin: reset the right variable
Ruben Kerkhof [Sat, 16 Apr 2016 11:52:34 +0000 (13:52 +0200)]
turbostat plugin: reset the right variable

8 years agotail_csv plugin: set pointer to NULL not 0
Ruben Kerkhof [Sat, 16 Apr 2016 11:49:01 +0000 (13:49 +0200)]
tail_csv plugin: set pointer to NULL not 0

Found with coccinelle

8 years agocollectctl: compare pointer with NULL not 0
Ruben Kerkhof [Sat, 16 Apr 2016 11:46:07 +0000 (13:46 +0200)]
collectctl: compare pointer with NULL not 0

Found with coccinelle

8 years agopyvalues.c: remove unneccesary semicolon
Ruben Kerkhof [Sat, 16 Apr 2016 11:58:02 +0000 (13:58 +0200)]
pyvalues.c: remove unneccesary semicolon

Found with Coccinelle

8 years agoconfigure.ac: indent plugin list
Ruben Kerkhof [Fri, 15 Apr 2016 19:43:57 +0000 (21:43 +0200)]
configure.ac: indent plugin list

8 years agoconfigure.ac: keep plugin lists sorted
Ruben Kerkhof [Fri, 15 Apr 2016 19:27:10 +0000 (21:27 +0200)]
configure.ac: keep plugin lists sorted

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 15 Apr 2016 19:04:04 +0000 (21:04 +0200)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agofix potential curl plugin curl_slist_append memory leak
Brandon Arp [Fri, 15 Apr 2016 18:37:44 +0000 (11:37 -0700)]
fix potential curl plugin curl_slist_append memory leak

make sure that we dont leak memory if curl_slist_append returns null

8 years agoMerge pull request #1634 from BrandonArp/add_write_http_headers
Ruben Kerkhof [Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)]
Merge pull request #1634 from BrandonArp/add_write_http_headers

add http headers functionality to write_http plugin

8 years agoadd http headers functionality to write_http plugin
Brandon Arp [Thu, 24 Mar 2016 23:44:46 +0000 (16:44 -0700)]
add http headers functionality to write_http plugin

8 years agocollectd.service: correct comment
Ruben Kerkhof [Fri, 15 Apr 2016 11:22:38 +0000 (13:22 +0200)]
collectd.service: correct comment

We don't actually wait 10 seconds. The default is 100ms.

8 years agocollectd.service: wait for network-online.target
Ruben Kerkhof [Fri, 15 Apr 2016 10:14:09 +0000 (12:14 +0200)]
collectd.service: wait for network-online.target

Wait for network-online.target, not network.target
See https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/

8 years agocollectd.service: extend Description
Ruben Kerkhof [Fri, 15 Apr 2016 10:13:27 +0000 (12:13 +0200)]
collectd.service: extend Description

8 years agocollectd.service: add links to man pages
Ruben Kerkhof [Fri, 15 Apr 2016 10:13:04 +0000 (12:13 +0200)]
collectd.service: add links to man pages

8 years agoMerge pull request #1208 from jy2wong/master
Ruben Kerkhof [Fri, 15 Apr 2016 09:49:57 +0000 (11:49 +0200)]
Merge pull request #1208 from jy2wong/master

Fix void* arithmetic warning (-Wpointer-arith)

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 15 Apr 2016 09:32:22 +0000 (11:32 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoFix process plugin memory leak [solaris]
Jim Quinn [Mon, 21 Mar 2016 16:40:24 +0000 (12:40 -0400)]
Fix process plugin memory leak [solaris]

8 years agowrite_riemann: add documentation
Pierre-Yves Ritschard [Fri, 15 Apr 2016 08:32:41 +0000 (10:32 +0200)]
write_riemann: add documentation

8 years agowrite_riemann: do not read responses twice
Pierre-Yves Ritschard [Thu, 14 Apr 2016 08:13:00 +0000 (10:13 +0200)]
write_riemann: do not read responses twice

8 years agowrite_riemann: do not deadlock when sending from flush
Pierre-Yves Ritschard [Thu, 14 Apr 2016 08:12:27 +0000 (10:12 +0200)]
write_riemann: do not deadlock when sending from flush

8 years agowrite_riemann: add a BatchFlushTimeout option
Pierre-Yves Ritschard [Thu, 14 Apr 2016 08:11:18 +0000 (10:11 +0200)]
write_riemann: add a BatchFlushTimeout option

8 years agowrite_riemann: kill old protobuf files
Pierre-Yves Ritschard [Thu, 14 Apr 2016 08:09:38 +0000 (10:09 +0200)]
write_riemann: kill old protobuf files

8 years agoMerge pull request #1 from pyr/f/riemann/rcc
Gergely Nagy [Thu, 14 Apr 2016 07:55:38 +0000 (09:55 +0200)]
Merge pull request #1 from pyr/f/riemann/rcc

write_riemann: avoid deadlocks, rate limit log messages.

8 years agowrite_riemann: reorder host struct
Pierre-Yves Ritschard [Wed, 13 Apr 2016 21:22:33 +0000 (23:22 +0200)]
write_riemann: reorder host struct

8 years agowrite_riemann: use a single complaint field for send errors
Pierre-Yves Ritschard [Wed, 13 Apr 2016 21:15:29 +0000 (23:15 +0200)]
write_riemann: use a single complaint field for send errors

8 years agowrite_riemann: use the complain mechanism to rate limit connection failure logs
Pierre-Yves Ritschard [Wed, 13 Apr 2016 20:59:51 +0000 (22:59 +0200)]
write_riemann: use the complain mechanism to rate limit connection failure logs

8 years agowrite_riemann: avoid deadlock on connection failures
Pierre-Yves Ritschard [Wed, 13 Apr 2016 20:17:57 +0000 (22:17 +0200)]
write_riemann: avoid deadlock on connection failures

8 years agoFix segfault in network plugin
Ruben Kerkhof [Wed, 13 Apr 2016 16:33:08 +0000 (18:33 +0200)]
Fix segfault in network plugin

While cleaning up malloc calls in 1ebf2f31, I cleaned up one too many.

Fixes #1667

8 years agowrite_riemann: Add support for timeouts
Gergely Nagy [Thu, 7 Apr 2016 06:59:08 +0000 (08:59 +0200)]
write_riemann: Add support for timeouts

Bump the riemann-c-client requirement to 1.8.0, which introduces
riemann_client_set_timeout(). With this in place, the plugin can now
accept the "Timeout" option, which specifies a timeout in seconds, for
all blocking operations (except TLS handshake).

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years agoMerge pull request #1627 from rubenk/remove-old-filter-syntax-from-manpage
Marc Fournier [Wed, 6 Apr 2016 19:40:37 +0000 (21:40 +0200)]
Merge pull request #1627 from rubenk/remove-old-filter-syntax-from-manpage

Remove broken filter syntax from collectd.conf(5)

8 years agoMerge pull request #1553 from aerusso/master
Ruben Kerkhof [Wed, 6 Apr 2016 18:10:23 +0000 (20:10 +0200)]
Merge pull request #1553 from aerusso/master

Suppress spammy debug messages of #664

8 years agoMerge pull request #1547 from nydr/patch-1
Ruben Kerkhof [Wed, 6 Apr 2016 10:11:05 +0000 (12:11 +0200)]
Merge pull request #1547 from nydr/patch-1

Organize types.db

8 years agoMerge pull request #1656 from kev009/target_set_add_meta
Ruben Kerkhof [Wed, 6 Apr 2016 10:05:53 +0000 (12:05 +0200)]
Merge pull request #1656 from kev009/target_set_add_meta

Added MetaDataSet to target_set

8 years agoSort order after cherry-picks
nydr [Wed, 6 Apr 2016 08:22:54 +0000 (10:22 +0200)]
Sort order after cherry-picks

8 years agoSort types.db
nydr [Wed, 10 Feb 2016 13:11:02 +0000 (14:11 +0100)]
Sort types.db

Sort types.db

8 years agoAlign types.db indentation
nydr [Wed, 10 Feb 2016 13:07:53 +0000 (14:07 +0100)]
Align types.db indentation

Align types.db indentation

8 years agodisk plugin: fix build on Solaris
Ruben Kerkhof [Wed, 6 Apr 2016 08:10:59 +0000 (10:10 +0200)]
disk plugin: fix build on Solaris

  CC       disk_la-disk.lo
disk.c:296:13: error: ‘submit_io_time’ defined but not used
[-Werror=unused-function]
 static void submit_io_time (char const *plugin_instance, derive_t
io_time, derive_t weighted_time)
             ^
cc1: all warnings being treated as errors

Thanks @dago for letting me know.

8 years agoBump version to latest 5.5.1 #1536
Pmoranga [Wed, 23 Mar 2016 14:43:26 +0000 (15:43 +0100)]
Bump version to latest 5.5.1 #1536
(cherry picked from commit 238419ac27bcd991cebd021d25706b78d7edd182)

8 years agowrite_riemann: Use riemann-c-client 1.6.0+
Gergely Nagy [Wed, 6 Apr 2016 07:14:19 +0000 (09:14 +0200)]
write_riemann: Use riemann-c-client 1.6.0+

Use a newer version of riemann-c-client, so that we can use
riemann_message_get_packed_size(), which was introduced partly to support
collectd's use of the library.

Also use riemann_event_string_attribute_add(), introduced in the same version,
to make a lot of the code simpler.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years agowrite_riemann: Use riemann-c-client
Gergely Nagy [Tue, 5 Apr 2016 07:26:24 +0000 (09:26 +0200)]
write_riemann: Use riemann-c-client

Instead of implementing a collectd-specific riemann client, use the
riemann-c-client library to talk to Riemann.

This also adds support for TLS, as an added bonus, and makes it easier to
improve the plugin later on.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years agoMerge pull request #1631 from pmoranga/patch-1
Ruben Kerkhof [Wed, 6 Apr 2016 07:21:20 +0000 (09:21 +0200)]
Merge pull request #1631 from pmoranga/patch-1

Bump version on spec file to latest 5.5.1 #1536

8 years agoAddress meta_data style review
Kevin Bowling [Wed, 6 Apr 2016 06:25:51 +0000 (23:25 -0700)]
Address meta_data style review

8 years agoMerge branch 'ym/target_set_add_meta' of github.com:ymettier/collectd into target_set...
Kevin Bowling [Wed, 6 Apr 2016 06:20:48 +0000 (23:20 -0700)]
Merge branch 'ym/target_set_add_meta' of github.com:ymettier/collectd into target_set_add_meta

8 years agoAdd pkg-config to list of prerequisites
Ruben Kerkhof [Mon, 4 Apr 2016 18:20:39 +0000 (20:20 +0200)]
Add pkg-config to list of prerequisites

8 years agoMerge pull request #1650 from kev009/freebsd-io-time
Ruben Kerkhof [Mon, 4 Apr 2016 09:34:37 +0000 (11:34 +0200)]
Merge pull request #1650 from kev009/freebsd-io-time

Submit FreeBSD disk IO time

8 years agoAdd FreeBSD submit_io_time to disk plugin
Kevin Bowling [Mon, 4 Apr 2016 09:13:08 +0000 (02:13 -0700)]
Add FreeBSD submit_io_time to disk plugin

8 years agoMove submit_io_time outside of KERNEL_LINUX
Kevin Bowling [Mon, 4 Apr 2016 09:11:33 +0000 (02:11 -0700)]
Move submit_io_time outside of KERNEL_LINUX

8 years agoGenericJMX: fix potential dereference after NPE
Ruben Kerkhof [Sat, 2 Apr 2016 15:00:34 +0000 (17:00 +0200)]
GenericJMX: fix potential dereference after NPE

Fixes CID #41723

8 years agowrite_sensu: initialize ret_str
Ruben Kerkhof [Sat, 2 Apr 2016 14:53:16 +0000 (16:53 +0200)]
write_sensu: initialize ret_str

Else we might free an uninitialized ptr
CID #81392

8 years agogmond plugin: check remaining setsockopt calls
Ruben Kerkhof [Sat, 2 Apr 2016 14:29:59 +0000 (16:29 +0200)]
gmond plugin: check remaining setsockopt calls

Fixes CID #38112

8 years agowrite_sensu: fix resource leaks on error
Ruben Kerkhof [Sat, 2 Apr 2016 13:53:15 +0000 (15:53 +0200)]
write_sensu: fix resource leaks on error

Fixes CID #37998

8 years agocollectdmon: close fd when dup2 fails
Ruben Kerkhof [Sat, 2 Apr 2016 13:35:59 +0000 (15:35 +0200)]
collectdmon: close fd when dup2 fails

Fixed CID #73119

Fix a typo in the error message while we're at it.

8 years agoMerge pull request #1611 from stefanth/Collection3/graph-rendering-speedup
Ruben Kerkhof [Sat, 2 Apr 2016 13:14:29 +0000 (15:14 +0200)]
Merge pull request #1611 from stefanth/Collection3/graph-rendering-speedup

Collection3: Graphing speed improvements with many hosts

8 years agoMerge pull request #1648 from rubenk/cleanup-whitespace
Ruben Kerkhof [Sat, 2 Apr 2016 12:48:04 +0000 (14:48 +0200)]
Merge pull request #1648 from rubenk/cleanup-whitespace

Treewide: cleanup whitespace

8 years agoTreewide: cleanup whitespace
Ruben Kerkhof [Sat, 2 Apr 2016 11:55:22 +0000 (13:55 +0200)]
Treewide: cleanup whitespace

8 years agoMerge pull request #1646 from rubenk/cleanup-malloc-calls
Ruben Kerkhof [Sat, 2 Apr 2016 10:33:11 +0000 (12:33 +0200)]
Merge pull request #1646 from rubenk/cleanup-malloc-calls

Cleanup malloc calls

8 years agowrite_tsdb plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:44:47 +0000 (18:44 +0200)]
write_tsdb plugin: malloc + memset -> calloc

8 years agowrite_sensu plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:44:18 +0000 (18:44 +0200)]
write_sensu plugin: malloc + memset -> calloc

8 years agowrite_riemann plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:43:33 +0000 (18:43 +0200)]
write_riemann plugin: malloc + memset -> calloc

8 years agowrite_redis plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:39:57 +0000 (18:39 +0200)]
write_redis plugin: malloc + memset -> calloc

8 years agowrite_mongodb plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:37:52 +0000 (18:37 +0200)]
write_mongodb plugin: malloc + memset -> calloc

8 years agowrite_http plugin: remove unnecessary cast
Ruben Kerkhof [Fri, 1 Apr 2016 16:37:19 +0000 (18:37 +0200)]
write_http plugin: remove unnecessary cast

8 years agowrite_http plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:36:46 +0000 (18:36 +0200)]
write_http plugin: malloc + memset -> calloc

8 years agowrite_graphite plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:35:21 +0000 (18:35 +0200)]
write_graphite plugin: malloc + memset -> calloc

8 years agovarnish plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:33:34 +0000 (18:33 +0200)]
varnish plugin: malloc + memset -> calloc

8 years agoutils: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:31:11 +0000 (18:31 +0200)]
utils: malloc + memset -> calloc

8 years agoteamspeak2: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:24:23 +0000 (18:24 +0200)]
teamspeak2: malloc + memset -> calloc

8 years agotcpconns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:23:42 +0000 (18:23 +0200)]
tcpconns plugin: malloc + memset -> calloc

8 years agotarget plugins: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:22:52 +0000 (18:22 +0200)]
target plugins: malloc + memset -> calloc

8 years agotail_csv: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:20:59 +0000 (18:20 +0200)]
tail_csv: malloc + memset -> calloc

8 years agostatsd plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:19:59 +0000 (18:19 +0200)]
statsd plugin: malloc + memset -> calloc

8 years agosnmp plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:19:18 +0000 (18:19 +0200)]
snmp plugin: malloc + memset -> calloc

8 years agosigrok plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:16:28 +0000 (18:16 +0200)]
sigrok plugin: malloc + memset -> calloc

8 years agosensors plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:15:44 +0000 (18:15 +0200)]
sensors plugin: malloc + memset -> calloc

8 years agorouteros plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:13:59 +0000 (18:13 +0200)]
routeros plugin: malloc + memset -> calloc

8 years agopython plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:12:46 +0000 (18:12 +0200)]
python plugin: malloc + memset -> calloc

8 years agoprocesses plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:11:57 +0000 (18:11 +0200)]
processes plugin: malloc + memset -> calloc

8 years agopowerdns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:10:07 +0000 (18:10 +0200)]
powerdns plugin: malloc + memset -> calloc

8 years agopostgresql plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:09:08 +0000 (18:09 +0200)]
postgresql plugin: malloc + memset -> calloc

8 years agopinba plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:04:51 +0000 (18:04 +0200)]
pinba plugin: malloc + memset -> calloc

8 years agooracle plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:03:50 +0000 (18:03 +0200)]
oracle plugin: malloc + memset -> calloc

8 years agoopenldap plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:02:18 +0000 (18:02 +0200)]
openldap plugin: malloc + memset -> calloc

8 years agonut plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:59:27 +0000 (17:59 +0200)]
nut plugin: malloc + memset -> calloc

8 years agonetwork plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:55:19 +0000 (17:55 +0200)]
network plugin: malloc + memset -> calloc

8 years agonetlink plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:22:16 +0000 (17:22 +0200)]
netlink plugin: malloc + memset -> calloc

8 years agonetapp plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:21:26 +0000 (17:21 +0200)]
netapp plugin: malloc + memset -> calloc

8 years agomysql plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:18:42 +0000 (17:18 +0200)]
mysql plugin: malloc + memset -> calloc

8 years agomodbus plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:12:14 +0000 (17:12 +0200)]
modbus plugin: malloc + memset -> calloc

8 years agomemcached plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:11:17 +0000 (17:11 +0200)]
memcached plugin: malloc + memset -> calloc

8 years agomemcachec plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:10:05 +0000 (17:10 +0200)]
memcachec plugin: malloc + memset -> calloc

8 years agomatch plugins: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:09:12 +0000 (17:09 +0200)]
match plugins: malloc + memset -> calloc

8 years agoliboconfig: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:02:13 +0000 (17:02 +0200)]
liboconfig: malloc + memset -> calloc