collectd.git
7 years agosrc/Makefile.am: remove useless assigment
Ruben Kerkhof [Fri, 3 Jun 2016 20:33:23 +0000 (22:33 +0200)]
src/Makefile.am: remove useless assigment

7 years agozfs_arc: simplify build logic
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.

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 20:22:06 +0000 (22:22 +0200)]
src/Makefile.am: remove useless assignment

7 years agoxencpu: add missing cppflags and ldflags
Ruben Kerkhof [Fri, 3 Jun 2016 20:20:43 +0000 (22:20 +0200)]
xencpu: add missing cppflags and ldflags

7 years agowrite_redis: append to CPPFLAGS, not CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:49:48 +0000 (20:49 +0200)]
write_redis: append to CPPFLAGS, not CFLAGS

7 years agoopenvpn plugin: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:45:20 +0000 (20:45 +0200)]
openvpn plugin: remove useless assignment

7 years agooracle plugin: use CPPFLAGS instead of CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:44:58 +0000 (20:44 +0200)]
oracle plugin: use CPPFLAGS instead of CFLAGS

7 years agoopenldap 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

7 years agoopenldap plugin: use $PLUGIN_LDFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:41:50 +0000 (20:41 +0200)]
openldap plugin: use $PLUGIN_LDFLAGS

Just like the other plugins.

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:40:25 +0000 (20:40 +0200)]
src/Makefile.am: remove useless assignment

7 years agomysql plugin: simplify build logic
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.

7 years agolvm: add missing cppflags and ldflags to Makefile
Ruben Kerkhof [Fri, 3 Jun 2016 18:34:29 +0000 (20:34 +0200)]
lvm: add missing cppflags and ldflags to Makefile

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:32:53 +0000 (20:32 +0200)]
src/Makefile.am: remove useless assignment

7 years agoipvs: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 18:30:59 +0000 (20:30 +0200)]
ipvs: simplify logic a bit

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:26:10 +0000 (20:26 +0200)]
src/Makefile.am: remove useless assignment

7 years agosimplify Makefile.am for nginx and write_http
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

7 years agoSimplify Makefile.am for curl plugins
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.

7 years agoaquaero: add flags to the right variable
Ruben Kerkhof [Fri, 3 Jun 2016 17:10:39 +0000 (19:10 +0200)]
aquaero: add flags to the right variable

7 years agosrc/Makefile.am: merge 2 lines
Ruben Kerkhof [Fri, 3 Jun 2016 17:07:29 +0000 (19:07 +0200)]
src/Makefile.am: merge 2 lines

7 years agosrc/Makefile.am: simplify Apache plugin
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.

7 years agoconfigure.ac: break a few long lines up
Ruben Kerkhof [Fri, 3 Jun 2016 16:50:53 +0000 (18:50 +0200)]
configure.ac: break a few long lines up

7 years agoAlways build with pthread support
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.

7 years agoconfigure.ac: remove unused HAVE_LIBPTHREAD define
Ruben Kerkhof [Fri, 3 Jun 2016 16:05:11 +0000 (18:05 +0200)]
configure.ac: remove unused HAVE_LIBPTHREAD define

7 years agounixsock plugin: stop linking with libpthread
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.

7 years agostatsd plugin: stop linking with libpthread
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.

7 years agosnmp plugin: stop linking with libpthread
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.

7 years agonut plugin: stop linking with libpthread
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.

7 years agonotify_email plugin: stop linking with libpthread
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.

7 years agonetwork plugin: stop linking with libpthread
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.

7 years agojava plugin: stop linking with libpthread
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.

7 years agoexec plugin: stop linking with libpthread
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.

7 years agoemail plugin: stop linking with libpthread
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.

7 years agodns plugin: stop linking with libpthread
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.

7 years agoall plugins: remove pthread.h include
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

7 years agoDon't hardcode libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:30:57 +0000 (17:30 +0200)]
Don't hardcode libpthread

7 years agocollectd_tg: let automake compute dependencies
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.

7 years agocollectd_tg: simplify logic a bit
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.

7 years agocollectdctl: let automake compute dependencies
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

7 years agocollectdctl: simplify logic a bit
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.

7 years agosrc/Makefile.am: let automake compute dependencies
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

7 years agosrc/Makefile.am: simplify logic a bit
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.

7 years agoRemoved braces on single line 'if'. Always using inet_ntop.
Claudius Zingerli [Fri, 3 Jun 2016 14:38:23 +0000 (16:38 +0200)]
Removed braces on single line 'if'. Always using inet_ntop.

7 years agoMacro fixes, Implemented comments from code review (style, defines)
Claudius Zingerli [Fri, 3 Jun 2016 13:14:43 +0000 (15:14 +0200)]
Macro fixes, Implemented comments from code review (style, defines)

7 years agosrc/Makefile.am: remove CPPFLAGS assignment
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

