Pierre-Yves Ritschard [Wed, 13 Apr 2016 20:17:57 +0000 (22:17 +0200)]
write_riemann: avoid deadlock on connection failures
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>
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 [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'
Ruben Kerkhof [Sat, 26 Mar 2016 12:59:26 +0000 (13:59 +0100)]
mysql plugin: remove unused declaration
This was left behind after commit
c17582c
Ruben Kerkhof [Sun, 20 Mar 2016 11:29:06 +0000 (12:29 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Sun, 20 Mar 2016 11:22:21 +0000 (12:22 +0100)]
Fix conflict markers
Ruben Kerkhof [Sun, 20 Mar 2016 11:04:20 +0000 (12:04 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 20 Mar 2016 10:53:13 +0000 (11:53 +0100)]
Fix indentation in previous commit
Ruben Kerkhof [Sun, 20 Mar 2016 10:29:28 +0000 (11:29 +0100)]
Merge pull request #1620 from skinowski/write_http_mem_leak_II
write_http: in cleanup handler free http headers
Tolga Ceylan [Sun, 20 Mar 2016 02:03:31 +0000 (19:03 -0700)]
write_http: in cleanup handler free http headers
slist of http headers require cleanup to avoid
memory leak. See libcurl example:
https://curl.haxx.se/libcurl/c/httpcustomheader.html
Ruben Kerkhof [Sat, 19 Mar 2016 15:47:33 +0000 (16:47 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 18 Mar 2016 12:22:58 +0000 (13:22 +0100)]
Fix build on Solaris 10 i386 part 2
utils_latency.c needs the same fix as applied in
a41f312
(cherry picked from commit
e7f7ecc1cac73841cdebd7e0462af4989532a107)
Ruben Kerkhof [Fri, 18 Mar 2016 11:59:03 +0000 (12:59 +0100)]
Fix build on Solaris 10 i386
AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS in src/config.h,
so we need this header first before including system headers.
Thanks to @dago for the report.
Fixes:
CC collectd-utils_random.o
In file included from collectd.h:31:0,
from utils_random.c:29:
../../src/config.h:1646:0: error: "_FILE_OFFSET_BITS" redefined
[-Werror]
#define _FILE_OFFSET_BITS 64
^
In file included from
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/pthread.h:20:0,
from utils_random.c:27:
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0:
note: this is the location of the previous definition
#define _FILE_OFFSET_BITS 32
^
cc1: all warnings being treated as errors
(cherry picked from commit
a41f312a8d48a989dfba00a8b43532c60f67caba)
Marc Fournier [Sat, 19 Mar 2016 15:44:30 +0000 (16:44 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Sat, 19 Mar 2016 15:44:05 +0000 (16:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Sat, 19 Mar 2016 07:24:43 +0000 (08:24 +0100)]
RPM specfile: fix xmms plugin build condition
Marc Fournier [Fri, 18 Mar 2016 22:46:27 +0000 (23:46 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 18 Mar 2016 22:07:02 +0000 (23:07 +0100)]
RPM specfile: update changelog
Marc Fournier [Fri, 18 Mar 2016 21:53:59 +0000 (22:53 +0100)]
RPM specfile: enable xmms plugin on EL7
Ruben Kerkhof [Fri, 18 Mar 2016 12:38:04 +0000 (13:38 +0100)]
statgrab: Save LDFLAGS before changing them.
We did restore them after the test but forget to save them before it.
Ruben Kerkhof [Fri, 18 Mar 2016 12:22:58 +0000 (13:22 +0100)]
Fix build on Solaris 10 i386 part 2
utils_latency.c needs the same fix as applied in
a41f312