write_kafka: do not call depreciated functions unless necessary
Merge pull request #986 from algernon/f/riemann/rcc
write_riemann: TLS support via riemann-c-client
write_riemann: TLS support via riemann-c-client
Merge branch 'master' into f/riemann/rcc
plugin.c: fix indentation of comment
virt plugin: compare pointer to NULL, not 0
Found with coccinelle
Found with coccinelle
turbostat plugin: reset the right variable
tail_csv plugin: set pointer to NULL not 0
Found with coccinelle
Found with coccinelle
collectctl: compare pointer with NULL not 0
Found with coccinelle
Found with coccinelle
pyvalues.c: remove unneccesary semicolon
Found with Coccinelle
Found with Coccinelle
configure.ac: indent plugin list
configure.ac: keep plugin lists sorted
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
fix potential curl plugin curl_slist_append memory leak
make sure that we dont leak memory if curl_slist_append returns null
make sure that we dont leak memory if curl_slist_append returns null
Merge pull request #1634 from BrandonArp/add_write_http_headers
add http headers functionality to write_http plugin
add http headers functionality to write_http plugin
add http headers functionality to write_http plugin
collectd.service: correct comment
We don't actually wait 10 seconds. The default is 100ms.
We don't actually wait 10 seconds. The default is 100ms.
collectd.service: wait for network-online.target
Wait for network-online.target, not network.target
See https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
Wait for network-online.target, not network.target
See https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
collectd.service: extend Description
collectd.service: add links to man pages
Merge pull request #1208 from jy2wong/master
Fix void* arithmetic warning (-Wpointer-arith)
Fix void* arithmetic warning (-Wpointer-arith)
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Fix process plugin memory leak [solaris]
write_riemann: add documentation
write_riemann: do not read responses twice
write_riemann: do not deadlock when sending from flush
write_riemann: add a BatchFlushTimeout option
write_riemann: kill old protobuf files
Merge pull request #1 from pyr/f/riemann/rcc
write_riemann: avoid deadlocks, rate limit log messages.
write_riemann: avoid deadlocks, rate limit log messages.
write_riemann: reorder host struct
write_riemann: use a single complaint field for send errors
write_riemann: use the complain mechanism to rate limit connection failure logs
write_riemann: avoid deadlock on connection failures
Fix segfault in network plugin
While cleaning up malloc calls in 1ebf2f31, I cleaned up one too many.
Fixes #1667
While cleaning up malloc calls in 1ebf2f31, I cleaned up one too many.
Fixes #1667
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>
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>
Merge pull request #1627 from rubenk/remove-old-filter-syntax-from-manpage
Remove broken filter syntax from collectd.conf(5)
Remove broken filter syntax from collectd.conf(5)
Merge pull request #1553 from aerusso/master
Suppress spammy debug messages of #664
Suppress spammy debug messages of #664
Merge pull request #1547 from nydr/patch-1
Organize types.db
Organize types.db
Merge pull request #1656 from kev009/target_set_add_meta
Added MetaDataSet to target_set
Added MetaDataSet to target_set
Sort order after cherry-picks
Sort types.db
Sort types.db
Sort types.db
Align types.db indentation
Align types.db indentation
Align types.db indentation
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.
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.
Bump version to latest 5.5.1 #1536
(cherry picked from commit 238419ac27bcd991cebd021d25706b78d7edd182)
(cherry picked from commit 238419ac27bcd991cebd021d25706b78d7edd182)
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>
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>
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>
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>
Merge pull request #1631 from pmoranga/patch-1
Bump version on spec file to latest 5.5.1 #1536
Bump version on spec file to latest 5.5.1 #1536
Address meta_data style review
Merge branch 'ym/target_set_add_meta' of github.com:ymettier/collectd into target_set_add_meta
Add pkg-config to list of prerequisites
Merge pull request #1650 from kev009/freebsd-io-time
Submit FreeBSD disk IO time
Submit FreeBSD disk IO time
Add FreeBSD submit_io_time to disk plugin
Move submit_io_time outside of KERNEL_LINUX
GenericJMX: fix potential dereference after NPE
Fixes CID #41723
Fixes CID #41723
write_sensu: initialize ret_str
Else we might free an uninitialized ptr
CID #81392
Else we might free an uninitialized ptr
CID #81392
gmond plugin: check remaining setsockopt calls
Fixes CID #38112
Fixes CID #38112
write_sensu: fix resource leaks on error
Fixes CID #37998
Fixes CID #37998
collectdmon: close fd when dup2 fails
Fixed CID #73119
Fix a typo in the error message while we're at it.
Fixed CID #73119
Fix a typo in the error message while we're at it.
Merge pull request #1611 from stefanth/Collection3/graph-rendering-speedup
Collection3: Graphing speed improvements with many hosts
Collection3: Graphing speed improvements with many hosts
Merge pull request #1648 from rubenk/cleanup-whitespace
Treewide: cleanup whitespace
Treewide: cleanup whitespace
Treewide: cleanup whitespace
Merge pull request #1646 from rubenk/cleanup-malloc-calls
Cleanup malloc calls
Cleanup malloc calls
write_tsdb plugin: malloc + memset -> calloc
write_sensu plugin: malloc + memset -> calloc
write_riemann plugin: malloc + memset -> calloc
write_redis plugin: malloc + memset -> calloc
write_mongodb plugin: malloc + memset -> calloc
write_http plugin: remove unnecessary cast
write_http plugin: malloc + memset -> calloc
write_graphite plugin: malloc + memset -> calloc
varnish plugin: malloc + memset -> calloc
utils: malloc + memset -> calloc
teamspeak2: malloc + memset -> calloc
tcpconns plugin: malloc + memset -> calloc
target plugins: malloc + memset -> calloc
tail_csv: malloc + memset -> calloc
statsd plugin: malloc + memset -> calloc
snmp plugin: malloc + memset -> calloc
sigrok plugin: malloc + memset -> calloc
sensors plugin: malloc + memset -> calloc
routeros plugin: malloc + memset -> calloc
python plugin: malloc + memset -> calloc
processes plugin: malloc + memset -> calloc
powerdns plugin: malloc + memset -> calloc
postgresql plugin: malloc + memset -> calloc
pinba plugin: malloc + memset -> calloc
oracle plugin: malloc + memset -> calloc
openldap plugin: malloc + memset -> calloc
nut plugin: malloc + memset -> calloc
network plugin: malloc + memset -> calloc
netlink plugin: malloc + memset -> calloc
netapp plugin: malloc + memset -> calloc
mysql plugin: malloc + memset -> calloc
modbus plugin: malloc + memset -> calloc
memcached plugin: malloc + memset -> calloc
memcachec plugin: malloc + memset -> calloc
match plugins: malloc + memset -> calloc
liboconfig: malloc + memset -> calloc
libcollectdclient: malloc + memset -> calloc