X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=Makefile.am;h=258603f91fe1c9d3480fe50796fb9703d44dc261;hp=61159c4f4d581d3c5366d9ad7da6312b1e9b8c32;hb=de407dd4e036f73e9bd4658af9d71f504fc11109;hpb=28e701a07d1ea28b12d0e7c2e6ce57c993b2d509

diff --git a/Makefile.am b/Makefile.am
index 61159c4f..258603f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,6 +136,7 @@ noinst_LTLIBRARIES = \
 	libheap.la \
 	libignorelist.la \
 	liblatency.la \
+	libllist.la \
 	liblookup.la \
 	libmetadata.la \
 	libmount.la \
@@ -236,16 +237,14 @@ collectd_SOURCES = \
 	src/daemon/filter_chain.h \
 	src/daemon/globals.c \
 	src/daemon/globals.h \
-	src/daemon/meta_data.c \
-	src/daemon/meta_data.h \
+	src/utils/metadata/meta_data.c \
+	src/utils/metadata/meta_data.h \
 	src/daemon/plugin.c \
 	src/daemon/plugin.h \
 	src/daemon/utils_cache.c \
 	src/daemon/utils_cache.h \
 	src/daemon/utils_complain.c \
 	src/daemon/utils_complain.h \
-	src/daemon/utils_llist.c \
-	src/daemon/utils_llist.h \
 	src/daemon/utils_random.c \
 	src/daemon/utils_random.h \
 	src/daemon/utils_subst.c \
@@ -265,6 +264,7 @@ collectd_LDADD = \
 	libavltree.la \
 	libcommon.la \
 	libheap.la \
+	libllist.la \
 	liboconfig.la \
 	-lm \
 	$(COMMON_LIBS) \
@@ -276,7 +276,7 @@ collectd_LDFLAGS += -ldl -Wl,--out-implib,libcollectd.a
 else
 collectd_SOURCES += src/daemon/cmd.c
 endif
-	
+
 if BUILD_FEATURE_DAEMON
 collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 endif
@@ -341,22 +341,22 @@ endif
 
 
 test_common_SOURCES = \
-	src/daemon/common_test.c \
+	src/utils/common/common_test.c \
 	src/testing.h
 test_common_LDADD = libplugin_mock.la
 
 test_meta_data_SOURCES = \
-	src/daemon/meta_data_test.c \
+	src/utils/metadata/meta_data_test.c \
 	src/testing.h
 test_meta_data_LDADD = libmetadata.la libplugin_mock.la
 
 test_utils_avltree_SOURCES = \
-	src/daemon/utils_avltree_test.c \
+	src/utils/avltree/avltree_test.c \
 	src/testing.h
 test_utils_avltree_LDADD = libavltree.la $(COMMON_LIBS)
 
 test_utils_heap_SOURCES = \
-	src/daemon/utils_heap_test.c \
+	src/utils/heap/heap_test.c \
 	src/testing.h
 test_utils_heap_LDADD = libheap.la $(COMMON_LIBS)
 
@@ -372,30 +372,34 @@ test_utils_subst_SOURCES = \
 test_utils_subst_LDADD = libplugin_mock.la
 
 test_utils_config_cores_SOURCES = \
-	src/utils_config_cores_test.c \
+	src/utils/config_cores/config_cores_test.c \
 	src/testing.h
 test_utils_config_cores_LDADD = libplugin_mock.la
 
 libavltree_la_SOURCES = \
-	src/daemon/utils_avltree.c \
-	src/daemon/utils_avltree.h
+	src/utils/avltree/avltree.c \
+	src/utils/avltree/avltree.h
 
 libcommon_la_SOURCES = \
-	src/daemon/common.c \
-	src/daemon/common.h
+	src/utils/common/common.c \
+	src/utils/common/common.h
 libcommon_la_LIBADD = $(COMMON_LIBS)
 
 libheap_la_SOURCES = \
