From: Florian Forster Date: Thu, 17 Sep 2009 06:52:56 +0000 (+0200) Subject: Merge branch 'collectd-4.7' into collectd-4.8 X-Git-Tag: collectd-4.8.1~13 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e21d0408e4e4001b8c66bb1ea7d41b890100d0f5;hp=-c;p=collectd.git Merge branch 'collectd-4.7' into collectd-4.8 --- e21d0408e4e4001b8c66bb1ea7d41b890100d0f5 diff --combined configure.in index 2d7f0182,9f26be3b..637a56a8 --- a/configure.in +++ b/configure.in @@@ -277,20 -277,6 +277,20 @@@ AC_CHECK_HEADERS(IOKit/ps/IOPowerSource ]) # For the swap module +have_linux_wireless_h="no" +if test "x$ac_system" = "xLinux" +then + AC_CHECK_HEADERS(linux/wireless.h, + [have_linux_wireless_h="yes"], + [have_linux_wireless_h="no"], +[ +#include +#include +#include +]) +fi + +# For the swap module have_sys_swap_h="yes" AC_CHECK_HEADERS(sys/swap.h vm/anon.h, [], [have_sys_swap_h="no"], [ @@@ -1448,8 -1434,8 +1448,8 @@@ AC_ARG_WITH(libiptc, [AS_HELP_STRING([- with_libiptc="yes" else if test "x$withval" != "xno" && test "x$withval" != "xyes" then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" + LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS -I$withval/include" + LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS -L$withval/lib" with_libiptc="yes" else with_libiptc="$withval" @@@ -1487,8 -1473,8 +1487,8 @@@ the fi if test "x$with_libiptc" = "xyes" then - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $KERNEL_CFLAGS" + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS" AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [], [ @@@ -1499,18 -1485,12 +1499,12 @@@ #include "$srcdir/src/owniptc/ipt_kernel_headers.h" ]) - CFLAGS="$SAVE_CFLAGS" - fi - AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes") - AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes") - if test "x$with_own_libiptc" = "xyes" - then - AC_DEFINE(OWN_LIBIPTC, 1, [Define to 1 if we use the shipped iptc library.]) + CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_libiptc" = "xyes" then - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $KERNEL_CFLAGS" + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS" AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [], [ @@@ -1523,7 -1503,20 +1517,20 @@@ #endif ]) - CFLAGS="$SAVE_CFLAGS" + CPPFLAGS="$SAVE_CPPFLAGS" + fi + AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes") + AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes") + if test "x$with_libiptc" = "xyes" + then + BUILD_WITH_LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS" + BUILD_WITH_LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS" + AC_SUBST(BUILD_WITH_LIBIPTC_CPPFLAGS) + AC_SUBST(BUILD_WITH_LIBIPTC_LDFLAGS) + fi + if test "x$with_own_libiptc" = "xyes" + then + AC_DEFINE(OWN_LIBIPTC, 1, [Define to 1 if we use the shipped iptc library.]) fi # }}} @@@ -2799,79 -2792,6 +2806,79 @@@ the fi # }}} +# --with-libtokyotyrant {{{ +with_libtokyotyrant_cppflags="" +with_libtokyotyrant_ldflags="" +with_libtokyotyrant_libs="" +AC_ARG_WITH(libtokyotyrant, [AS_HELP_STRING([--with-libtokyotyrant@<:@=PREFIX@:>@], [Path to libtokyotyrant.])], +[ + if test "x$withval" = "xno" + then + with_libtokyotyrant="no" + else if test "x$withval" = "xyes" + then + with_libtokyotyrant="yes" + else + with_libtokyotyrant_cppflags="-I$withval/include" + with_libtokyotyrant_ldflags="-L$withval/include" + with_libtokyotyrant_libs="-ltokyotyrant" + with_libtokyotyrant="yes" + fi; fi +], +[ + with_libtokyotyrant="yes" +]) + +if test "x$with_libtokyotyrant" = "xyes" +then + if $PKG_CONFIG --exists tokyotyrant + then + with_libtokyotyrant_cppflags="$with_libtokyotyrant_cppflags `$PKG_CONFIG --cflags tokyotyrant`" + with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `pkg-config --libs-only-L tokyotyrant`" + with_libtokyotyrant_libs="$with_libtokyotyrant_libs `pkg-config --libs-only-l tokyotyrant`" + fi +fi + +SAVE_CPPFLAGS="$CPPFLAGS" +SAVE_LDFLAGS="$LDFLAGS" +CPPFLAGS="$CPPFLAGS $with_libtokyotyrant_cppflags" +LDFLAGS="$LDFLAGS $with_libtokyotyrant_ldflags" + +if test "x$with_libtokyotyrant" = "xyes" +then + AC_CHECK_HEADERS(tcrdb.h, + [ + AC_DEFINE(HAVE_TCRDB_H, 1, + [Define to 1 if you have the header file.]) + ], [with_libtokyotyrant="no (tcrdb.h not found)"]) +fi + +if test "x$with_libtokyotyrant" = "xyes" +then + AC_CHECK_LIB(tokyotyrant, tcrdbrnum, + [ + AC_DEFINE(HAVE_LIBTOKYOTYRANT, 1, + [Define to 1 if you have the tokyotyrant library (-ltokyotyrant).]) + ], + [with_libtokyotyrant="no (symbol tcrdbrnum not found)"], + [$with_libtokyotyrant_libs]) +fi + +CPPFLAGS="$SAVE_CPPFLAGS" +LDFLAGS="$SAVE_LDFLAGS" + +if test "x$with_libtokyotyrant" = "xyes" +then + BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS="$with_libtokyotyrant_cppflags" + BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS="$with_libtokyotyrant_ldflags" + BUILD_WITH_LIBTOKYOTYRANT_LIBS="$with_libtokyotyrant_libs" + AC_SUBST(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS) + AC_SUBST(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS) + AC_SUBST(BUILD_WITH_LIBTOKYOTYRANT_LIBS) +fi +AM_CONDITIONAL(BUILD_WITH_LIBTOKYOTYRANT, test "x$with_libtokyotyrant" = "xyes") +# }}} + # --with-libupsclient {{{ with_libupsclient_config="" with_libupsclient_cflags="" @@@ -3075,57 -2995,6 +3082,57 @@@ AC_DEFINE_UNQUOTED(HAVE_LIBXMMS, [$with AM_CONDITIONAL(BUILD_WITH_LIBXMMS, test "x$with_libxmms" = "xyes") # }}} +# --with-libyajl {{{ +with_libyajl_cppflags="" +with_libyajl_ldflags="" +AC_ARG_WITH(libyajl, [AS_HELP_STRING([--with-libyajl@<:@=PREFIX@:>@], [Path to libyajl.])], +[ + if test "x$withval" != "xno" && test "x$withval" != "xyes" + then + with_libyajl_cppflags="-I$withval/include" + with_libyajl_ldflags="-L$withval/lib" + with_libyajl="yes" + else + with_libyajl="$withval" + fi +], +[ + with_libyajl="yes" +]) +if test "x$with_libyajl" = "xyes" +then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags" + + AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"]) + + CPPFLAGS="$SAVE_CPPFLAGS" +fi +if test "x$with_libyajl" = "xyes" +then + SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags" + LDFLAGS="$LDFLAGS $with_libyajl_ldflags" + + AC_CHECK_LIB(yajl, yajl_alloc, [with_libyajl="yes"], [with_libyajl="no (Symbol 'yajl_alloc' not found)"]) + + CPPFLAGS="$SAVE_CPPFLAGS" + LDFLAGS="$SAVE_LDFLAGS" +fi +if test "x$with_libyajl" = "xyes" +then + BUILD_WITH_LIBYAJL_CPPFLAGS="$with_libyajl_cppflags" + BUILD_WITH_LIBYAJL_LDFLAGS="$with_libyajl_ldflags" + BUILD_WITH_LIBYAJL_LIBS="-lyajl" + AC_SUBST(BUILD_WITH_LIBYAJL_CPPFLAGS) + AC_SUBST(BUILD_WITH_LIBYAJL_LDFLAGS) + AC_SUBST(BUILD_WITH_LIBYAJL_LIBS) + AC_DEFINE(HAVE_LIBYAJL, 1, [Define if libyajl is present and usable.]) +fi +AM_CONDITIONAL(BUILD_WITH_LIBYAJL, test "x$with_libyajl" = "xyes") +# }}} + # pkg-config --exists 'libxml-2.0'; pkg-config --exists libvirt {{{ with_libxml2="no (pkg-config isn't available)" with_libxml2_cflags="" @@@ -3460,7 -3329,6 +3467,7 @@@ plugin_bind="no plugin_conntrack="no" plugin_cpu="no" plugin_cpufreq="no" +plugin_curl_json="no" plugin_df="no" plugin_disk="no" plugin_entropy="no" @@@ -3488,7 -3356,6 +3495,7 @@@ plugin_uptime="no plugin_vmem="no" plugin_vserver="no" plugin_wireless="no" +plugin_zfs_arc="no" # Linux if test "x$ac_system" = "xLinux" @@@ -3538,7 -3405,6 +3545,7 @@@ f if test "x$with_kstat" = "xyes" then plugin_uptime="yes" + plugin_zfs_arc="yes" fi if test "x$with_devinfo$with_kstat" = "xyesyes" @@@ -3578,11 -3444,6 +3585,11 @@@ the plugin_ipmi="yes" fi +if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes" +then + plugin_curl_json="yes" +fi + if test "x$have_processor_info" = "xyes" then plugin_cpu="yes" @@@ -3734,7 -3595,6 +3741,7 @@@ AC_PLUGIN([cpufreq], [$plugin_cpufr AC_PLUGIN([cpu], [$plugin_cpu], [CPU usage statistics]) AC_PLUGIN([csv], [yes], [CSV output plugin]) AC_PLUGIN([curl], [$with_libcurl], [CURL generic web statistics]) +AC_PLUGIN([curl_json], [$plugin_curl_json], [CouchDB statistics]) AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) @@@ -3755,8 -3615,6 +3762,8 @@@ AC_PLUGIN([java], [$with_java] AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics]) AC_PLUGIN([load], [$plugin_load], [System load]) AC_PLUGIN([logfile], [yes], [File logging plugin]) +AC_PLUGIN([madwifi], [$have_linux_wireless_h], [Madwifi wireless statistics]) +AC_PLUGIN([match_empty_counter], [yes], [The empty counter match]) AC_PLUGIN([match_regex], [yes], [The regex match]) AC_PLUGIN([match_timediff], [yes], [The timediff match]) AC_PLUGIN([match_value], [yes], [The value match]) @@@ -3774,7 -3632,6 +3781,7 @@@ AC_PLUGIN([notify_desktop], [$with_libn AC_PLUGIN([notify_email], [$with_libesmtp], [Email notifier]) AC_PLUGIN([ntpd], [yes], [NTPd statistics]) AC_PLUGIN([nut], [$with_libupsclient], [Network UPS tools statistics]) +AC_PLUGIN([olsrd], [yes], [olsrd statistics]) AC_PLUGIN([onewire], [$with_libowcapi], [OneWire sensor statistics]) AC_PLUGIN([openvpn], [yes], [OpenVPN client statistics]) AC_PLUGIN([oracle], [$with_oracle], [Oracle plugin]) @@@ -3801,7 -3658,6 +3808,7 @@@ AC_PLUGIN([tcpconns], [$plugin_tcpco AC_PLUGIN([teamspeak2], [yes], [TeamSpeak2 server statistics]) AC_PLUGIN([ted], [$plugin_ted], [Read The Energy Detective values]) AC_PLUGIN([thermal], [$plugin_thermal], [Linux ACPI thermal zone statistics]) +AC_PLUGIN([tokyotyrant], [$with_libtokyotyrant], [TokyoTyrant database statistics]) AC_PLUGIN([unixsock], [yes], [Unixsock communication plugin]) AC_PLUGIN([uptime], [$plugin_uptime], [Uptime statistics]) AC_PLUGIN([users], [$plugin_users], [User statistics]) @@@ -3809,9 -3665,7 +3816,9 @@@ AC_PLUGIN([uuid], [yes] AC_PLUGIN([vmem], [$plugin_vmem], [Virtual memory statistics]) AC_PLUGIN([vserver], [$plugin_vserver], [Linux VServer statistics]) AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics]) +AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin]) AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) +AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics]) dnl Default configuration file # Load either syslog or logfile @@@ -4007,12 -3861,10 +4014,12 @@@ Configuration librrd . . . . . . . $with_librrd libsensors . . . . . $with_libsensors libstatgrab . . . . . $with_libstatgrab + libtokyotyrant . . . $with_libtokyotyrant libupsclient . . . . $with_libupsclient libvirt . . . . . . . $with_libvirt libxml2 . . . . . . . $with_libxml2 libxmms . . . . . . . $with_libxmms + libyajl . . . . . . . $with_libyajl oracle . . . . . . . $with_oracle Features: @@@ -4034,7 -3886,6 +4041,7 @@@ cpufreq . . . . . . . $enable_cpufreq csv . . . . . . . . . $enable_csv curl . . . . . . . . $enable_curl + curl_json . . . . . . $enable_curl_json dbi . . . . . . . . . $enable_dbi df . . . . . . . . . $enable_df disk . . . . . . . . $enable_disk @@@ -4055,8 -3906,6 +4062,8 @@@ libvirt . . . . . . . $enable_libvirt load . . . . . . . . $enable_load logfile . . . . . . . $enable_logfile + madwifi . . . . . . . $enable_madwifi + match_empty_counter . $enable_match_empty_counter match_regex . . . . . $enable_match_regex match_timediff . . . $enable_match_timediff match_value . . . . . $enable_match_value @@@ -4074,7 -3923,6 +4081,7 @@@ notify_email . . . . $enable_notify_email ntpd . . . . . . . . $enable_ntpd nut . . . . . . . . . $enable_nut + olsrd . . . . . . . . $enable_olsrd onewire . . . . . . . $enable_onewire openvpn . . . . . . . $enable_openvpn oracle . . . . . . . $enable_oracle @@@ -4101,7 -3949,6 +4108,7 @@@ teamspeak2 . . . . . $enable_teamspeak2 ted . . . . . . . . . $enable_ted thermal . . . . . . . $enable_thermal + tokyotyrant . . . . . $enable_tokyotyrant unixsock . . . . . . $enable_unixsock uptime . . . . . . . $enable_uptime users . . . . . . . . $enable_users @@@ -4109,9 -3956,7 +4116,9 @@@ vmem . . . . . . . . $enable_vmem vserver . . . . . . . $enable_vserver wireless . . . . . . $enable_wireless + write_http . . . . . $enable_write_http xmms . . . . . . . . $enable_xmms + zfs_arc . . . . . . . $enable_zfs_arc EOF diff --combined contrib/collection3/etc/collection.conf index f15ea56f,6baad5bf..1322d0d9 --- a/contrib/collection3/etc/collection.conf +++ b/contrib/collection3/etc/collection.conf @@@ -47,52 -47,6 +47,52 @@@ GraphWidth 40 Color starting ff00ff Color waiting ffb000 + + Module ArcCounts + RRDTitle "ARC {type_instance} on {hostname}" +# RRDOptions ... + + + Module GenericIO + DataSources read write + DSName "read Read " + DSName "write Written" + RRDTitle "L2ARC traffic" + RRDVerticalLabel "Bytes per second" +# RRDOptions ... + RRDFormat "%5.1lf%s" + + + RRDTitle "L2ARC size on {hostname}" + RRDVerticalLabel "Size" + RRDFormat "%4.0lf%s" + RRDOptions -b 1024 + DSName "value Current size" + Color value 00e000 + + + DataSources "current target minlimit maxlimit" + RRDTitle "ARC size on {hostname}" + RRDVerticalLabel "Size" + RRDFormat "%4.0lf%s" + RRDOptions -b 1024 + DSName "current Current size" + DSName "target Target size " + DSName "maxlimit Max size " + DSName "minlimit Min size " + Color current 00e000 + Color target 0000ff + Color minlimit ff0000 + Color maxlimit ff00ff + + + DataSources value + RRDTitle "{type_instance}ARC ratio on {hostname}" + RRDVerticalLabel "Ratio" + RRDFormat "%4.1lf" + RRDOptions -l 0 + DSName "value Hit ratio" + DataSources value DSName value Percent @@@ -161,7 -115,7 +161,7 @@@ DSName "read Read " DSName write Write RRDTitle "Disk Latency for {plugin_instance}" - RRDVerticalLabel "microseconds" + RRDVerticalLabel "seconds" Scale 0.000001 RRDFormat "%5.1lf %ss" @@@ -327,6 -281,13 +327,13 @@@ # RRDOptions ... RRDFormat "%5.1lf%s" + + DataSources value + DSName "value Invocations/s" + RRDTitle "Invocations ({instance})" + RRDVerticalLabel "Invocations/s" + RRDFormat "%5.1lf" + Module GenericIO DataSources rx tx @@@ -614,6 -575,20 +621,20 @@@ RRDVerticalLabel "°Celsius" RRDFormat "%4.1lf°C" + + DataSources value + DSName "value Threads" + RRDTitle "Threads ({instance})" + RRDVerticalLabel "Threads" + RRDFormat "%5.2lf" + + + DataSources value + DSName "value Requests/s" + RRDTitle "Requests ({instance})" + RRDVerticalLabel "Requests/s" + RRDFormat "%6.2lf" + DataSources value DSName "value Time" diff --combined src/Makefile.am index b92a8b61,7b13029d..2a836591 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -223,21 -223,6 +223,21 @@@ endi collectd_DEPENDENCIES += curl.la endif +if BUILD_PLUGIN_CURL_JSON +pkglib_LTLIBRARIES += curl_json.la +curl_json_la_SOURCES = curl_json.c +curl_json_la_CFLAGS = $(AM_CFLAGS) +curl_json_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS) +curl_json_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS) +curl_json_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) +if BUILD_WITH_LIBCURL +curl_json_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) +curl_json_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) +endif +collectd_LDADD += "-dlopen" curl_json.la +collectd_DEPENDENCIES += curl_json.la +endif + if BUILD_PLUGIN_DBI pkglib_LTLIBRARIES += dbi.la dbi_la_SOURCES = dbi.c \ @@@ -371,7 -356,8 +371,8 @@@ endif # BUILD_PLUGIN_INTERFAC if BUILD_PLUGIN_IPTABLES pkglib_LTLIBRARIES += iptables.la iptables_la_SOURCES = iptables.c - iptables_la_LDFLAGS = -module -avoid-version + iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS) + iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS) if BUILD_WITH_OWN_LIBIPTC iptables_la_LIBADD = owniptc/libiptc.la iptables_la_DEPENDENCIES = owniptc/libiptc.la @@@ -453,22 -439,6 +454,22 @@@ collectd_LDADD += "-dlopen" logfile.l collectd_DEPENDENCIES += logfile.la endif +if BUILD_PLUGIN_MADWIFI +pkglib_LTLIBRARIES += madwifi.la +madwifi_la_SOURCES = madwifi.c madwifi.h +madwifi_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" madwifi.la +collectd_DEPENDENCIES += madwifi.la +endif + +if BUILD_PLUGIN_MATCH_EMPTY_COUNTER +pkglib_LTLIBRARIES += match_empty_counter.la +match_empty_counter_la_SOURCES = match_empty_counter.c +match_empty_counter_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" match_empty_counter.la +collectd_DEPENDENCIES += match_empty_counter.la +endif + if BUILD_PLUGIN_MATCH_REGEX pkglib_LTLIBRARIES += match_regex.la match_regex_la_SOURCES = match_regex.c @@@ -669,18 -639,6 +670,18 @@@ collectd_LDADD += "-dlopen" nut.l collectd_DEPENDENCIES += nut.la endif +if BUILD_PLUGIN_OLSRD +pkglib_LTLIBRARIES += olsrd.la +olsrd_la_SOURCES = olsrd.c +olsrd_la_LDFLAGS = -module -avoid-version +olsrd_la_LIBADD = +if BUILD_WITH_LIBSOCKET +olsrd_la_LIBADD += -lsocket +endif +collectd_LDADD += "-dlopen" olsrd.la +collectd_DEPENDENCIES += olsrd.la +endif + if BUILD_PLUGIN_ONEWIRE pkglib_LTLIBRARIES += onewire.la onewire_la_SOURCES = onewire.c @@@ -954,25 -912,11 +955,25 @@@ collectd_LDADD += "-dlopen" thermal.l collectd_DEPENDENCIES += thermal.la endif +if BUILD_PLUGIN_TOKYOTYRANT +pkglib_LTLIBRARIES += tokyotyrant.la +tokyotyrant_la_SOURCES = tokyotyrant.c +tokyotyrant_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS) +tokyotyrant_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS) +tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) +if BUILD_WITH_LIBSOCKET +tokyotyrant_la_LIBADD += -lsocket +endif +collectd_LDADD += "-dlopen" tokyotyrant.la +collectd_DEPENDENCIES += tokyotyrant.la +endif + if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la unixsock_la_SOURCES = unixsock.c \ utils_cmd_flush.h utils_cmd_flush.c \ utils_cmd_getval.h utils_cmd_getval.c \ + utils_cmd_getthreshold.h utils_cmd_getthreshold.c \ utils_cmd_listval.h utils_cmd_listval.c \ utils_cmd_putval.h utils_cmd_putval.c \ utils_cmd_putnotif.h utils_cmd_putnotif.c @@@ -1043,21 -987,6 +1044,21 @@@ collectd_LDADD += "-dlopen" wireless.l collectd_DEPENDENCIES += wireless.la endif +if BUILD_PLUGIN_WRITE_HTTP +pkglib_LTLIBRARIES += write_http.la +write_http_la_SOURCES = write_http.c \ + utils_format_json.c utils_format_json.h +write_http_la_LDFLAGS = -module -avoid-version +write_http_la_CFLAGS = $(AM_CFLAGS) +write_http_la_LIBADD = +collectd_LDADD += "-dlopen" write_http.la +if BUILD_WITH_LIBCURL +write_http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) +write_http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) +endif +collectd_DEPENDENCIES += write_http.la +endif + if BUILD_PLUGIN_XMMS pkglib_LTLIBRARIES += xmms.la xmms_la_SOURCES = xmms.c @@@ -1068,16 -997,6 +1069,16 @@@ collectd_LDADD += "-dlopen" xmms.l collectd_DEPENDENCIES += xmms.la endif +if BUILD_PLUGIN_ZFS_ARC +pkglib_LTLIBRARIES += zfs_arc.la +zfs_arc_la_SOURCES = zfs_arc.c +zfs_arc_la_CFLAGS = $(AM_CFLAGS) +zfs_arc_la_LDFLAGS = -module -avoid-version +zfs_arc_la_LIBADD = -lkstat +collectd_LDADD += "-dlopen" zfs_arc.la +collectd_DEPENDENCIES += zfs_arc.la +endif + dist_man_MANS = collectd.1 \ collectd.conf.5 \