7 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 3 Jun 2016 10:56:53 +0000 (12:56 +0200)]
Merge branch 'collectd-5.5'

Conflicts:
src/perl.c

7 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:59 +0000 (12:51 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

7 years agosrc/Makefile.am: remove unused variable
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:13 +0000 (12:51 +0200)]
src/Makefile.am: remove unused variable

7 years agoconfigure: Add some more information about protoc/gRPC in the summary.
Sebastian Harl [Sat, 7 May 2016 11:35:17 +0000 (13:35 +0200)]
configure: Add some more information about protoc/gRPC in the summary.

7 years agosrc/Makefile: Move proto-generated sources to nodist_*_SOURCES.
Sebastian Harl [Sat, 7 May 2016 11:26:22 +0000 (13:26 +0200)]
src/Makefile: Move proto-generated sources to nodist_*_SOURCES.

7 years agocollectd.conf(5): Briefly document grpc's SSL options.
Sebastian Harl [Sat, 7 May 2016 00:34:25 +0000 (02:34 +0200)]
collectd.conf(5): Briefly document grpc's SSL options.

7 years agocollectd.conf: Update grpc sample configuration.
Sebastian Harl [Sat, 7 May 2016 00:26:39 +0000 (02:26 +0200)]
collectd.conf: Update grpc sample configuration.

7 years agogrpc plugin: Add options to enable SSL protected connections.
Sebastian Harl [Sat, 7 May 2016 00:17:12 +0000 (02:17 +0200)]
grpc plugin: Add options to enable SSL protected connections.

7 years agogrpc plugin: Use std::vector to store listener configs.
Sebastian Harl [Fri, 6 May 2016 22:36:40 +0000 (00:36 +0200)]
grpc plugin: Use std::vector to store listener configs.

7 years agogrpc plugin: Replace the ListValues RPC with QueryValues.
Sebastian Harl [Fri, 6 May 2016 22:15:49 +0000 (00:15 +0200)]
grpc plugin: Replace the ListValues RPC with QueryValues.

This is a more powerful function to query values from collectd's cache.

7 years agogrpc plugin: Split out identifier into it's own message type.
Sebastian Harl [Fri, 6 May 2016 22:09:45 +0000 (00:09 +0200)]
grpc plugin: Split out identifier into it's own message type.

7 years agogrpc plugin: Use plugin_thread_create instead of pthread_create.
Sebastian Harl [Fri, 6 May 2016 21:49:01 +0000 (23:49 +0200)]
grpc plugin: Use plugin_thread_create instead of pthread_create.

7 years agogrpc plugin: Always populate *instance fields in a value-list.
Sebastian Harl [Fri, 6 May 2016 21:47:53 +0000 (23:47 +0200)]
grpc plugin: Always populate *instance fields in a value-list.

That is, ensure a (null-terminated!) empty string if the field is empty.

7 years agogrpc plugin: Update to the new gRPC API.
Sebastian Harl [Mon, 25 Apr 2016 21:52:57 +0000 (23:52 +0200)]
grpc plugin: Update to the new gRPC API.

7 years agogrpc plugin: Make RPC call implementation more modular.
Sebastian Harl [Mon, 2 Nov 2015 23:03:11 +0000 (00:03 +0100)]
grpc plugin: Make RPC call implementation more modular.

Use a template class for the RPC call object implementation to handle all
common functionality. The actual RPC implementation has been moved into
overloaded functions, one for each RPC. This approach only works as long as
the request and response type pairs are unique per call. That's common
practice, though, and in case there's an exception, it would have to fall back
to the previous approach (one class per call).

7 years agocollectd.conf: Example grpc configuration.
Sebastian Harl [Thu, 29 Oct 2015 23:10:38 +0000 (00:10 +0100)]
collectd.conf: Example grpc configuration.

7 years agogrpc plugin: Implement the ListValues() RPC.
Sebastian Harl [Thu, 29 Oct 2015 23:01:52 +0000 (00:01 +0100)]
grpc plugin: Implement the ListValues() RPC.

7 years agoREADME: Document grpc dependencies.
Sebastian Harl [Thu, 29 Oct 2015 22:25:25 +0000 (23:25 +0100)]
README: Document grpc dependencies.

7 years agocollectd.conf(5): Document the gRPC plugin.
Sebastian Harl [Thu, 29 Oct 2015 22:19:53 +0000 (23:19 +0100)]
collectd.conf(5): Document the gRPC plugin.

7 years agogrpc plugin: Make listeners and worker threads configurable.
Sebastian Harl [Thu, 29 Oct 2015 22:15:46 +0000 (23:15 +0100)]
grpc plugin: Make listeners and worker threads configurable.

7 years agogrpc plugin: Add a plugin providing a gRPC server.
Sebastian Harl [Thu, 29 Oct 2015 21:37:53 +0000 (22:37 +0100)]
grpc plugin: Add a plugin providing a gRPC server.