-	src/daemon/utils_heap.c \
-	src/daemon/utils_heap.h
+	src/utils/heap/heap.c \
+	src/utils/heap/heap.h
 
 libignorelist_la_SOURCES = \
-	src/utils_ignorelist.c \
-	src/utils_ignorelist.h
+	src/utils/ignorelist/ignorelist.c \
+	src/utils/ignorelist/ignorelist.h
+
+libllist_la_SOURCES = \
+	src/daemon/utils_llist.c \
+	src/daemon/utils_llist.h
 
 libmetadata_la_SOURCES = \
-	src/daemon/meta_data.c \
-	src/daemon/meta_data.h
+	src/utils/metadata/meta_data.c \
+	src/utils/metadata/meta_data.h
 
 libplugin_mock_la_SOURCES = \
 	src/daemon/plugin_mock.c \
@@ -409,11 +413,11 @@ libplugin_mock_la_CPPFLAGS = $(AM_CPPFLAGS) -DMOCK_TIME
 libplugin_mock_la_LIBADD = libcommon.la libignorelist.la $(COMMON_LIBS)
 
 libformat_graphite_la_SOURCES = \
-	src/utils_format_graphite.c \
-	src/utils_format_graphite.h
+	src/utils/format_graphite/format_graphite.c \
+	src/utils/format_graphite/format_graphite.h
 
 test_format_graphite_SOURCES = \
-	src/utils_format_graphite_test.c \
+	src/utils/format_graphite/format_graphite_test.c \
 	src/testing.h
 test_format_graphite_LDADD = \
 	libformat_graphite.la \
@@ -422,8 +426,8 @@ test_format_graphite_LDADD = \
 	-lm
 
 libformat_json_la_SOURCES = \
-	src/utils_format_json.c \
-	src/utils_format_json.h
+	src/utils/format_json/format_json.c \
+	src/utils/format_json/format_json.h
 libformat_json_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libformat_json_la_LDFLAGS   = $(AM_LDFLAGS)
 libformat_json_la_LIBADD    =
@@ -435,7 +439,7 @@ libformat_json_la_LIBADD   += $(BUILD_WITH_LIBYAJL_LIBS)
 check_PROGRAMS += test_format_json
 
 test_format_json_SOURCES = \
-	src/utils_format_json_test.c \
+	src/utils/format_json/format_json_test.c \
 	src/testing.h
 test_format_json_LDADD = \
 	libformat_json.la \
@@ -453,16 +457,16 @@ check_PROGRAMS += test_plugin_ceph
 endif
 
 liblatency_la_SOURCES = \
-	src/utils_latency.c \
-	src/utils_latency.h \
-	src/utils_latency_config.c \
-	src/utils_latency_config.h
+	src/utils/latency/latency.c \
+	src/utils/latency/latency.h \
+	src/utils/latency/latency_config.c \
+	src/utils/latency/latency_config.h
 liblatency_la_LIBADD = \
 	libcommon.la \
 	-lm
 
 test_utils_latency_SOURCES = \
-	src/utils_latency_test.c \
+	src/utils/latency/latency_test.c \
 	src/testing.h
 test_utils_latency_LDADD = \
 	liblatency.la \
@@ -470,41 +474,41 @@ test_utils_latency_LDADD = \
 	-lm
 
 libcmds_la_SOURCES = \
