[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Tue Jul 26 07:56:19 CEST 2016
.gitignore | 3 ++
ChangeLog | 51 +++++++++++++++++++++++++++++++
configure.ac | 38 +++++++++++++++--------
src/apache.c | 6 ++--
src/battery.c | 2 --
src/chrony.c | 4 +--
src/collectd-tg.c | 2 --
src/collectdctl.c | 1 -
src/conntrack.c | 2 +-
src/curl.c | 2 +-
src/curl_json.c | 4 +--
src/curl_xml.c | 2 +-
src/daemon/collectd.c | 2 --
src/daemon/collectd.h | 38 ++++++++++-------------
src/daemon/common.c | 2 --
src/daemon/meta_data.c | 2 --
src/daemon/plugin.c | 2 +-
src/daemon/utils_avltree.c | 4 ---
src/daemon/utils_cache.c | 1 -
src/daemon/utils_cache.h | 2 +-
src/daemon/utils_cache_mock.c | 4 +--
src/daemon/utils_heap.c | 1 -
src/daemon/utils_llist.c | 2 --
src/daemon/utils_threshold.c | 10 +++---
src/email.c | 15 ++++-----
src/ethstat.c | 2 +-
src/fscache.c | 2 +-
src/gmond.c | 4 +--
src/grpc.cc | 1 -
src/interface.c | 3 +-
src/libcollectdclient/client.c | 10 +++---
src/libcollectdclient/collectd/client.h | 4 +--
src/libcollectdclient/network_buffer.c | 8 +++--
src/log_logstash.c | 12 ++++----
src/match_empty_counter.c | 1 -
src/match_hashed.c | 1 -
src/match_timediff.c | 1 -
src/memcachec.c | 2 +-
src/memcached.c | 5 +--
src/modbus.c | 2 +-
src/mqtt.c | 1 -
src/mysql.c | 2 +-
src/network.c | 34 +++++++++++++++------
src/openldap.c | 3 +-
src/processes.c | 48 +++++++++++++----------------
src/rrdtool.c | 2 +-
src/statsd.c | 5 ++-
src/teamspeak2.c | 4 +--
src/ted.c | 2 +-
src/threshold.c | 4 +--
src/utils_cmd_putval.c | 4 +--
src/utils_curl_stats.c | 2 +-
src/utils_dns.c | 18 ++---------
src/utils_fbhash.c | 4 +--
src/utils_parse_option.c | 2 --
src/utils_vl_lookup.c | 4 +--
src/uuid.c | 6 ++--
src/write_graphite.c | 1 -
src/write_http.c | 1 -
src/write_kafka.c | 3 --
src/write_riemann_threshold.c | 4 ---
src/zone.c | 19 +++---------
version-gen.sh | 2 +-
63 files changed, 223 insertions(+), 212 deletions(-)
New commits:
commit 21ab7512825cf8177d5eee5101344b45d0854610
Merge: e906ccd c0db1cf
Author: Florian Forster <octo at collectd.org>
Date: Tue Jul 26 07:56:09 2016 +0200
Merge branch 'collectd-5.5'
commit c0db1cfee44a6393143537a71ab1b651d1df6961
Author: Florian Forster <octo at collectd.org>
Date: Tue Jul 26 07:50:55 2016 +0200
ChangeLog: Add note about #1665.
commit 0e60b30b93bfb259c0fb1b279619252aa64d37be
Author: Florian Forster <octo at collectd.org>
Date: Mon Jul 25 13:13:56 2016 +0200
Bump version to 5.5.2; Update ChangeLog.
commit 49ac868d2346c77335272b8a643bca295db9feaa
Merge: e0e3076 8b4fed9
Author: Florian Forster <octo at collectd.org>
Date: Mon Jul 25 13:52:16 2016 +0200
Merge branch 'collectd-5.4' into collectd-5.5
commit 8b4fed9940e02138b7e273e56863df03d1a39ef7
Author: Florian Forster <octo at collectd.org>
Date: Mon Jul 25 13:39:37 2016 +0200
network plugin, libcollectdclient: Check return value of gcry_control().
Fixes: #1665
commit e906ccdb0f0f7671551b16c7a91bd67447f393d3
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 21:23:59 2016 +0200
libcollectdclient: fix compiler warning on Solaris
CC libcollectdclient_la-client.lo
"client.c", line 1104: argument #4 is incompatible with prototype:
prototype: pointer to function(pointer to const void, pointer to const void) returning int : "/usr/include/iso/stdlib_iso.h", line 134
argument : pointer to void
commit 667893e9be8a3a3f608d4b8550be9170732a0747
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 20:27:48 2016 +0200
utils_cache_mock: fix annotations
It's __attribute__, not __attribute
Found with Solaris lint.
commit e6ce09aeed6b269f583e1d4a9c4b3586d1351917
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 20:07:18 2016 +0200
configure.ac: fix empty else on RHEL5
Ancient autoconf versions don't like empty
strings in m4 arguments.
commit 4b5ba71b9e298ce50fd61fbbc5d0926c3241239d
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 19:03:29 2016 +0200
Fix build when hal is not installed
commit 1a0d2707d5fb73cd778831acf8af4980225b0bbc
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 18:43:38 2016 +0200
treewide: fix invocation of c_avl_create
Fixes the following warning on Solaris:
|c_avl_tree_t *c_avl_create (int (*compare) (const void *, const
void *));
| ^ line 54, utils_avltree.h
| included in line 34, utils_vl_lookup.c
|
| obj->by_type_tree = c_avl_create ((void *) strcmp);
| ^ line 567,
utils_vl_lookup.c
E_ARG_INCOMPATIBLE_WITH_ARG_L, argument #1 is incompatible with
prototype:
prototype: pointer to function(pointer to const void, pointer to
const void) returning int : "src/daemon/utils_avltree.h", line 54
argument : pointer to void
I'll look into writing a generic function to compare avl keys so
we don't need to do all the casting.
commit a08316a28cc9bad5c03959009b7e24683e6e43cb
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 18:22:32 2016 +0200
email plugin: fix lint warnings
set but not used in function
(468) err in open_connection
(574) err in email_init
commit fb59a58380c115155bc45f6fad303729cea6e7c3
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 18:11:07 2016 +0200
utils_llist.c: remove unneccesary include
commit dc45159556be6e596ef12ae77bca468c35c70e55
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 18:05:22 2016 +0200
write_kafka plugin: remove unneccesary includes
commit 7cb09e1c4020edd804eaa3808ea071a08404fb07
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 18:03:36 2016 +0200
threshold plugin: remove unneccesary include
commit b406570bef8e8f4934670dcb1fcaf4fbea5529ee
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 18:02:01 2016 +0200
mqtt plugin: remove unused include
commit 931a7054971a7dc00dce73da4d1f2358085eec2d
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 17:58:58 2016 +0200
battery plugin: remove unused include
commit 23db29c4481ef09bcd8deb6f5ffa2406d7026d68
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 17:56:46 2016 +0200
memcachec plugin: correct error message
commit 240a0b30cd9a478589ed00465bc081f810da05a9
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 17:56:04 2016 +0200
curl plugin: correct error message
commit 7f077d4c5d39698eb16231f58fc817927aeafd1b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 17:21:56 2016 +0200
modbus plugin: unsigned value can't be negative
commit cd3a393e43f2557bbe6aa3cdceb7ce2fafacceec
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 17:15:11 2016 +0200
collectd-tg: remove dead code
commit d8e65519a221b7cfa49fec3bcb745aa9fb6b9d70
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 17:11:46 2016 +0200
fscache plugin: unsigned value can't be negative
commit d5353983686ad6f4ba156206d0bf430af09d1fad
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 16:47:40 2016 +0200
uuid plugin: fix inclusion of libhal.h
Follow up of 34db18b
commit e1565a0ea91cdc31394183953811653506e2e15f
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 16:43:30 2016 +0200
configure.ac: always use pkg-config to detect hal
Hal needs dbus, but we need pkg-config to tell us that.
Now that pkg-config is not optional anymore, rewrite the
check to always use it. Also add a check for the header.
Fixes building the uuid plugin on Solaris 11.3
commit aa7f357b7638cb9a0d589f3c9a4f8cd13b60f8e3
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 15:31:56 2016 +0200
ganglia plugin: unsigned value can't be negative
commit 2ce1db8202b1eba6da45b347c0c81a508f8c088a
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:56:32 2016 +0200
treewide: remove unused includes
commit ae16ad5f0791c6d6d41268d1bbe37ea1135b4a83
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:55:22 2016 +0200
Ignore lint files
commit 44760d0d783660a0cd03df07b9017f1a6fd66ddd
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:43:48 2016 +0200
apache plugin: fix compiler warning on Solaris
commit 6e9778c88af6a290e81bcfda12d6d45c92b931b5
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:41:00 2016 +0200
memcached plugin: fix compiler warning on Solaris
| ud.free_func = (void *) memcached_free;
| ^ line 559, memcached.c
assignment type mismatch:
pointer to function(pointer to void) returning void "=" pointer to void
Casting a function pointer to a void pointer is undefined behaviour
in C (it is defined in POSIX however)
commit 5a29f19d5501857ddc048ddb37e779fc5fe253df
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:37:14 2016 +0200
mysql plugin: remove unneccesary cast
commit 8391a4430d5dffea44898adb628a5bcdbcfe31ba
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:29:25 2016 +0200
network plugin: unsigned variables can't be negative
commit f650fc4ca0d6f044602377b4280aa7174fdba752
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:28:01 2016 +0200
utils_dns.c: unsigned variable can't be negative
commit 96f2b2eadf9a6c750e8745f2e463d91e78b4d02a
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:27:18 2016 +0200
utils_dns.c: fix strange linebreak
commit bff07409f3d0ef5d6c31f2b4b9aff243de95f09a
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:26:19 2016 +0200
rrdtool plugin: unsigned value can't be negative
commit 3bd130cd884aed95e669f0e21530de08ee897f0d
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:24:54 2016 +0200
ted plugin: 0xAA doesn't fit in a signed char
commit 71fbc51aa0092a71cbbfb8b2c16e6db9d6808d57
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:23:58 2016 +0200
openldap plugin: rc is only used once
commit 998669224df5ace6ba87c5b6f466c679beca1d2b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:21:45 2016 +0200
interface plugin: val is only used once
commit d3bb71e733c1cc86a1d2c5d6da3057d5926003e1
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Jul 24 13:19:08 2016 +0200
Make chrony compile with Solaris Studio compiler
Ideally we'll have autoconf checks for supported attributes,
will look into that later.
commit ed4d4c74f387282f78964da29eeb8989dfdadb11
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 23:26:14 2016 +0200
utils_dns.c: remove dead code
commit d2ef97c0604aac14dba6e43d5478c0372bc3ced9
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 23:24:46 2016 +0200
zone plugin: remove unused code
commit 0e38564a0b8ad3655a7261915f3e08cbc53f32a8
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 23:22:33 2016 +0200
collectctl: remove dead code
commit 6cf795578e3f29efbaeea974fdcd1049105dd7ff
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 15:54:20 2016 +0200
teamspeak plugin: fix indentation
commit 4afb773105dc878237b009ba27f8c687f457a200
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 15:24:47 2016 +0200
curl_xml plugin: fix indentation
commit 59948a729339804093cb2a2f7f152624f0a7f292
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 15:23:03 2016 +0200
utils_curl_stats.c: fix order of calloc arguments
commit 60cdfe7613c232c5257ba6010c54f7e38b457e93
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 15:16:41 2016 +0200
libcollectdclient: remove unneccesary cast
commit b747a37cc1f1deec8afd1820d98a613ceb57c5b6
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 15:07:25 2016 +0200
processes plugin: fix indentation
commit 720c6a184adf084d38558cf83276a9a45ead22a8
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 14:59:38 2016 +0200
log_logstash plugin: fix indentation
commit 268aa9e2ca0a5d666b9cf91233aa7ea742aed2a2
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 14:57:04 2016 +0200
curl_json plugin: fix indentation
commit 9e91e31c929c0af8871c5f9fc73ae70398361229
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 14:56:21 2016 +0200
conntrack plugin: fix indentation
commit f82c867c1ec3d5ea0d7bc4966cee8e7899538a2c
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 14:54:32 2016 +0200
utils_cmd_putval.c: fix indentation
commit d183dca833410ca9c035f2d09ff11d4410d50e43
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 14:50:17 2016 +0200
utils_threshold.c: fix indentation
commit c3c3fe0a0fc41575b5719ea5c805acbd7878c7fb
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 13:35:27 2016 +0200
collectd.h: guard define of __attribute__
It might have already been defined to a no-op in <sys/cdefs.h>
commit 8935a0f9f1f3a51736da6174bcc2575934579c56
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 13:34:00 2016 +0200
collectd.h: remove unused defines
commit f3ab835abdb893f48ff7ec411902065b6a8f8cae
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Jul 23 13:27:39 2016 +0200
collectd.h: fix indentation
More information about the collectd-changes
mailing list