Ruben Kerkhof [Sat, 4 Jun 2016 11:04:55 +0000 (13:04 +0200)]
Merge pull request #1737 from rubenk/pthread-cleanup
Pthread cleanup
Ruben Kerkhof [Sat, 4 Jun 2016 10:57:34 +0000 (12:57 +0200)]
collectd.spec: sort list
Ruben Kerkhof [Sat, 4 Jun 2016 10:54:43 +0000 (12:54 +0200)]
collectd.spec: EPEL7 has a recent ganglia-devel
Ruben Kerkhof [Sat, 4 Jun 2016 10:51:47 +0000 (12:51 +0200)]
collectd.spec: sort plugin lists
Ruben Kerkhof [Sat, 4 Jun 2016 10:43:07 +0000 (12:43 +0200)]
collectd.spec: turn TODO into changelog entry
Ruben Kerkhof [Sat, 4 Jun 2016 10:25:54 +0000 (12:25 +0200)]
Add new Chrony plugin to rpm spec file
Ruben Kerkhof [Sat, 4 Jun 2016 09:50:59 +0000 (11:50 +0200)]
Remove HAVE_PTHREAD_H include guard
We can't build without pthread.h so guarding it is not necessary
anymore.
Ruben Kerkhof [Sat, 4 Jun 2016 09:48:56 +0000 (11:48 +0200)]
configure.ac: move AC_SUBST down to after define
Ruben Kerkhof [Sat, 4 Jun 2016 09:22:09 +0000 (11:22 +0200)]
Sort types.db
Ruben Kerkhof [Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)]
Merge pull request #1548 from bbczeuz/zseng_dev_chrony
[plugin] Chrony NTP service check
Ruben Kerkhof [Fri, 3 Jun 2016 20:36:04 +0000 (22:36 +0200)]
src/Makefile.am: merge EXTRA_DIST variables
Ruben Kerkhof [Fri, 3 Jun 2016 20:34:28 +0000 (22:34 +0200)]
src/Makefile.am: remove commented out line
Ruben Kerkhof [Fri, 3 Jun 2016 20:33:23 +0000 (22:33 +0200)]
src/Makefile.am: remove useless assigment
Ruben Kerkhof [Fri, 3 Jun 2016 20:29:03 +0000 (22:29 +0200)]
zfs_arc: simplify build logic
Use BUILD_SOLARIS instead of assuming that any OS not FreeBSD or Linux is Solaris.
Ruben Kerkhof [Fri, 3 Jun 2016 20:22:06 +0000 (22:22 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 20:20:43 +0000 (22:20 +0200)]
xencpu: add missing cppflags and ldflags
Ruben Kerkhof [Fri, 3 Jun 2016 18:49:48 +0000 (20:49 +0200)]
write_redis: append to CPPFLAGS, not CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:45:20 +0000 (20:45 +0200)]
openvpn plugin: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:44:58 +0000 (20:44 +0200)]
oracle plugin: use CPPFLAGS instead of CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:42:36 +0000 (20:42 +0200)]
openldap plugin: use CPPFLAGS instead of CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:41:50 +0000 (20:41 +0200)]
openldap plugin: use $PLUGIN_LDFLAGS
Just like the other plugins.
Ruben Kerkhof [Fri, 3 Jun 2016 18:40:25 +0000 (20:40 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:38:10 +0000 (20:38 +0200)]
mysql plugin: simplify build logic
The MySQL plugin can't be build without libmysql support.
./configure already takes care of that.
Ruben Kerkhof [Fri, 3 Jun 2016 18:34:29 +0000 (20:34 +0200)]
lvm: add missing cppflags and ldflags to Makefile
Ruben Kerkhof [Fri, 3 Jun 2016 18:32:53 +0000 (20:32 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:30:59 +0000 (20:30 +0200)]
ipvs: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 18:26:10 +0000 (20:26 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 17:23:09 +0000 (19:23 +0200)]
simplify Makefile.am for nginx and write_http
They can't be build without libcurl support,
./configure will take care of that.
Remove the now unused BUILD_WITH_LIBCURL conditional
Ruben Kerkhof [Fri, 3 Jun 2016 17:20:50 +0000 (19:20 +0200)]
Simplify Makefile.am for curl plugins
They can't be build without libcurl support,
./configure will take care of that.
Ruben Kerkhof [Fri, 3 Jun 2016 17:10:39 +0000 (19:10 +0200)]
aquaero: add flags to the right variable
Ruben Kerkhof [Fri, 3 Jun 2016 17:07:29 +0000 (19:07 +0200)]
src/Makefile.am: merge 2 lines
Ruben Kerkhof [Fri, 3 Jun 2016 17:05:44 +0000 (19:05 +0200)]
src/Makefile.am: simplify Apache plugin
It can't be build without libcurl support and
configure will take care of that.
Ruben Kerkhof [Fri, 3 Jun 2016 16:50:53 +0000 (18:50 +0200)]
configure.ac: break a few long lines up
Ruben Kerkhof [Fri, 3 Jun 2016 16:30:00 +0000 (18:30 +0200)]
Always build with pthread support
Until now you could run ./configure --with-libpthread=no.
This didn't actually compile though.
The daemon has assumed for a while now that pthread support
is available. Bail out in ./configure if this is not the case.
Ruben Kerkhof [Fri, 3 Jun 2016 16:05:11 +0000 (18:05 +0200)]
configure.ac: remove unused HAVE_LIBPTHREAD define
Ruben Kerkhof [Fri, 3 Jun 2016 16:01:14 +0000 (18:01 +0200)]
unixsock plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:58:13 +0000 (17:58 +0200)]
statsd plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:51:48 +0000 (17:51 +0200)]
snmp plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:50:57 +0000 (17:50 +0200)]
nut plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:50:35 +0000 (17:50 +0200)]
notify_email plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:50:08 +0000 (17:50 +0200)]
network plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:49:24 +0000 (17:49 +0200)]
java plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:48:47 +0000 (17:48 +0200)]
exec plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:48:19 +0000 (17:48 +0200)]
email plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:47:35 +0000 (17:47 +0200)]
dns plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:44:58 +0000 (17:44 +0200)]
all plugins: remove pthread.h include
plugin.h already includes pthread.h
Ruben Kerkhof [Fri, 3 Jun 2016 15:30:57 +0000 (17:30 +0200)]
Don't hardcode libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:08:33 +0000 (17:08 +0200)]
collectd_tg: let automake compute dependencies
Automake already does the right thing based on the library added with _LDADD.
This also restores a missing dependency on libheap.la.
Ruben Kerkhof [Fri, 3 Jun 2016 15:04:06 +0000 (17:04 +0200)]
collectd_tg: simplify logic a bit
We always link collectdctl with libcollectdclient/libcollectdclient.la.
Make this more obvious.
Ruben Kerkhof [Fri, 3 Jun 2016 15:01:32 +0000 (17:01 +0200)]
collectdctl: let automake compute dependencies
Automake already does the right thing based on the library added with _LDADD
Ruben Kerkhof [Fri, 3 Jun 2016 15:00:33 +0000 (17:00 +0200)]
collectdctl: simplify logic a bit
We always link collectdctl with libcollectdclient/libcollectdclient.la.
Make this more obvious.
Ruben Kerkhof [Fri, 3 Jun 2016 14:58:01 +0000 (16:58 +0200)]
src/Makefile.am: let automake compute dependencies
Automake already does the right thing based on the library
added with _LDADD
Ruben Kerkhof [Fri, 3 Jun 2016 14:52:47 +0000 (16:52 +0200)]
src/Makefile.am: simplify logic a bit
We always link collectd_nagios with libcollectdclient/libcollectdclient.la.
Make this more obvious.
Claudius Zingerli [Fri, 3 Jun 2016 14:38:23 +0000 (16:38 +0200)]
Removed braces on single line 'if'. Always using inet_ntop.
Claudius Zingerli [Fri, 3 Jun 2016 13:14:43 +0000 (15:14 +0200)]
Macro fixes, Implemented comments from code review (style, defines)
Ruben Kerkhof [Fri, 3 Jun 2016 12:23:16 +0000 (14:23 +0200)]
src/Makefile.am: remove CPPFLAGS assignment
AM_CPPFLAGS are added by default, unless you override _CPPFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 10:56:53 +0000 (12:56 +0200)]
Merge branch 'collectd-5.5'
Conflicts:
src/perl.c
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:59 +0000 (12:51 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:13 +0000 (12:51 +0200)]
src/Makefile.am: remove unused variable
Sebastian Harl [Mon, 30 May 2016 20:09:07 +0000 (22:09 +0200)]
Merged branch 'collectd-4.10' into collectd-5.4.
Sebastian Harl [Mon, 30 May 2016 19:59:46 +0000 (21:59 +0200)]
perl plugin: Be more consistent about capitalization.
Pavel Rochnyack [Mon, 30 May 2016 06:00:38 +0000 (12:00 +0600)]
perl plugin: Removed commented code
Pavel Rochnyack [Mon, 30 May 2016 05:52:21 +0000 (11:52 +0600)]
perl plugin: Added call_pv_locked() wrapper to handle thread locking flags.
Pavel Rochnyack [Mon, 30 May 2016 05:31:44 +0000 (11:31 +0600)]
perl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking
Pavel Rochnyack [Fri, 13 May 2016 13:20:22 +0000 (19:20 +0600)]
perl plugin: Fixes for #1706
* Fix coredump due to destroying interpreter on threads running perl.
* Fix deadlock when perl_log() is called from perl_init()
Pavel Rochnyack [Fri, 13 May 2016 08:50:31 +0000 (14:50 +0600)]
perl plugin: lock base thread interpreter in perl_init() too.
Avoid race conditions with c_ithread_create() called from threads of already-initialized plugins.
Fix for https://github.com/collectd/collectd/issues/1706.
Sebastian Harl [Mon, 30 May 2016 18:54:42 +0000 (20:54 +0200)]
Merge pull request #1710 from rpv-tomsk/perl-plugin-fixes
perl plugin: Synchronize access to thread information.
Cf. #1706
Pavel Rochnyack [Mon, 30 May 2016 06:00:38 +0000 (12:00 +0600)]
perl plugin: Removed commented code
Pavel Rochnyack [Mon, 30 May 2016 05:52:21 +0000 (11:52 +0600)]
perl plugin: Added call_pv_locked() wrapper to handle thread locking flags.
Pavel Rochnyack [Mon, 30 May 2016 05:31:44 +0000 (11:31 +0600)]
perl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking
Pavel Rochnyack [Fri, 13 May 2016 13:20:22 +0000 (19:20 +0600)]
perl plugin: Fixes for #1706
* Fix coredump due to destroying interpreter on threads running perl.
* Fix deadlock when perl_log() is called from perl_init()
Pavel Rochnyack [Fri, 13 May 2016 08:50:31 +0000 (14:50 +0600)]
perl plugin: lock base thread interpreter in perl_init() too.
Avoid race conditions with c_ithread_create() called from threads of already-initialized plugins.
Fix for https://github.com/collectd/collectd/issues/1706.
Ruben Kerkhof [Thu, 26 May 2016 19:01:50 +0000 (21:01 +0200)]
Merge pull request #1708 from rpv-tomsk/plugin-postgresql-plugininstancefrom-public
Postgresql plugin: set plugin instance from query results.
Pavel Rochnyack [Thu, 12 May 2016 13:34:58 +0000 (19:34 +0600)]
utils_db_query (postgresql/dbi/oracle plugins): Documented PluginInstanceFrom option
Ruben Kerkhof [Wed, 25 May 2016 16:35:53 +0000 (18:35 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Tue, 14 Jul 2015 06:22:18 +0000 (08:22 +0200)]
plugin_mock.c: Declare "kc".
This hopefully fixes "make check" on Solaris, which currently fails
with:
CC common_test.o
CCLD test_common
Undefined first referenced
symbol in file
kc ./.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_common
collect2: error: ld returned 1 exit status
(cherry picked from commit
4fb43017b4b585256627b9503ce0a5cf08ecdefe)
Ruben Kerkhof [Wed, 25 May 2016 16:28:57 +0000 (18:28 +0200)]
Do not link test_plugin_ceph with libcommon
Linking with libplugin_mock is enough since
that one already links with libcommon
Ruben Kerkhof [Wed, 25 May 2016 15:55:15 +0000 (17:55 +0200)]
Set subdir-objects globally instead of per Makefile
Florian Forster [Thu, 11 Jun 2015 13:35:43 +0000 (14:35 +0100)]
Makefile.am: Link tests with required libraries, too.
"make check" fails on Solaris because libraries are missing:
CCLD test_common
Undefined first referenced
symbol in file
kc ./.libs/libcommon.a(common.o)
kstat_data_lookup ./.libs/libcommon.a(common.o)
kstat_lookup ./.libs/libcommon.a(common.o)
kstat_read ./.libs/libcommon.a(common.o)
getaddrinfo ./.libs/libcommon.a(common.o)
freeaddrinfo ./.libs/libcommon.a(common.o)
gai_strerror ./.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_common
collect2: error: ld returned 1 exit status
(cherry picked from commit
6213557b1d5c79a60e9c4322263836ca6066aa0e)
Gustavo Zacarias [Mon, 6 Jul 2015 12:59:30 +0000 (09:59 -0300)]
build: add libavltree, libcommon & libheap dependencies
Otherwise it can break on very parallel builds since collectd link time
arrives before one or more of these were built.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
(cherry picked from commit
780e6a76021a240e95007a04b723d827120afa95)
Ruben Kerkhof [Wed, 25 May 2016 15:26:13 +0000 (17:26 +0200)]
Fix a typo that snuck in with
0c8d275
Always test before committing...
Pointy hat to: me
Florian Forster [Tue, 14 Jul 2015 07:00:49 +0000 (09:00 +0200)]
Link libcommon.la with $(COMMON_LIBS).
This hopefully fixes link errors on Solaris:
CCLD test_utils_vl_lookup
Undefined first referenced
symbol in file
kstat_data_lookup daemon/.libs/libcommon.a(common.o)
kstat_lookup daemon/.libs/libcommon.a(common.o)
kstat_read daemon/.libs/libcommon.a(common.o)
getaddrinfo daemon/.libs/libcommon.a(common.o)
freeaddrinfo daemon/.libs/libcommon.a(common.o)
gai_strerror daemon/.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_utils_vl_lookup
collect2: error: ld returned 1 exit status
(cherry picked from commit
fe2eee98f4b1cf8c5a5df6ed6cd03d8487c695be)
Conflicts:
src/daemon/Makefile.am
Ruben Kerkhof [Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200)]
Merge branch 'collectd-5.5'
Conflicts:
configure.ac
Ruben Kerkhof [Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Wed, 25 May 2016 14:52:34 +0000 (16:52 +0200)]
Merge pull request #1726 from rubenk/udev
Udev
Marc Fournier [Wed, 25 May 2016 14:28:01 +0000 (16:28 +0200)]
processes: re-add <sys/user.h> inclusion
cf #1725
Ruben Kerkhof [Wed, 25 May 2016 14:15:32 +0000 (16:15 +0200)]
Stop hardcoding libudev
Ruben Kerkhof [Wed, 25 May 2016 14:13:55 +0000 (16:13 +0200)]
Add missing udev flags to Makefile.am
Marc Fournier [Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Wed, 25 May 2016 14:00:51 +0000 (16:00 +0200)]
processes: MAXCOMLEN is not exposed on Solaris
MAXCOMLEN in <sys/user.h> is only exposed to kernel
code. I think it's safe to assume that it isn't going
to change, so just hardcode it.
Ruben Kerkhof [Wed, 25 May 2016 13:47:59 +0000 (15:47 +0200)]
Merge pull request #1724 from rpv-tomsk/smart-plugin-udev-dep
Fix for #1688 The SMART plugin does not build/load, v.5.5.0
Pavel Rochnyack [Wed, 25 May 2016 13:01:46 +0000 (19:01 +0600)]
smart plugin: Check for libudev presence
Ruben Kerkhof [Wed, 25 May 2016 11:57:11 +0000 (13:57 +0200)]
Merge pull request #1723 from rpv-tomsk/disk-plugin
Disk plugin: UdevNameAttr feature improvements
Pavel Rochnyack [Wed, 25 May 2016 07:54:46 +0000 (13:54 +0600)]
disk plugin: Initialize udev context only once, not per each read
Pavel Rochnyack [Wed, 25 May 2016 07:15:31 +0000 (13:15 +0600)]
disk plugin: Call disk_udev_attr_name() only when UdevNameAttr configured
Marc Fournier [Fri, 20 May 2016 20:30:54 +0000 (22:30 +0200)]
collectd.conf.in: remove extraneous pound sign
Ruben Kerkhof [Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 20 May 2016 10:50:02 +0000 (12:50 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Birger Schmidt [Mon, 16 May 2016 06:39:38 +0000 (08:39 +0200)]
utils_cache.c: fix FORMAT_VL failed ERROR messages
ciomaire [Tue, 3 May 2016 11:41:14 +0000 (13:41 +0200)]
kill correct pid on fdopen failure