-	src/utils_cmds.c \
-	src/utils_cmds.h \
-	src/utils_cmd_flush.c \
-	src/utils_cmd_flush.h \
-	src/utils_cmd_getthreshold.c \
-	src/utils_cmd_getthreshold.h \
-	src/utils_cmd_getval.c \
-	src/utils_cmd_getval.h \
-	src/utils_cmd_listval.c \
-	src/utils_cmd_listval.h \
-	src/utils_cmd_putnotif.c \
-	src/utils_cmd_putnotif.h \
-	src/utils_cmd_putval.c \
-	src/utils_cmd_putval.h \
-	src/utils_parse_option.c \
-	src/utils_parse_option.h
+	src/utils/cmds/cmds.c \
+	src/utils/cmds/cmds.h \
+	src/utils/cmds/flush.c \
+	src/utils/cmds/flush.h \
+	src/utils/cmds/getthreshold.c \
+	src/utils/cmds/getthreshold.h \
+	src/utils/cmds/getval.c \
+	src/utils/cmds/getval.h \
+	src/utils/cmds/listval.c \
+	src/utils/cmds/listval.h \
+	src/utils/cmds/putnotif.c \
+	src/utils/cmds/putnotif.h \
+	src/utils/cmds/putval.c \
+	src/utils/cmds/putval.h \
+	src/utils/cmds/parse_option.c \
+	src/utils/cmds/parse_option.h
 libcmds_la_LIBADD = \
 	libcommon.la \
 	libmetadata.la \
 	-lm
 
 test_utils_cmds_SOURCES = \
-	src/utils_cmds_test.c \
+	src/utils/cmds/cmds_test.c \
 	src/testing.h
 test_utils_cmds_LDADD = \
 	libcmds.la \
 	libplugin_mock.la
 
 liblookup_la_SOURCES = \
-	src/utils_vl_lookup.c \
-	src/utils_vl_lookup.h
+	src/utils/lookup/vl_lookup.c \
+	src/utils/lookup/vl_lookup.h
 liblookup_la_LIBADD = libavltree.la
 
 test_utils_vl_lookup_SOURCES = \
-	src/utils_vl_lookup_test.c \
+	src/utils/lookup/vl_lookup_test.c \
 	src/testing.h
 test_utils_vl_lookup_LDADD = \
 	liblookup.la \
@@ -514,11 +518,11 @@ test_utils_vl_lookup_LDADD += -lkstat
 endif
 
 libmount_la_SOURCES = \
-	src/utils_mount.c \
-	src/utils_mount.h
+	src/utils/mount/mount.c \
+	src/utils/mount/mount.h
 
 test_utils_mount_SOURCES = \
-	src/utils_mount_test.c \
+	src/utils/mount/mount_test.c \
 	src/testing.h
 test_utils_mount_LDADD = \
 	libmount.la \
@@ -579,8 +583,8 @@ if BUILD_WITH_LIBSSL
 if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += liboauth.la
 liboauth_la_SOURCES = \
-	src/utils_oauth.c \
-	src/utils_oauth.h
+	src/utils/oauth/oauth.c \
+	src/utils/oauth/oauth.h
 liboauth_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(BUILD_WITH_LIBCURL_CFLAGS) \
@@ -594,7 +598,7 @@ liboauth_la_LIBADD = \
 check_PROGRAMS += test_utils_oauth
 TESTS += test_utils_oauth
 test_utils_oauth_SOURCES = \
-	src/utils_oauth_test.c
+	src/utils/oauth/oauth_test.c
 test_utils_oauth_LDADD = \
 	liboauth.la \
 	libcommon.la \
@@ -602,8 +606,8 @@ test_utils_oauth_LDADD = \
 
 noinst_LTLIBRARIES += libgce.la
 libgce_la_SOURCES = \
-	src/utils_gce.c \
-	src/utils_gce.h
+	src/utils/gce/gce.c \
+	src/utils/gce/gce.h
 libgce_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(BUILD_WITH_LIBCURL_CFLAGS)
@@ -616,8 +620,8 @@ endif
 if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += libformat_stackdriver.la
 libformat_stackdriver_la_SOURCES = \
-	src/utils_format_stackdriver.c \
-	src/utils_format_stackdriver.h
+	src/utils/format_stackdriver/format_stackdriver.c \
+	src/utils/format_stackdriver/format_stackdriver.h
 libformat_stackdriver_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(BUILD_WITH_LIBYAJL_CPPFLAGS)
@@ -629,7 +633,7 @@ libformat_stackdriver_la_LIBADD = \
 check_PROGRAMS += test_format_stackdriver
 TESTS += test_format_stackdriver
 test_format_stackdriver_SOURCES = \
