From: Florian Forster Date: Sat, 1 Sep 2007 19:00:46 +0000 (+0200) Subject: Merge branch 'collectd-4.0' X-Git-Tag: collectd-4.1.0~5 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6d43c759c9495118ef3c088fd2d06fd09c4fda8f;hp=39ab70bc40bb5e68c970b694c52c832ddfd5303a;p=collectd.git Merge branch 'collectd-4.0' --- diff --git a/.gitignore b/.gitignore index 5029e964..855e36b3 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ config.status libtool src/.deps src/Makefile +src/collectd.conf src/config.h src/libconfig/Makefile src/liboping/Makefile @@ -43,16 +44,22 @@ src/*.la src/*.lo src/*.o src/collectd -src/collectd.1 -src/collectd.conf.5 +src/collectd*.1 +src/collectd*.5 src/config.h.in~ -src/libconfig/.libs -src/libconfig/*.la -src/libconfig/*.lo +src/liboconfig/.libs +src/liboconfig/*.la +src/liboconfig/*.lo src/liboping/.libs src/liboping/*.la src/liboping/*.lo +# lex / yacc stuff: +ylwrap +src/liboconfig/parser.c +src/liboconfig/parser.h +src/liboconfig/scanner.c + # make dist stuff: collectd-*.tar.gz collectd-*.tar.bz2 diff --git a/ChangeLog b/ChangeLog index 1c6d8c8d..0fdb8c7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2007-07-21, Version 4.1.0 + * Build system: The build system has been changed to automatically + disable all plugins, which are missing dependencies. The dependency + checking has been removed from the plugins themselves to remove + redundancy. + * Flexible interval: The interval of collected data is not sent along + with the data itself over the network, so that the interval-settings + of server and clients no longer needs to match. + * netlink plugin: The new `netlink' plugin connects to the Linux + kernel using a netlink socket and uses it to query information about + interfaces, qdiscs and classes. + * snmp plugin: The new `snmp' plugin can read values from SNMP enabled + network devices, such as switches, routers, thermometers, rack + monitoring servers, etc. The collectd-snmp(5) manpage documents this + plugin. + * unixsock plugin: Added the `LISTVAL' command. + * xmms plugin: The new `xmms' plugin graphs the bitrate and frequency + of music played with xmms. + 2007-08-26, Version 4.0.7 * documentation: Some typos have been fixed and some information has been improved. diff --git a/README b/README index 6f59a7a0..d9e076c1 100644 --- a/README +++ b/README @@ -91,6 +91,11 @@ Features MySQL server statistics: Commands issued, handlers triggered, thread usage, query cache utilization and traffic/octets sent and received. + - netlink + Very detailed Linux network interface and routing statistics. You can get + (detailed) information on interfaces, qdiscs, classes, and, if you can + make use of it, filters. + - network Receive values that were collected by other hosts. Large setups will want to collect the data on one dedicated machine, and this is the diff --git a/configure.in b/configure.in index 14fcaa7f..567d5426 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(collectd, 4.0.7) +AC_INIT(collectd, m4_esyscmd(./version-gen.sh)) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AM_INIT_AUTOMAKE(dist-bzip2) @@ -30,29 +30,32 @@ AC_PROG_LEX AC_PROG_YACC AC_CONFIG_SUBDIRS(libltdl) +AC_MSG_CHECKING([for kernel type ($host_os)]) +case $host_os in + *linux*) + AC_DEFINE([KERNEL_LINUX], 1, [True if program is to be compiled for a Linux kernel]) + ac_system="Linux" + ;; + *solaris*) + AC_DEFINE([KERNEL_SOLARIS], 1, [True if program is to be compiled for a Solaris kernel]) + ac_system="Solaris" + ;; + *darwin*) + ac_system="Darwin" + ;; + *) + ac_system="unknown" +esac +AC_MSG_RESULT([$ac_system]) + # # Checks for header files. # AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT -AC_CHECK_HEADERS(stdint.h) -AC_CHECK_HEADERS(stdio.h) -AC_CHECK_HEADERS(errno.h) -AC_CHECK_HEADERS(math.h) -AC_CHECK_HEADERS(syslog.h) -AC_CHECK_HEADERS(fcntl.h) -AC_CHECK_HEADERS(signal.h) -AC_CHECK_HEADERS(assert.h) -AC_CHECK_HEADERS(sys/types.h) -AC_CHECK_HEADERS(sys/socket.h) -AC_CHECK_HEADERS(sys/select.h) -AC_CHECK_HEADERS(poll.h) -AC_CHECK_HEADERS(netdb.h) -AC_CHECK_HEADERS(arpa/inet.h) -AC_CHECK_HEADERS(sys/resource.h) -AC_CHECK_HEADERS(sys/param.h) -AC_CHECK_HEADERS(kstat.h) + +AC_CHECK_HEADERS(stdint.h stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h) # For ping library AC_CHECK_HEADERS(netinet/in_systm.h, [], [], @@ -189,6 +192,12 @@ AC_CHECK_HEADERS(netinet/udp.h, [], [], ]) # For cpu modules +AC_CHECK_HEADERS(sys/dkstat.h) +if test "x$ac_system" = "xDarwin" +then + AC_CHECK_HEADERS(mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h) + AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h) +fi AC_CHECK_HEADERS(sys/sysctl.h, [], [], [ #if HAVE_SYS_TYPES_H @@ -198,33 +207,9 @@ AC_CHECK_HEADERS(sys/sysctl.h, [], [], # include #endif ]) -AC_CHECK_HEADERS(sys/dkstat.h) -AC_CHECK_HEADERS(mach/mach_init.h) -AC_CHECK_HEADERS(mach/host_priv.h) -AC_CHECK_HEADERS(mach/mach_error.h) -AC_CHECK_HEADERS(mach/mach_host.h) -AC_CHECK_HEADERS(mach/mach_port.h) -AC_CHECK_HEADERS(mach/mach_types.h) -AC_CHECK_HEADERS(mach/message.h) -AC_CHECK_HEADERS(mach/processor_set.h) -AC_CHECK_HEADERS(mach/processor.h) -AC_CHECK_HEADERS(mach/processor_info.h) -AC_CHECK_HEADERS(mach/task.h) -AC_CHECK_HEADERS(mach/thread_act.h) -AC_CHECK_HEADERS(mach/vm_region.h) -AC_CHECK_HEADERS(mach/vm_map.h) -AC_CHECK_HEADERS(mach/vm_prot.h) -AC_CHECK_HEADERS(mach/vm_statistics.h) -AC_CHECK_HEADERS(mach/kern_return.h) # For hddtemp module -AC_CHECK_HEADERS(linux/major.h) -AC_CHECK_HEADERS(libgen.h) - -# For the apple_sensors module -AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h) -AC_CHECK_HEADERS(IOKit/IOKitLib.h) -AC_CHECK_HEADERS(IOKit/IOTypes.h) +AC_CHECK_HEADERS(linux/major.h libgen.h) # For the battery plugin AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [], @@ -236,17 +221,6 @@ AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [], # include #endif ]) -AC_CHECK_HEADERS(IOKit/ps/IOPSKeys.h) - -# For the `disk' plugin -AC_CHECK_HEADERS(IOKit/IOBSD.h) -AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDriver.h) - -# For load module -AC_CHECK_HEADERS(sys/loadavg.h) - -# For the processes plugin -AC_CHECK_HEADERS(linux/config.h) # For the swap module AC_CHECK_HEADERS(sys/swap.h, [], [], @@ -259,9 +233,10 @@ AC_CHECK_HEADERS(sys/swap.h, [], [], #endif ]) +# For load module +# For the processes plugin # For users module -AC_CHECK_HEADERS(utmp.h) -AC_CHECK_HEADERS(utmpx.h) +AC_CHECK_HEADERS(sys/loadavg.h linux/config.h utmp.h utmpx.h) # For interface plugin AC_CHECK_HEADERS(ifaddrs.h) @@ -296,11 +271,7 @@ AC_CHECK_HEADERS(linux/netdevice.h, [], [], #endif ]) -# For apache plugin -AC_CHECK_HEADERS(curl/curl.h) - # For quota module -AC_CHECK_HEADERS(pwd.h) AC_CHECK_HEADERS(sys/ucred.h, [], [], [ #if HAVE_SYS_TYPES_H @@ -310,21 +281,8 @@ AC_CHECK_HEADERS(sys/ucred.h, [], [], # include #endif ]) -AC_CHECK_HEADERS(ctype.h) -AC_CHECK_HEADERS(limits.h) -AC_CHECK_HEADERS(sys/quota.h) -AC_CHECK_HEADERS(xfs/xqm.h) # For mount interface -AC_CHECK_HEADERS(fs_info.h) -AC_CHECK_HEADERS(fshelp.h) -AC_CHECK_HEADERS(paths.h) -AC_CHECK_HEADERS(mntent.h) -AC_CHECK_HEADERS(mnttab.h) -AC_CHECK_HEADERS(sys/fstyp.h) -AC_CHECK_HEADERS(sys/fs_types.h) -AC_CHECK_HEADERS(sys/mntent.h) -AC_CHECK_HEADERS(sys/mnttab.h) AC_CHECK_HEADERS(sys/mount.h, [], [], [ #if HAVE_SYS_TYPES_H @@ -334,13 +292,6 @@ AC_CHECK_HEADERS(sys/mount.h, [], [], # include #endif ]) -AC_CHECK_HEADERS(sys/statfs.h) -AC_CHECK_HEADERS(sys/statvfs.h) -AC_CHECK_HEADERS(sys/vfs.h) -AC_CHECK_HEADERS(sys/vfstab.h) - -# For the swap plugin, FreeBSD -AC_CHECK_HEADERS(kvm.h) # For the email plugin AC_CHECK_HEADERS(linux/un.h, [], [], @@ -349,14 +300,8 @@ AC_CHECK_HEADERS(linux/un.h, [], [], # include #endif ]) -AC_CHECK_HEADERS(sys/un.h) -AC_CHECK_HEADERS(grp.h) -# For debugging interface (variable number of arguments) -AC_CHECK_HEADERS(stdarg.h) - -# Regular expressions for the ignorelist. -AC_CHECK_HEADERS(regex.h) +AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h) # For the dns plugin AC_CHECK_HEADERS(arpa/nameser.h) @@ -397,8 +342,8 @@ AC_CHECK_HEADERS(netinet/if_ether.h, [], [], ]) # For the multimeter plugin -AC_CHECK_HEADERS(termios.h) -AC_CHECK_HEADERS(sys/ioctl.h) +have_termios_h="no" +AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"]) # # Checking for libraries @@ -418,11 +363,7 @@ AC_HEADER_TIME # Checks for library functions. # AC_PROG_GCC_TRADITIONAL -AC_CHECK_FUNCS(gettimeofday select strdup strtol) -AC_CHECK_FUNCS(getaddrinfo getnameinfo) -AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen) -AC_CHECK_FUNCS(strncasecmp strcasecmp) -AC_CHECK_FUNCS(openlog syslog closelog) +AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog) AC_CHECK_FUNCS(getpwnam_r) AC_CHECK_FUNCS(getgrnam_r) @@ -435,27 +376,22 @@ nanosleep_needs_rt="no" AC_CHECK_FUNCS(nanosleep, [], AC_CHECK_LIB(rt, nanosleep, [nanosleep_needs_rt="yes"], AC_MSG_ERROR(cannot find nanosleep))) AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes") -# Regular expressions for the ignorelist. AC_CHECK_FUNCS(regcomp regerror regexec regfree) -# For cpu module AC_CHECK_FUNCS(sysctlbyname, [have_sysctlbyname="yes"], [have_sysctlbyname="no"]) - -# For df module -AC_CHECK_FUNCS(statfs statvfs) +AC_CHECK_FUNCS(host_statistics, [have_host_statistics="yes"], [have_host_statistics="no"]) +AC_CHECK_FUNCS(processor_info, [have_processor_info="yes"], [have_processor_info="no"]) +AC_CHECK_FUNCS(thread_info, [have_thread_info="yes"], [have_thread_info="no"]) +AC_CHECK_FUNCS(statfs, [have_statfs="yes"], [have_statfs="no"]) +AC_CHECK_FUNCS(statvfs, [have_statvfs="yes"], [have_statvfs="no"]) +AC_CHECK_FUNCS(getifaddrs, [have_getifaddrs="yes"], [have_getifaddrs="no"]) +AC_CHECK_FUNCS(syslog, [have_syslog="yes"], [have_syslog="no"]) +AC_CHECK_FUNCS(getutent, [have_getutent="yes"], [have_getutent="no"]) +AC_CHECK_FUNCS(getutxent, [have_getutxent="yes"], [have_getutxent="no"]) # For load module AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"]) -# For the `processes' plugin -AC_CHECK_FUNCS(thread_info) - -# For users module -AC_CHECK_FUNCS(getutent getutxent) - -# For interface module -AC_CHECK_FUNCS(getifaddrs) - # Check for NAN AC_ARG_WITH(nan-emulation, [AS_HELP_STRING([--with-nan-emulation], [use emulated NAN. For crosscompiling only.])], [ @@ -719,21 +655,6 @@ AC_CHECK_MEMBERS([kstat_io_t.nwritten, kstat_io_t.writes, kstat_io_t.nwrites, ks #endif ]) -AC_MSG_CHECKING([for kernel type ($host_os)]) -case $host_os in - *linux*) - AC_DEFINE([KERNEL_LINUX], 1, [True if program is to be compiled for a Linux kernel]) - ac_system="Linux" - ;; - *solaris*) - AC_DEFINE([KERNEL_SOLARIS], 1, [True if program is to be compiled for a Solaris kernel]) - ac_system="Solaris" - ;; - *) - ac_system="unknown" -esac -AC_MSG_RESULT([$ac_system]) - with_libresolv="yes" AC_CHECK_LIB(resolv, res_search, [ @@ -808,7 +729,7 @@ AC_DEFINE_UNQUOTED(HAVE_LIBPTHREAD, [$collect_pthread], [Wether or not to use pthread (POSIX threads) library]) AM_CONDITIONAL(BUILD_WITH_LIBPTHREAD, test "x$with_libpthread" = "xyes") -if test "$ac_system" = "Solaris" +if test "x$ac_system" = "xSolaris" then with_kstat="yes" with_devinfo="yes" @@ -983,7 +904,7 @@ AC_ARG_WITH(lm-sensors, [AS_HELP_STRING([--with-lm-sensors@<:@=PREFIX@:>@], [Pat then with_lm_sensors="yes" else - with_lm_sensors="no" + with_lm_sensors="no (Linux only library)" fi ]) if test "x$with_lm_sensors" = "xyes" @@ -1177,10 +1098,6 @@ then fi AM_CONDITIONAL(BUILD_WITH_LIBOPING, test "x$with_liboping" = "xyes") AM_CONDITIONAL(BUILD_WITH_OWN_LIBOPING, test "x$with_own_liboping" = "xyes") -if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes" -then - with_liboping="yes (shipped version)" -fi AC_ARG_WITH(libpcap, [AS_HELP_STRING([--with-libpcap@<:@=PREFIX@:>@], [Path to libpcap.])], [ @@ -1314,14 +1231,46 @@ else fi AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes") -# TODO: Use `libupsclient-config' here. -AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to libupsclient.])], +AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])], [ if test "x$withval" != "xno" && test "x$withval" != "xyes" then LDFLAGS="$LDFLAGS -L$withval/lib" CPPFLAGS="$CPPFLAGS -I$withval/include" + with_libnetsnmp="yes" + fi +], +[with_libnetsnmp="yes"]) +if test "x$with_libnetsnmp" = "xyes" +then + AC_CHECK_LIB(netsnmp, init_snmp, + [ + AC_DEFINE(HAVE_LIBSNMP, 1, [Define to 1 if you have the Net-SNMP library (-lnetsnmp).]) + ], [with_libnetsnmp="no (libnetsnmp not found)"]) +fi +if test "x$with_libnetsnmp" = "xyes" +then + AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, + [ + AC_DEFINE(HAVE_NET_SNMP_NET_SNMP_CONFIG_H, 1, [Define to 1 if you have the header file.]) + ], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"]) +fi +AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes") + +with_upsclient_config="libupsclient-config" +with_upsclient_cflags="" +with_upsclient_libs="" +AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to libupsclient.])], +[ + if test "x$withval" = "xno" + then + with_libupsclient="no" + else with_libupsclient="yes" + if "x$withval" != "xyes" + then + with_upsclient_config="$withval/bin/libupsclient-config" + fi fi ], [ @@ -1329,17 +1278,46 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], ]) if test "x$with_libupsclient" = "xyes" then + with_upsclient_cflags=`$with_upsclient_config --cflags 2>/dev/null` + upsclient_config_status=$? + + if test $upsclient_config_status -ne 0 + then + with_libupsclient="no" + fi +fi +if test "x$with_libupsclient" = "xyes" +then + with_upsclient_libs=`$with_upsclient_config --libs 2>/dev/null` + upsclient_config_status=$? + + if test $upsclient_config_status -ne 0 + then + with_libupsclient="no" + fi +fi +if test "x$with_libupsclient" = "xyes" +then + CFLAGS_ORIG=$CFLAGS + CFLAGS="$CFLAGS $with_upsclient_cflags" + LDFLAGS_ORIG=$LDFLAGS + LDFLAGS="$LDFLAGS $with_upsclient_libs" AC_CHECK_LIB(upsclient, upscli_connect, [ - AC_DEFINE(HAVE_LIBUPSCLIENT, 1, [Define to 1 if you have the upsclient library (-lupsclient).]) - ], [with_libupsclient="no (libupsclient not found)"]) + BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_upsclient_cflags" + BUILD_WITH_LIBUPSCLIENT_LIBS="$with_upsclient_libs" + AC_SUBST(BUILD_WITH_LIBUPSCLIENT_CFLAGS) + AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS) + ], + [ + with_libupsclient="no" + ]) + CFLAGS=$CFLAGS_ORIG + LDFLAGS=$LDFLAGS_ORIG fi if test "x$with_libupsclient" = "xyes" then - AC_CHECK_HEADERS(upsclient.h, - [ - AC_DEFINE(HAVE_UPSCLIENT_H, 1, [Define to 1 if you have the header file.]) - ], [with_libupsclient="no (upsclient.h not found)"]) + AC_DEFINE(HAVE_LIBUPSCLIENT, 1, [Define to 1 if you have the upsclient library (-lupsclient).]) fi if test "x$with_libupsclient" = "xyes" then @@ -1350,6 +1328,132 @@ then fi AM_CONDITIONAL(BUILD_WITH_LIBUPSCLIENT, test "x$with_libupsclient" = "xyes") +### BEGIN of check for libxmms ### +with_xmms_config="xmms-config" +with_xmms_cflags="" +with_xmms_libs="" +AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to libxmms.])], +[ + if test "x$withval" != "xno" -a "x$withval" != "xyes" + then + if test -x "$withval/bin/xmms-config" + then + with_xmms_config="$withval/bin/xmms-config" + fi + fi + if test "x$withval" = "xno" + then + with_libxmms="no" + else + with_libxmms="yes" + fi +], +[ + with_libxmms="yes" +]) +if test "x$with_libxmms" = "xyes" +then + with_xmms_cflags=`$with_xmms_config --cflags 2>/dev/null` + xmms_config_status=$? + + if test $xmms_config_status -ne 0 + then + with_libxmms="no" + fi +fi +if test "x$with_libxmms" = "xyes" +then + with_xmms_libs=`$with_xmms_config --libs 2>/dev/null` + xmms_config_status=$? + + if test $xmms_config_status -ne 0 + then + with_libxmms="no" + fi +fi +if test "x$with_libxmms" = "xyes" +then + AC_CHECK_LIB(xmms, xmms_remote_get_info, + [ + BUILD_WITH_LIBXMMS_CFLAGS="$with_xmms_cflags" + BUILD_WITH_LIBXMMS_LIBS="$with_xmms_libs" + AC_SUBST(BUILD_WITH_LIBXMMS_CFLAGS) + AC_SUBST(BUILD_WITH_LIBXMMS_LIBS) + ], + [ + with_libxmms="no" + ], + [$with_xmms_libs]) +fi +with_libxmms_numeric=0 +if test "x$with_libxmms" = "xyes" +then + with_libxmms_numeric=1 +fi +AC_DEFINE_UNQUOTED(HAVE_LIBXMMS, [$with_libxmms_numeric], [Define to 1 if you have the 'xmms' library (-lxmms).]) +AM_CONDITIONAL(BUILD_WITH_LIBXMMS, test "x$with_libxmms" = "xyes") +### END of check for libxmms ### + +with_libnetlink_cflags="" +with_libnetlink_libs="-lnetlink" +AC_ARG_WITH(libnetlink, [AS_HELP_STRING([--with-libnetlink@<:@=PREFIX@:>@], [Path to libnetlink.])], +[ + echo "libnetlink: withval = $withval" + if test "x$withval" = "xyes" + then + with_libnetlink="yes" + else if test "x$withval" = "xno" + then + with_libnetlink="no" + else + if test -d "$withval/include" + then + with_libnetlink_cflags="-I$withval/include" + with_libnetlink_libs="-L$withval/lib -lnetlink" + with_libnetlink="yes" + else + AC_MSG_ERROR("no such directory: $withval/include") + fi + fi; fi +], +[ + if test "x$ac_system" = "xLinux" + then + with_libnetlink="yes" + else + with_libnetlink="no (Linux only library)" + fi +]) +if test "x$with_libnetlink" = "xyes" +then + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $with_libnetlink_cflags" + + AC_CHECK_HEADERS(iproute/libnetlink.h, [], [with_libnetlink="no (iproute/libnetlink.h not found)"], +[#include +#include +#include +#include +#include ]) + + CFLAGS="$SAVE_CFLAGS" +fi +if test "x$with_libnetlink" = "xyes" +then + AC_CHECK_LIB(netlink, rtnl_open, + [with_libnetlink="yes"], + [with_libnetlink="no (symbol 'rtnl_open' not found)"], + [$with_libnetlink_libs]) +fi +if test "x$with_libnetlink" = "xyes" +then + BUILD_WITH_LIBNETLINK_CFLAGS="$with_libnetlink_cflags" + BUILD_WITH_LIBNETLINK_LIBS="$with_libnetlink_libs" + AC_SUBST(BUILD_WITH_LIBNETLINK_CFLAGS) + AC_SUBST(BUILD_WITH_LIBNETLINK_LIBS) +fi +AM_CONDITIONAL(BUILD_WITH_LIBNETLINK, test "x$with_libnetlink" = "xyes") + # Check for enabled/disabled features # @@ -1413,56 +1517,228 @@ fi ]dnl )# AC_COLLECTD(name, enable/disable, info-text, feature/module) +# AC_PLUGIN(name, default, info) +# ------------------------------------------------------------ +dnl +AC_DEFUN( + [AC_PLUGIN], + [ + enable_plugin="no" + AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1], [$3]), + [ + if test "x$enableval" = "xyes" + then + enable_plugin="yes" + else + enable_plugin="no" + fi + ], + [ + if test "x$2" = "xyes" + then + enable_plugin="yes" + else + enable_plugin="no" + fi + ]) + if test "x$enable_plugin" = "xyes" + then + AC_DEFINE([HAVE_PLUGIN_]my_toupper([$1]), 1, [Define to 1 if the $1 plugin is enabled.]) + fi + AM_CONDITIONAL([BUILD_PLUGIN_]my_toupper([$1]), test "x$enable_plugin" = "xyes") + enable_$1="$enable_plugin" + ] +)# AC_PLUGIN(name, default, info) + m4_divert_once([HELP_ENABLE], [ collectd features:]) +# FIXME: Remove these calls to `AC_COLLECTD' and then remove that macro. AC_COLLECTD([debug], [enable], [feature], [debugging]) AC_COLLECTD([daemon], [disable], [feature], [daemon mode]) AC_COLLECTD([getifaddrs],[enable], [feature], [getifaddrs under Linux]) +plugin_battery="no" +plugin_cpu="no" +plugin_cpufreq="no" +plugin_df="no" +plugin_disk="no" +plugin_entropy="no" +plugin_interface="no" +plugin_irq="no" +plugin_load="no" +plugin_memory="no" +plugin_multimeter="no" +plugin_nfs="no" +plugin_processes="no" +plugin_serial="no" +plugin_swap="no" +plugin_tape="no" +plugin_users="no" +plugin_vserver="no" +plugin_wireless="no" + +# Linux +if test "x$ac_system" = "xLinux" +then + plugin_battery="yes" + plugin_cpu="yes" + plugin_cpufreq="yes" + plugin_disk="yes" + plugin_entropy="yes" + plugin_interface="yes" + plugin_irq="yes" + plugin_load="yes" + plugin_memory="yes" + plugin_nfs="yes" + plugin_processes="yes" + plugin_serial="yes" + plugin_swap="yes" + plugin_vserver="yes" + plugin_wireless="yes" +fi + +# Mac OS X devices +if test "x$with_libiokit" = "xyes" +then + plugin_battery="yes" + plugin_disk="yes" +fi + +# Solaris +if test "x$with_devinfo$with_kstat" = "xyesyes" +then + plugin_cpu="yes" + plugin_disk="yes" + plugin_interface="yes" + plugin_memory="yes" + plugin_swap="yes" + plugin_tape="yes" +fi + +# libstatgrab +if test "x$with_libstatgrab" = "xyes" +then + plugin_interface="yes" + plugin_load="yes" + plugin_memory="yes" + plugin_swap="yes" +fi + +if test "x$have_processor_info" = "xyes" +then + plugin_cpu="yes" +fi +if test "x$have_sysctlbyname" = "xyes" +then + plugin_cpu="yes" + plugin_memory="yes" +fi + +if test "x$have_statfs" = "xyes" +then + plugin_df="yes" +fi +if test "x$have_statvfs" = "xyes" +then + plugin_df="yes" +fi + +if test "x$have_getifaddrs" = "xyes" +then + plugin_interface="yes" +fi + +if test "x$have_getloadavg" = "xyes" +then + plugin_load="yes" +fi + +# Mac OS X memory interface +if test "x$have_host_statistics" = "xyes" +then + plugin_memory="yes" +fi + +if test "x$have_termios_h" = "xyes" +then + plugin_multimeter="yes" +fi + +if test "x$have_thread_info" = "xyes" +then + plugin_processes="yes" +fi + +if test "x$with_libkvm" = "xyes" +then + plugin_swap="yes" +fi + +if test "x$have_getutent" = "xyes" +then + plugin_users="yes" +fi +if test "x$have_getutxent" = "xyes" +then + plugin_users="yes" +fi + +# FIXME: sysctl for swap plugin + m4_divert_once([HELP_ENABLE], [ -collectd modules:]) -AC_COLLECTD([apache], [disable], [module], [Apache httpd statistics]) -AC_COLLECTD([apcups], [disable], [module], [Statistics of UPSes by APC]) -AC_COLLECTD([apple_sensors], [disable], [module], [Apple's hardware sensors]) -AC_COLLECTD([battery], [disable], [module], [battery statistics]) -AC_COLLECTD([cpu], [disable], [module], [cpu usage statistics]) -AC_COLLECTD([cpufreq], [disable], [module], [system cpu frequency statistics]) -AC_COLLECTD([disk], [disable], [module], [disk/partition statistics]) -AC_COLLECTD([csv], [disable], [module], [csv output plugin]) -AC_COLLECTD([df], [disable], [module], [df statistics]) -AC_COLLECTD([dns], [disable], [module], [dns statistics]) -AC_COLLECTD([email], [disable], [module], [email statistics]) -AC_COLLECTD([entropy], [disable], [module], [entropy statistics]) -AC_COLLECTD([exec], [disable], [module], [exec of external programs]) -AC_COLLECTD([hddtemp], [disable], [module], [hdd temperature statistics]) -AC_COLLECTD([interface], [disable], [module], [interface statistics]) -AC_COLLECTD([iptables], [disable], [module], [IPtables statistics]) -AC_COLLECTD([irq], [disable], [module], [irq statistics]) -AC_COLLECTD([load], [disable], [module], [system load statistics]) -AC_COLLECTD([mbmon], [disable], [module], [motherboard monitor statistics]) -AC_COLLECTD([memory], [disable], [module], [memory statistics]) -AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics]) -AC_COLLECTD([mysql], [disable], [module], [mysql statistics]) -AC_COLLECTD([network], [disable], [module], [network functionality]) -AC_COLLECTD([nfs], [disable], [module], [nfs statistics]) -AC_COLLECTD([ntpd], [disable], [module], [ntpd statistics]) -AC_COLLECTD([nut], [disable], [module], [network UPS tools statistics]) -AC_COLLECTD([perl], [disable], [module], [embedded perl interpreter]) -AC_COLLECTD([ping], [disable], [module], [ping statistics]) -AC_COLLECTD([processes], [disable], [module], [processes statistics]) -AC_COLLECTD([sensors], [disable], [module], [lm_sensors statistics]) -AC_COLLECTD([serial], [disable], [module], [serial statistics]) -AC_COLLECTD([logfile], [disable], [module], [logfile log facility]) -AC_COLLECTD([swap], [disable], [module], [swap statistics]) -AC_COLLECTD([syslog], [disable], [module], [syslog log facility]) -AC_COLLECTD([tape], [disable], [module], [tape statistics]) -AC_COLLECTD([unixsock], [disable], [module], [UNIX socket plugin]) -AC_COLLECTD([users], [disable], [module], [user count statistics]) -AC_COLLECTD([vserver], [disable], [module], [vserver statistics]) -AC_COLLECTD([wireless], [disable], [module], [wireless link statistics]) +collectd plugins:]) + +AC_PLUGIN([apache], [$with_libcurl], [Apache httpd statistics]) +AC_PLUGIN([apcups], [yes], [Statistics of UPSes by APC]) +AC_PLUGIN([apple_sensors], [$with_libiokit], [Apple's hardware sensors]) +AC_PLUGIN([battery], [$plugin_battery], [Battery statistics]) +AC_PLUGIN([cpu], [$plugin_cpu], [CPU usage statistics]) +AC_PLUGIN([cpufreq], [$plugin_cpufreq], [CPU frequency statistics]) +AC_PLUGIN([csv], [yes], [CSV output plugin]) +AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) +AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) +AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) +AC_PLUGIN([email], [yes], [EMail statistics]) +AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics]) +AC_PLUGIN([exec], [yes], [Execution of external programs]) +AC_PLUGIN([hddtemp], [yes], [Query hddtempd]) +AC_PLUGIN([interface], [$plugin_interface], [Interface traffic statistics]) +AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) +AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics]) +AC_PLUGIN([load], [$plugin_load], [System load]) +AC_PLUGIN([logfile], [yes], [File logging plugin]) +AC_PLUGIN([mbmon], [yes], [Query mbmond]) +AC_PLUGIN([memory], [$plugin_memory], [Memory usage]) +AC_PLUGIN([multimeter], [$plugin_multimeter], [Read multimeter values]) +AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) +AC_PLUGIN([netlink], [$with_libnetlink], [Enhanced Linux network statistics]) +AC_PLUGIN([network], [yes], [Network communication plugin]) +AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) +AC_PLUGIN([ntpd], [yes], [NTPd statistics]) +AC_PLUGIN([nut], [$with_libupsclient], [Network UPS tools statistics]) +AC_PLUGIN([perl], [$with_libperl], [Embed a Perl interpreter]) +AC_PLUGIN([ping], [$with_liboping], [Network latency statistics]) +AC_PLUGIN([processes], [$plugin_processes], [Process statistics]) +AC_PLUGIN([rrdtool], [$with_rrdtool], [RRDTool output plugin]) +AC_PLUGIN([sensors], [$with_lm_sensors], [lm_sensors statistics]) +AC_PLUGIN([serial], [$plugin_serial], [serial port traffic]) +AC_PLUGIN([snmp], [$with_libnetsnmp], [SNMP querying plugin]) +AC_PLUGIN([swap], [$plugin_swap], [Swap usage statistics]) +AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin]) +AC_PLUGIN([tape], [$plugin_tape], [Tape drive statistics]) +AC_PLUGIN([unixsock], [yes], [Unixsock communication plugin]) +AC_PLUGIN([users], [$plugin_users], [User statistics]) +AC_PLUGIN([vserver], [$plugin_vserver], [Linux VServer statistics]) +AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics]) +AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile) +if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes" +then + with_liboping="yes (shipped version)" +fi + if test "x$with_libperl" = "xyes" then with_libperl="yes (version `perl -MConfig -e 'print $Config{version};'`)" @@ -1478,7 +1754,10 @@ Configuration: libiokit . . . . . $with_libiokit libiptc . . . . . . $with_libiptc libkstat . . . . . $with_kstat + libkvm . . . . . . $with_libkvm libmysql . . . . . $with_libmysql + libnetlink . . . . $with_libnetlink + libnetsnmp . . . . $with_libnetsnmp liboconfig . . . . $with_liboconfig liboping . . . . . $with_liboping libpcap . . . . . . $with_libpcap @@ -1488,6 +1767,7 @@ Configuration: libsensors . . . . $with_lm_sensors libstatgrab . . . . $with_libstatgrab libupsclient . . . $with_libupsclient + libxmms . . . . . . $with_libxmms Features: daemon mode . . . . $enable_daemon @@ -1517,6 +1797,7 @@ Configuration: memory . . . . . . $enable_memory multimeter . . . . $enable_multimeter mysql . . . . . . . $enable_mysql + netlink . . . . . . $enable_netlink network . . . . . . $enable_network nfs . . . . . . . . $enable_nfs ntpd . . . . . . . $enable_ntpd @@ -1526,6 +1807,7 @@ Configuration: processes . . . . . $enable_processes sensors . . . . . . $enable_sensors serial . . . . . . $enable_serial + snmp . . . . . . . $enable_snmp swap . . . . . . . $enable_swap syslog . . . . . . $enable_syslog tape . . . . . . . $enable_tape @@ -1533,5 +1815,6 @@ Configuration: users . . . . . . . $enable_users vserver . . . . . . $enable_vserver wireless . . . . . $enable_wireless + xmms . . . . . . . $enable_xmms EOF diff --git a/contrib/PerlLib/Collectd/Unixsock.pm b/contrib/PerlLib/Collectd/Unixsock.pm index 92e8772c..3b8a91cf 100644 --- a/contrib/PerlLib/Collectd/Unixsock.pm +++ b/contrib/PerlLib/Collectd/Unixsock.pm @@ -83,6 +83,33 @@ sub _create_identifier return ("$host/$plugin/$type"); } # _create_identifier +sub _parse_identifier +{ + my $string = shift; + my $host; + my $plugin; + my $plugin_instance; + my $type; + my $type_instance; + my $ident; + + ($host, $plugin, $type) = split ('/', $string); + + ($plugin, $plugin_instance) = split ('-', $plugin, 2); + ($type, $type_instance) = split ('-', $type, 2); + + $ident = + { + host => $host, + plugin => $plugin, + type => $type + }; + $ident->{'plugin_instance'} = $plugin_instance if (defined ($plugin_instance)); + $ident->{'type_instance'} = $type_instance if (defined ($type_instance)); + + return ($ident); +} # _parse_identifier + =head1 PUBLIC METHODS =over 4 @@ -217,6 +244,52 @@ sub putval return; } # putval +=item I<$res> = I<$obj>-EB () + +Queries a list of values from the daemon. The list is returned as an array of +hash references, where each hash reference is a valid identifier. The C