Merge branch 'collectd-5.5'

diff --cc src/Makefile.am
index d2e6bd6f4c64e90a2643488f18525e783e4e4ea4,a9a80891b2100c92b1a6147ddd7b980c825ad3da..59535f6c343949aaf91422a11089cc6bd60c7cdf
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1410,4 -1365,21 +1410,11 @@@ uninstall-hook
        rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
        rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
  
 -check_PROGRAMS = test_utils_mount test_utils_vl_lookup
 -
 -test_utils_mount_SOURCES = utils_mount_test.c testing.h
 -test_utils_mount_LDADD = libmount.la daemon/libplugin_mock.la
 -
 -test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c testing.h
 -test_utils_vl_lookup_LDADD = liblookup.la daemon/libplugin_mock.la
 -
 -TESTS = test_utils_mount test_utils_vl_lookup
--
+ if BUILD_PLUGIN_CEPH
+ test_plugin_ceph_SOURCES = ceph_test.c
+ test_plugin_ceph_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+ test_plugin_ceph_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
+ test_plugin_ceph_LDADD = daemon/libcommon.la daemon/libplugin_mock.la $(BUILD_WITH_LIBYAJL_LIBS)
+ check_PROGRAMS += test_plugin_ceph
+ TESTS += test_plugin_ceph
+ endif

diff --cc src/ceph.c
Simple merge

diff --cc src/daemon/plugin_mock.c
index f7bf1c016ad894f926003ad179112a6196edd161,f3eefd5a6ebc5ebededb1af1206f4f997a330941..b6efa3ad788387528074efc38b258b6ef309b6dd
--- 1/src/daemon/plugin_mock.c
--- 2/src/daemon/plugin_mock.c
+++ b/src/daemon/plugin_mock.c
@@@ -26,10 -26,33 +26,37 @@@
  
  #include "plugin.h"
  
 +#if HAVE_LIBKSTAT
 +kstat_ctl_t *kc = NULL;
 +#endif /* HAVE_LIBKSTAT */
 +
+ char hostname_g[] = "example.com";
+ 
+ int plugin_register_complex_config (const char *type, int (*callback) (oconfig_item_t *))
+ {
+   return ENOTSUP;
+ }
+ 
+ int plugin_register_init (const char *name, plugin_init_cb callback)
+ {
+   return ENOTSUP;
+ }
+ 
+ int plugin_register_read (const char *name, int (*callback) (void))
+ {
+   return ENOTSUP;
+ }
+ 
+ int plugin_register_shutdown (const char *name, int (*callback) (void))
+ {
+   return ENOTSUP;
+ }
+ 
+ int plugin_dispatch_values (value_list_t const *vl)
+ {
+   return ENOTSUP;
+ }
+ 
  void plugin_log (int level, char const *format, ...)
  {
    char buffer[1024];

diff --cc src/snmp.c
Simple merge