-	src/utils_format_stackdriver_test.c \
+	src/utils/format_stackdriver/format_stackdriver_test.c \
 	src/testing.h
 test_format_stackdriver_LDADD = \
 	libformat_stackdriver.la \
@@ -641,8 +645,8 @@ if BUILD_PLUGIN_AGGREGATION
 pkglib_LTLIBRARIES += aggregation.la
 aggregation_la_SOURCES = \
 	src/aggregation.c \
-	src/utils_vl_lookup.c \
-	src/utils_vl_lookup.h
+	src/utils/lookup/vl_lookup.c \
+	src/utils/lookup/vl_lookup.h
 aggregation_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 aggregation_la_LIBADD = -lm
 endif
@@ -663,7 +667,7 @@ if BUILD_PLUGIN_AMQP1
 pkglib_LTLIBRARIES += amqp1.la
 amqp1_la_SOURCES = \
 	src/amqp1.c \
-	src/utils_deq.h
+	src/utils/deq/deq.h
 amqp1_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBQPIDPROTON_CPPFLAGS)
 amqp1_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBQPIDPROTON_LDFLAGS)
 amqp1_la_LIBADD = \
@@ -768,6 +772,21 @@ chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 chrony_la_LIBADD = -lm
 endif
 
+if BUILD_PLUGIN_CHECK_UPTIME
+pkglib_LTLIBRARIES += check_uptime.la
+check_uptime_la_SOURCES = src/check_uptime.c
+check_uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+endif
+
+if BUILD_PLUGIN_CONNECTIVITY
+pkglib_LTLIBRARIES += connectivity.la
+connectivity_la_SOURCES = src/connectivity.c
+connectivity_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
+connectivity_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+connectivity_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
+connectivity_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) $(BUILD_WITH_LIBMNL_LIBS) libignorelist.la
+endif
+
 if BUILD_PLUGIN_CONNTRACK
 pkglib_LTLIBRARIES += conntrack.la
 conntrack_la_SOURCES = src/conntrack.c
@@ -827,10 +846,10 @@ if BUILD_PLUGIN_CURL
 pkglib_LTLIBRARIES += curl.la
 curl_la_SOURCES = \
 	src/curl.c \
-	src/utils_curl_stats.c \
-	src/utils_curl_stats.h \
-	src/utils_match.c \
-	src/utils_match.h
+	src/utils/curl_stats/curl_stats.c \
+	src/utils/curl_stats/curl_stats.h \
+	src/utils/match/match.c \
+	src/utils/match/match.h
 curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 curl_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 curl_la_LIBADD = liblatency.la $(BUILD_WITH_LIBCURL_LIBS)
@@ -840,15 +859,15 @@ if BUILD_PLUGIN_CURL_JSON
 pkglib_LTLIBRARIES += curl_json.la
 curl_json_la_SOURCES = \
 	src/curl_json.c \
-	src/utils_curl_stats.c \
-	src/utils_curl_stats.h
+	src/utils/curl_stats/curl_stats.c \
+	src/utils/curl_stats/curl_stats.h
 curl_json_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 curl_json_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBYAJL_LIBS)
 
 test_plugin_curl_json_SOURCES = src/curl_json_test.c \
-				src/utils_curl_stats.c \
+				src/utils/curl_stats/curl_stats.c \
 				src/daemon/configfile.c \
 				src/daemon/types_list.c
 test_plugin_curl_json_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
@@ -861,8 +880,8 @@ if BUILD_PLUGIN_CURL_XML
 pkglib_LTLIBRARIES += curl_xml.la
 curl_xml_la_SOURCES = \
 	src/curl_xml.c \
-	src/utils_curl_stats.c \
-	src/utils_curl_stats.h
+	src/utils/curl_stats/curl_stats.c \
+	src/utils/curl_stats/curl_stats.h
 curl_xml_la_CFLAGS = $(AM_CFLAGS) \
 		$(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 curl_xml_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -873,8 +892,8 @@ if BUILD_PLUGIN_DBI
 pkglib_LTLIBRARIES += dbi.la
 dbi_la_SOURCES = \
 	src/dbi.c \
-	src/utils_db_query.c \
-	src/utils_db_query.h
+	src/utils/db_query/db_query.c \
+	src/utils/db_query/db_query.h
 dbi_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBDBI_CPPFLAGS)
 dbi_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBDBI_LDFLAGS)
 dbi_la_LIBADD = $(BUILD_WITH_LIBDBI_LIBS)