gRPC is an open source RPC framework based on protocol buffers. The plugin
currently exposes one RPC end-point for dispatching values to the daemon but
is easy to extend for more functionality.

The plugin is written in C++ and uses an synchronous architecture which should
provide maximum performance. The collectd build system has been extended to
support C++ (11) and protocol buffers (3.0+).

7 years agoutils cache: Add an iterator interface.
Sebastian Harl [Fri, 6 May 2016 21:52:02 +0000 (23:52 +0200)]
utils cache: Add an iterator interface.

This may be used to query additional information from the cache.

7 years agoMerged branch 'collectd-4.10' into collectd-5.4.
Sebastian Harl [Mon, 30 May 2016 20:09:07 +0000 (22:09 +0200)]
Merged branch 'collectd-4.10' into collectd-5.4.

7 years agoperl plugin: Be more consistent about capitalization.
Sebastian Harl [Mon, 30 May 2016 19:59:46 +0000 (21:59 +0200)]
perl plugin: Be more consistent about capitalization.

7 years agoperl plugin: Removed commented code
Pavel Rochnyack [Mon, 30 May 2016 06:00:38 +0000 (12:00 +0600)]
perl plugin: Removed commented code

7 years agoperl plugin: Added call_pv_locked() wrapper to handle thread locking flags.
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.

7 years agoperl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking
Pavel Rochnyack [Mon, 30 May 2016 05:31:44 +0000 (11:31 +0600)]
perl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking

7 years agoperl plugin: Fixes for #1706
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()

7 years agoperl plugin: lock base thread interpreter in perl_init() too.
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.

7 years agoMerge pull request #1710 from rpv-tomsk/perl-plugin-fixes
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

7 years agoperl plugin: Removed commented code
Pavel Rochnyack [Mon, 30 May 2016 06:00:38 +0000 (12:00 +0600)]
perl plugin: Removed commented code

7 years agoperl plugin: Added call_pv_locked() wrapper to handle thread locking flags.
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.

7 years agoperl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking
Pavel Rochnyack [Mon, 30 May 2016 05:31:44 +0000 (11:31 +0600)]
perl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking

7 years agoperl plugin: Fixes for #1706
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()

7 years agoperl plugin: lock base thread interpreter in perl_init() too.
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.

7 years agoMerge pull request #1708 from rpv-tomsk/plugin-postgresql-plugininstancefrom-public
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.

7 years agoutils_db_query (postgresql/dbi/oracle plugins): Documented PluginInstanceFrom option
Pavel Rochnyack [Thu, 12 May 2016 13:34:58 +0000 (19:34 +0600)]
utils_db_query (postgresql/dbi/oracle plugins): Documented PluginInstanceFrom option

7 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Wed, 25 May 2016 16:35:53 +0000 (18:35 +0200)]
Merge branch 'collectd-5.5'

7 years agoplugin_mock.c: Declare "kc".
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)

7 years agoDo not link test_plugin_ceph with libcommon
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

7 years agoSet subdir-objects globally instead of per Makefile
Ruben Kerkhof [Wed, 25 May 2016 15:55:15 +0000 (17:55 +0200)]
Set subdir-objects globally instead of per Makefile

7 years agoMakefile.am: Link tests with required libraries, too.
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)

7 years agobuild: add libavltree, libcommon & libheap dependencies
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)

7 years agoFix a typo that snuck in with 0c8d275
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

7 years agoLink libcommon.la with $(COMMON_LIBS).
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

7 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200)]
Merge branch 'collectd-5.5'

Conflicts:
configure.ac

7 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

7 years agoMerge pull request #1726 from rubenk/udev
Ruben Kerkhof [Wed, 25 May 2016 14:52:34 +0000 (16:52 +0200)]
Merge pull request #1726 from rubenk/udev

Udev

7 years agoprocesses: re-add <sys/user.h> inclusion
Marc Fournier [Wed, 25 May 2016 14:28:01 +0000 (16:28 +0200)]
processes: re-add <sys/user.h> inclusion

cf #1725

7 years agoStop hardcoding libudev
Ruben Kerkhof [Wed, 25 May 2016 14:15:32 +0000 (16:15 +0200)]
Stop hardcoding libudev

7 years agoAdd missing udev flags to Makefile.am
Ruben Kerkhof [Wed, 25 May 2016 14:13:55 +0000 (16:13 +0200)]
Add missing udev flags to Makefile.am

7 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

7 years agoprocesses: MAXCOMLEN is not exposed on Solaris
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.

7 years agoMerge pull request #1724 from rpv-tomsk/smart-plugin-udev-dep
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

7 years agosmart plugin: Check for libudev presence
Pavel Rochnyack [Wed, 25 May 2016 13:01:46 +0000 (19:01 +0600)]
smart plugin: Check for libudev presence

7 years agoMerge pull request #1723 from rpv-tomsk/disk-plugin
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