Pierre-Yves Ritschard [Thu, 14 Apr 2016 08:11:18 +0000 (10:11 +0200)]
write_riemann: add a BatchFlushTimeout option
Pierre-Yves Ritschard [Thu, 14 Apr 2016 08:09:38 +0000 (10:09 +0200)]
write_riemann: kill old protobuf files
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.
Pierre-Yves Ritschard [Wed, 13 Apr 2016 21:22:33 +0000 (23:22 +0200)]
write_riemann: reorder host struct
Pierre-Yves Ritschard [Wed, 13 Apr 2016 21:15:29 +0000 (23:15 +0200)]
write_riemann: use a single complaint field for send errors
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
Pierre-Yves Ritschard [Wed, 13 Apr 2016 20:17:57 +0000 (22:17 +0200)]
write_riemann: avoid deadlock on connection failures
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
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>
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)
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
Ruben Kerkhof [Wed, 6 Apr 2016 10:11:05 +0000 (12:11 +0200)]
Merge pull request #1547 from nydr/patch-1
Organize types.db
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
nydr [Wed, 6 Apr 2016 08:22:54 +0000 (10:22 +0200)]
Sort order after cherry-picks
nydr [Wed, 10 Feb 2016 13:11:02 +0000 (14:11 +0100)]
Sort types.db
Sort types.db
nydr [Wed, 10 Feb 2016 13:07:53 +0000 (14:07 +0100)]
Align types.db indentation
Align types.db indentation
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.
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)
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>
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>
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
Kevin Bowling [Wed, 6 Apr 2016 06:25:51 +0000 (23:25 -0700)]
Address meta_data style review
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
Ruben Kerkhof [Mon, 4 Apr 2016 18:20:39 +0000 (20:20 +0200)]
Add pkg-config to list of prerequisites
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
Kevin Bowling [Mon, 4 Apr 2016 09:13:08 +0000 (02:13 -0700)]
Add FreeBSD submit_io_time to disk plugin
Kevin Bowling [Mon, 4 Apr 2016 09:11:33 +0000 (02:11 -0700)]
Move submit_io_time outside of KERNEL_LINUX
Ruben Kerkhof [Sat, 2 Apr 2016 15:00:34 +0000 (17:00 +0200)]
GenericJMX: fix potential dereference after NPE
Fixes CID #41723
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
Ruben Kerkhof [Sat, 2 Apr 2016 14:29:59 +0000 (16:29 +0200)]
gmond plugin: check remaining setsockopt calls
Fixes CID #38112
Ruben Kerkhof [Sat, 2 Apr 2016 13:53:15 +0000 (15:53 +0200)]
write_sensu: fix resource leaks on error
Fixes CID #37998
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.
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
Ruben Kerkhof [Sat, 2 Apr 2016 12:48:04 +0000 (14:48 +0200)]
Merge pull request #1648 from rubenk/cleanup-whitespace
Treewide: cleanup whitespace
Ruben Kerkhof [Sat, 2 Apr 2016 11:55:22 +0000 (13:55 +0200)]
Treewide: cleanup whitespace
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
Ruben Kerkhof [Fri, 1 Apr 2016 16:44:47 +0000 (18:44 +0200)]
write_tsdb plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:44:18 +0000 (18:44 +0200)]
write_sensu plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:43:33 +0000 (18:43 +0200)]
write_riemann plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:39:57 +0000 (18:39 +0200)]
write_redis plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:37:52 +0000 (18:37 +0200)]
write_mongodb plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:37:19 +0000 (18:37 +0200)]
write_http plugin: remove unnecessary cast
Ruben Kerkhof [Fri, 1 Apr 2016 16:36:46 +0000 (18:36 +0200)]
write_http plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:35:21 +0000 (18:35 +0200)]
write_graphite plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:33:34 +0000 (18:33 +0200)]
varnish plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:31:11 +0000 (18:31 +0200)]
utils: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:24:23 +0000 (18:24 +0200)]
teamspeak2: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:23:42 +0000 (18:23 +0200)]
tcpconns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:22:52 +0000 (18:22 +0200)]
target plugins: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:20:59 +0000 (18:20 +0200)]
tail_csv: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:19:59 +0000 (18:19 +0200)]
statsd plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:19:18 +0000 (18:19 +0200)]
snmp plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:16:28 +0000 (18:16 +0200)]
sigrok plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:15:44 +0000 (18:15 +0200)]
sensors plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:13:59 +0000 (18:13 +0200)]
routeros plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:12:46 +0000 (18:12 +0200)]
python plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:11:57 +0000 (18:11 +0200)]
processes plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:10:07 +0000 (18:10 +0200)]
powerdns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:09:08 +0000 (18:09 +0200)]
postgresql plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:04:51 +0000 (18:04 +0200)]
pinba plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:03:50 +0000 (18:03 +0200)]
oracle plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:02:18 +0000 (18:02 +0200)]
openldap plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:59:27 +0000 (17:59 +0200)]
nut plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:55:19 +0000 (17:55 +0200)]
network plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:22:16 +0000 (17:22 +0200)]
netlink plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:21:26 +0000 (17:21 +0200)]
netapp plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:18:42 +0000 (17:18 +0200)]
mysql plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:12:14 +0000 (17:12 +0200)]
modbus plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:11:17 +0000 (17:11 +0200)]
memcached plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:10:05 +0000 (17:10 +0200)]
memcachec plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:09:12 +0000 (17:09 +0200)]
match plugins: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:02:13 +0000 (17:02 +0200)]
liboconfig: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:51:57 +0000 (16:51 +0200)]
libcollectdclient: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:49:35 +0000 (16:49 +0200)]
java plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:29:53 +0000 (16:29 +0200)]
gmond: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:01:27 +0000 (16:01 +0200)]
filecount plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:00:53 +0000 (16:00 +0200)]
exec plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:59:07 +0000 (15:59 +0200)]
ethstat plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:50:42 +0000 (15:50 +0200)]
email plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:49:57 +0000 (15:49 +0200)]
dns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:49:04 +0000 (15:49 +0200)]
dbi plugin: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:56:13 +0000 (19:56 +0200)]
daemon: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:50:51 +0000 (19:50 +0200)]
curl_xml: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:50:38 +0000 (19:50 +0200)]
curl_json: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:42:36 +0000 (19:42 +0200)]
curl: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:40:31 +0000 (19:40 +0200)]
collectd-tg: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:40:12 +0000 (19:40 +0200)]
apache: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:32:51 +0000 (19:32 +0200)]
amqp: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:31:17 +0000 (19:31 +0200)]
aggregration: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:24:17 +0000 (19:24 +0200)]
treewide: fix a few error messages
Don't log that malloc failed when we call calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:12:10 +0000 (19:12 +0200)]
treewide: cleanup malloc calls
- Remove unnecessary casts
- Use the size of the variable for mallocs size
Ruben Kerkhof [Mon, 28 Mar 2016 10:38:17 +0000 (12:38 +0200)]
network.c: s/networt/network/g
Ruben Kerkhof [Sat, 26 Mar 2016 20:24:13 +0000 (21:24 +0100)]
Merge pull request #1592 from rpv-tomsk/mysql-plugin-sort
mysql plugin: Split 'mysql_sort' type into several types.
Ruben Kerkhof [Sat, 26 Mar 2016 18:55:29 +0000 (19:55 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Sat, 26 Mar 2016 18:31:34 +0000 (19:31 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 26 Mar 2016 18:28:27 +0000 (19:28 +0100)]
configure.ac: break long line and sort
This will make future merges easier.
Ruben Kerkhof [Sat, 26 Mar 2016 18:12:20 +0000 (19:12 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Sat, 26 Mar 2016 18:11:32 +0000 (19:11 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 26 Mar 2016 17:18:44 +0000 (18:18 +0100)]
Fix building with xfsprogs 4.5.0
xfsprogs 4.5.0 started to use off64_t in its headers,
which is hidden behind _GNU_SOURCE
Fixes #1637
Ruben Kerkhof [Sat, 26 Mar 2016 13:24:02 +0000 (14:24 +0100)]
Merge branch 'collectd-5.5'