@@ -924,8 +943,8 @@ if BUILD_PLUGIN_DNS
 pkglib_LTLIBRARIES += dns.la
 dns_la_SOURCES = \
 	src/dns.c \
-	src/utils_dns.c \
-	src/utils_dns.h
+	src/utils/dns/dns.c \
+	src/utils/dns/dns.h
 dns_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPCAP_CPPFLAGS)
 dns_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPCAP_LDFLAGS)
 dns_la_LIBADD = $(BUILD_WITH_LIBPCAP_LIBS)
@@ -933,7 +952,7 @@ endif
 
 if BUILD_PLUGIN_DPDKEVENTS
 pkglib_LTLIBRARIES += dpdkevents.la
-dpdkevents_la_SOURCES = src/dpdkevents.c src/utils_dpdk.c src/utils_dpdk.h
+dpdkevents_la_SOURCES = src/dpdkevents.c src/utils/dpdk/dpdk.c src/utils/dpdk/dpdk.h
 dpdkevents_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS)
 dpdkevents_la_CFLAGS = $(AM_CFLAGS) $(LIBDPDK_CFLAGS)
 dpdkevents_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)
@@ -942,7 +961,7 @@ endif
 
 if BUILD_PLUGIN_DPDKSTAT
 pkglib_LTLIBRARIES += dpdkstat.la
-dpdkstat_la_SOURCES = src/dpdkstat.c src/utils_dpdk.c src/utils_dpdk.h
+dpdkstat_la_SOURCES = src/dpdkstat.c src/utils/dpdk/dpdk.c src/utils/dpdk/dpdk.h
 dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS)
 dpdkstat_la_CFLAGS = $(AM_CFLAGS) $(LIBDPDK_CFLAGS)
 dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)
@@ -1017,6 +1036,7 @@ endif
 if BUILD_PLUGIN_GPU_NVIDIA
 pkglib_LTLIBRARIES += gpu_nvidia.la
 gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
+gpu_nvidia_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) $(BUILD_WITH_GPU_CUDA_CPPFLAGS)
 gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_GPU_CUDA_LDFLAGS)
 gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
 endif
@@ -1053,8 +1073,8 @@ if BUILD_PLUGIN_INTEL_PMU
 pkglib_LTLIBRARIES += intel_pmu.la
 intel_pmu_la_SOURCES = \
 	src/intel_pmu.c \
-	src/utils_config_cores.h \
-	src/utils_config_cores.c
+	src/utils/config_cores/config_cores.h \
+	src/utils/config_cores/config_cores.c
 intel_pmu_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBJEVENTS_CPPFLAGS)
 intel_pmu_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBJEVENTS_LDFLAGS)
 intel_pmu_la_LIBADD = $(BUILD_WITH_LIBJEVENTS_LIBS)
@@ -1064,11 +1084,32 @@ if BUILD_PLUGIN_INTEL_RDT
 pkglib_LTLIBRARIES += intel_rdt.la
 intel_rdt_la_SOURCES = \
 	src/intel_rdt.c \
-	src/utils_config_cores.h \
-	src/utils_config_cores.c
+	src/utils/proc_pids/proc_pids.c \
+	src/utils/proc_pids/proc_pids.h \
+	src/utils/config_cores/config_cores.h \
+	src/utils/config_cores/config_cores.c
 intel_rdt_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBPQOS_CPPFLAGS)
 intel_rdt_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPQOS_LDFLAGS)
 intel_rdt_la_LIBADD = $(BUILD_WITH_LIBPQOS_LIBS)
+
+test_plugin_intel_rdt_SOURCES = \
+	src/intel_rdt_test.c \
+	src/utils/config_cores/config_cores.c \
+	src/utils/proc_pids/proc_pids.c \
+	src/daemon/configfile.c \
+	src/daemon/types_list.c
+test_plugin_intel_rdt_CPPFLAGS = $(AM_CPPFLAGS)
+test_plugin_intel_rdt_LDFLAGS = $(PLUGIN_LDFLAGS)
+test_plugin_intel_rdt_LDADD = liboconfig.la libplugin_mock.la
+check_PROGRAMS += test_plugin_intel_rdt
+TESTS += test_plugin_intel_rdt
+
+test_utils_proc_pids_SOURCES = \
+	src/utils/proc_pids/proc_pids_test.c \
+	src/testing.h
+test_utils_proc_pids_LDADD = libplugin_mock.la
+check_PROGRAMS += test_utils_proc_pids
+TESTS += test_utils_proc_pids
 endif
 
 if BUILD_PLUGIN_INTERFACE
@@ -1185,14 +1226,6 @@ lua_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 lua_la_LIBADD = $(BUILD_WITH_LIBLUA_LIBS)
 endif
 
-if BUILD_PLUGIN_LVM
-pkglib_LTLIBRARIES += lvm.la
-lvm_la_SOURCES = src/lvm.c
-lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS)
-lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLVM2APP_LDFLAGS)
-lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS)
-endif
-
 if BUILD_PLUGIN_MADWIFI
 pkglib_LTLIBRARIES += madwifi.la
 madwifi_la_SOURCES = \
@@ -1259,8 +1292,8 @@ if BUILD_PLUGIN_MEMCACHEC
 pkglib_LTLIBRARIES += memcachec.la
 memcachec_la_SOURCES = \
 	src/memcachec.c \
-	src/utils_match.c \
-	src/utils_match.h
+	src/utils/match/match.c \
+	src/utils/match/match.h
 memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS)
 memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS)
 memcachec_la_LIBADD = liblatency.la $(BUILD_WITH_LIBMEMCACHED_LIBS)
@@ -1369,6 +1402,27 @@ network_la_CPPFLAGS += $(GCRYPT_CPPFLAGS)
 network_la_LDFLAGS += $(GCRYPT_LDFLAGS)
 network_la_LIBADD += $(GCRYPT_LIBS)
 endif
+
+test_plugin_network_SOURCES = \
+	src/network_test.c \
+	src/utils_fbhash.c \
+	src/daemon/configfile.c \
+	src/daemon/types_list.c
+test_plugin_network_CPPFLAGS = $(AM_CPPFLAGS) $(GCRYPT_CPPFLAGS)
+test_plugin_network_LDFLAGS = $(PLUGIN_LDFLAGS) $(GCRYPT_LDFLAGS)
+test_plugin_network_LDADD = \
+	libavltree.la \
+	liboconfig.la \
+	libplugin_mock.la \
+	libmetadata.la \
+	$(GCRYPT_LIBS)
+if BUILD_WITH_LIBSOCKET
+test_plugin_network_LDADD += -lsocket
+endif
+if BUILD_WITH_LIBNSL
+test_plugin_network_LDADD += -lnsl
+endif
+check_PROGRAMS += test_plugin_network
 endif
 
 if BUILD_PLUGIN_NFS
@@ -1467,8 +1521,8 @@ if BUILD_PLUGIN_ORACLE
 pkglib_LTLIBRARIES += oracle.la
 oracle_la_SOURCES = \
 	src/oracle.c \
-	src/utils_db_query.c \
-	src/utils_db_query.h
+	src/utils/db_query/db_query.c \
+	src/utils/db_query/db_query.h
 oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CPPFLAGS)
 oracle_la_LIBADD = $(BUILD_WITH_ORACLE_LIBS)
 oracle_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -1478,8 +1532,8 @@ if BUILD_PLUGIN_OVS_EVENTS
 pkglib_LTLIBRARIES += ovs_events.la
 ovs_events_la_SOURCES = \
 	src/ovs_events.c \
-	src/utils_ovs.c \
-	src/utils_ovs.h
+	src/utils/ovs/ovs.c \
+	src/utils/ovs/ovs.h
 ovs_events_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 ovs_events_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 ovs_events_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
@@ -1489,8 +1543,8 @@ if BUILD_PLUGIN_OVS_STATS
 pkglib_LTLIBRARIES += ovs_stats.la
 ovs_stats_la_SOURCES = \
 	src/ovs_stats.c \
-	src/utils_ovs.c \
-	src/utils_ovs.h
+	src/utils/ovs/ovs.c \
+	src/utils/ovs/ovs.h
 ovs_stats_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 ovs_stats_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 ovs_stats_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
@@ -1560,8 +1614,8 @@ if BUILD_PLUGIN_POSTGRESQL
 pkglib_LTLIBRARIES += postgresql.la
 postgresql_la_SOURCES = \
 	src/postgresql.c \
-	src/utils_db_query.c \
-	src/utils_db_query.h
+	src/utils/db_query/db_query.c \
+	src/utils/db_query/db_query.h
 postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS)
 postgresql_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
 	$(BUILD_WITH_LIBPQ_LDFLAGS)
@@ -1588,8 +1642,8 @@ endif
 if HAVE_LIBMNL
 noinst_LTLIBRARIES += libtaskstats.la
 libtaskstats_la_SOURCES = \
-	src/utils_taskstats.c \
-	src/utils_taskstats.h
+	src/utils/taskstats/taskstats.c \
+	src/utils/taskstats/taskstats.h
 libtaskstats_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
 libtaskstats_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
 endif
@@ -1609,6 +1663,14 @@ processes_la_LIBADD += libtaskstats.la
 endif
 endif
 
+if BUILD_PLUGIN_PROCEVENT
+pkglib_LTLIBRARIES += procevent.la
+procevent_la_SOURCES = src/procevent.c
+procevent_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+procevent_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
+procevent_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) libignorelist.la
+endif
+
 if BUILD_PLUGIN_PROTOCOLS
 pkglib_LTLIBRARIES += protocols.la
 protocols_la_SOURCES = src/protocols.c
@@ -1636,8 +1698,8 @@ if BUILD_PLUGIN_RRDCACHED
 pkglib_LTLIBRARIES += rrdcached.la
 rrdcached_la_SOURCES = \
 	src/rrdcached.c \
-	src/utils_rrdcreate.c \
-	src/utils_rrdcreate.h
+	src/utils/rrdcreate/rrdcreate.c \
+	src/utils/rrdcreate/rrdcreate.h
 rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
 rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
 rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
@@ -1647,8 +1709,8 @@ if BUILD_PLUGIN_RRDTOOL
 pkglib_LTLIBRARIES += rrdtool.la
 rrdtool_la_SOURCES = \
 	src/rrdtool.c \
-	src/utils_rrdcreate.c \
-	src/utils_rrdcreate.h
+	src/utils/rrdcreate/rrdcreate.c \
+	src/utils/rrdcreate/rrdcreate.h
 rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
 rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
 rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
@@ -1702,7 +1764,7 @@ snmp_agent_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBNETSNMPAGENT_LDFLAGS)
 snmp_agent_la_LIBADD = $(BUILD_WITH_LIBNETSNMPAGENT_LIBS)
 
 test_plugin_snmp_agent_SOURCES = src/snmp_agent_test.c \
-                                 src/daemon/utils_avltree.c \
+                                 src/utils/avltree/avltree.c \
                                  src/daemon/utils_llist.c \
                                  src/daemon/configfile.c \
                                  src/daemon/types_list.c
@@ -1781,10 +1843,10 @@ if BUILD_PLUGIN_TAIL
 pkglib_LTLIBRARIES += tail.la
 tail_la_SOURCES = \
 	src/tail.c \
-	src/utils_match.c \
-	src/utils_match.h \
-	src/utils_tail.c \
-	src/utils_tail.h \
+	src/utils/match/match.c \
+	src/utils/match/match.h \
+	src/utils/tail/tail.c \
+	src/utils/tail/tail.h \
 	src/utils_tail_match.c \
 	src/utils_tail_match.h
 tail_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -1795,8 +1857,8 @@ if BUILD_PLUGIN_TAIL_CSV
 pkglib_LTLIBRARIES += tail_csv.la
 tail_csv_la_SOURCES = \
 	src/tail_csv.c \
-	src/utils_tail.c \
-	src/utils_tail.h
+	src/utils/tail/tail.c \
+	src/utils/tail/tail.h
 tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 endif
 
@@ -1946,12 +2008,13 @@ virt_la_CFLAGS = $(AM_CFLAGS) \
 virt_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 virt_la_LIBADD = libignorelist.la $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
 
-test_plugin_virt_SOURCES = src/virt_test.c
+test_plugin_virt_SOURCES = src/virt_test.c src/daemon/configfile.c \
+	src/daemon/types_list.c
 test_plugin_virt_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(BUILD_WITH_LIBVIRT_CPPFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 test_plugin_virt_LDFLAGS = $(PLUGIN_LDFLAGS) \
 	$(BUILD_WITH_LIBVIRT_LDFLAGS) $(BUILD_WITH_LIBXML2_LDFLAGS)
-test_plugin_virt_LDADD = libplugin_mock.la \
+test_plugin_virt_LDADD = liboconfig.la libplugin_mock.la \
 	$(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
 check_PROGRAMS += test_plugin_virt
 TESTS += test_plugin_virt
@@ -1986,8 +2049,8 @@ if BUILD_PLUGIN_WRITE_HTTP
 pkglib_LTLIBRARIES += write_http.la
 write_http_la_SOURCES = \
 	src/write_http.c \
-	src/utils_format_kairosdb.c \
-	src/utils_format_kairosdb.h
+	src/utils/format_kairosdb/format_kairosdb.c \
+	src/utils/format_kairosdb/format_kairosdb.h
 write_http_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 write_http_la_LIBADD = libformat_json.la $(BUILD_WITH_LIBCURL_LIBS)
@@ -2017,6 +2080,7 @@ pkglib_LTLIBRARIES += write_mongodb.la
 write_mongodb_la_SOURCES = src/write_mongodb.c
 write_mongodb_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMONGOC_CFLAGS)
 write_mongodb_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMONGOC_LDFLAGS)
+write_mongodb_la_LIBADD = $(BUILD_WITH_LIBMONGOC_LIBS)
 endif
 
 if BUILD_PLUGIN_WRITE_PROMETHEUS
@@ -2063,6 +2127,12 @@ write_stackdriver_la_LIBADD = libformat_stackdriver.la libgce.la liboauth.la \
                      $(BUILD_WITH_LIBCURL_LIBS)
 endif
 
+if BUILD_PLUGIN_WRITE_SYSLOG
+pkglib_LTLIBRARIES += write_syslog.la
+write_syslog_la_SOURCES = src/write_syslog.c
+write_syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+endif
+
 if BUILD_PLUGIN_WRITE_TSDB
 pkglib_LTLIBRARIES += write_tsdb.la
 write_tsdb_la_SOURCES = src/write_tsdb.c
@@ -2115,20 +2185,10 @@ am__v_POD2MAN_C_0 = @echo "  POD2MAN " $@;
 am__v_POD2MAN_C_1 =
 
 .pod.1:
-	$(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
-		>.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
-	@if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
-	then \
-		echo "$@ has some POD errors!"; false; \
-	fi
+	$(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< $@
 
 .pod.5:
-	$(AM_V_POD2MAN_C)pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
-		>.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
-	@if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
-	then \
-		echo "$@ has some POD errors!"; false; \
-	fi
+	$(AM_V_POD2MAN_C)pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< $@
 
 V_PROTOC = $(v_protoc_@AM_V@)
 v_protoc_ = $(v_protoc_@AM_DEFAULT_V@)