From: Pierre-Yves Ritschard Date: Mon, 18 Apr 2016 08:10:47 +0000 (+0200) Subject: Merge branch 'master' into f/riemann/rcc X-Git-Tag: collectd-5.6.0~339^2 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=810e8f5d687514841ed0ea445764ccc05e8f5299;hp=--cc;p=collectd.git Merge branch 'master' into f/riemann/rcc --- 810e8f5d687514841ed0ea445764ccc05e8f5299 diff --cc configure.ac index 9cc9b552,0eebfee1..de24293c --- a/configure.ac +++ b/configure.ac @@@ -5759,144 -5755,144 +5759,144 @@@ AC_ARG_ENABLE([all-plugins] m4_divert_once([HELP_ENABLE], []) - AC_PLUGIN([aggregation], [yes], [Aggregation plugin]) - AC_PLUGIN([amqp], [$with_librabbitmq], [AMQP output plugin]) - 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([aquaero], [$with_libaquaero5], [Aquaero's hardware sensors]) - AC_PLUGIN([ascent], [$plugin_ascent], [AscentEmu player statistics]) - AC_PLUGIN([barometer], [$plugin_barometer], [Barometer sensor on I2C]) - AC_PLUGIN([battery], [$plugin_battery], [Battery statistics]) - AC_PLUGIN([bind], [$plugin_bind], [ISC Bind nameserver statistics]) - AC_PLUGIN([ceph], [$plugin_ceph], [Ceph daemon statistics]) - AC_PLUGIN([conntrack], [$plugin_conntrack], [nf_conntrack statistics]) - AC_PLUGIN([contextswitch], [$plugin_contextswitch], [context switch statistics]) - AC_PLUGIN([cpufreq], [$plugin_cpufreq], [CPU frequency statistics]) - 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([curl_xml], [$plugin_curl_xml], [CURL generic xml statistics]) - AC_PLUGIN([cgroups], [$plugin_cgroups], [CGroups CPU usage accounting]) - AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) - AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) - AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) - AC_PLUGIN([drbd], [$plugin_drbd], [DRBD statistics]) - AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) - AC_PLUGIN([email], [yes], [EMail statistics]) - AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics]) - AC_PLUGIN([ethstat], [$plugin_ethstat], [Stats from NIC driver]) - AC_PLUGIN([exec], [yes], [Execution of external programs]) - AC_PLUGIN([fhcount], [$plugin_fhcount], [File handles statistics]) - AC_PLUGIN([filecount], [yes], [Count files in directories]) - AC_PLUGIN([fscache], [$plugin_fscache], [fscache statistics]) - AC_PLUGIN([gmond], [$with_libganglia], [Ganglia plugin]) - AC_PLUGIN([hddtemp], [yes], [Query hddtempd]) - AC_PLUGIN([interface], [$plugin_interface], [Interface traffic statistics]) - AC_PLUGIN([ipc], [$plugin_ipc], [IPC statistics]) - AC_PLUGIN([ipmi], [$plugin_ipmi], [IPMI sensor statistics]) - AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) - AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics]) - AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics]) - AC_PLUGIN([java], [$with_java], [Embed the Java Virtual Machine]) - AC_PLUGIN([load], [$plugin_load], [System load]) - AC_PLUGIN([logfile], [yes], [File logging plugin]) - AC_PLUGIN([log_logstash], [$plugin_log_logstash], [Logstash json_event compatible logging]) - AC_PLUGIN([lpar], [$with_perfstat], [AIX logical partitions statistics]) - AC_PLUGIN([lvm], [$with_liblvm2app], [LVM statistics]) - AC_PLUGIN([madwifi], [$have_linux_wireless_h], [Madwifi wireless statistics]) - AC_PLUGIN([match_empty_counter], [yes], [The empty counter match]) - AC_PLUGIN([match_hashed], [yes], [The hashed 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]) - AC_PLUGIN([mbmon], [yes], [Query mbmond]) - AC_PLUGIN([md], [$have_linux_raid_md_u_h], [md (Linux software RAID) devices]) - AC_PLUGIN([memcachec], [$with_libmemcached], [memcachec statistics]) - AC_PLUGIN([memcached], [yes], [memcached statistics]) - AC_PLUGIN([memory], [$plugin_memory], [Memory usage]) - AC_PLUGIN([mic], [$with_mic], [Intel Many Integrated Core stats]) - AC_PLUGIN([modbus], [$with_libmodbus], [Modbus plugin]) - AC_PLUGIN([mqtt], [$with_libmosquitto], [MQTT output plugin]) - AC_PLUGIN([multimeter], [$plugin_multimeter], [Read multimeter values]) - AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) - AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin]) - AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics]) - AC_PLUGIN([network], [yes], [Network communication plugin]) - AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) - AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics]) - AC_PLUGIN([notify_desktop], [$with_libnotify], [Desktop notifications]) - AC_PLUGIN([notify_email], [$with_libesmtp], [Email notifier]) - AC_PLUGIN([notify_nagios], [yes], [Nagios notification plugin]) - AC_PLUGIN([ntpd], [yes], [NTPd statistics]) - AC_PLUGIN([numa], [$plugin_numa], [NUMA virtual memory 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([openldap], [$with_libldap], [OpenLDAP statistics]) - AC_PLUGIN([openvpn], [yes], [OpenVPN client statistics]) - AC_PLUGIN([oracle], [$with_oracle], [Oracle plugin]) - AC_PLUGIN([perl], [$plugin_perl], [Embed a Perl interpreter]) - AC_PLUGIN([pf], [$have_net_pfvar_h], [BSD packet filter (PF) statistics]) + AC_PLUGIN([aggregation], [yes], [Aggregation plugin]) + AC_PLUGIN([amqp], [$with_librabbitmq], [AMQP output plugin]) + AC_PLUGIN([apache], [$with_libcurl], [Apache httpd statistics]) + AC_PLUGIN([apcups], [yes], [Statistics of UPSes by APC]) + AC_PLUGIN([apple_sensors], [$with_libiokit], [Apple hardware sensors]) + AC_PLUGIN([aquaero], [$with_libaquaero5], [Aquaero hardware sensors]) + AC_PLUGIN([ascent], [$plugin_ascent], [AscentEmu player statistics]) + AC_PLUGIN([barometer], [$plugin_barometer], [Barometer sensor on I2C]) + AC_PLUGIN([battery], [$plugin_battery], [Battery statistics]) + AC_PLUGIN([bind], [$plugin_bind], [ISC Bind nameserver statistics]) + AC_PLUGIN([ceph], [$plugin_ceph], [Ceph daemon statistics]) + AC_PLUGIN([cgroups], [$plugin_cgroups], [CGroups CPU usage accounting]) + AC_PLUGIN([conntrack], [$plugin_conntrack], [nf_conntrack statistics]) + AC_PLUGIN([contextswitch], [$plugin_contextswitch], [context switch 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([curl], [$with_libcurl], [CURL generic web statistics]) + AC_PLUGIN([curl_json], [$plugin_curl_json], [CouchDB statistics]) + AC_PLUGIN([curl_xml], [$plugin_curl_xml], [CURL generic xml 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]) + AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) + AC_PLUGIN([drbd], [$plugin_drbd], [DRBD statistics]) + AC_PLUGIN([email], [yes], [EMail statistics]) + AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics]) + AC_PLUGIN([ethstat], [$plugin_ethstat], [Stats from NIC driver]) + AC_PLUGIN([exec], [yes], [Execution of external programs]) + AC_PLUGIN([fhcount], [$plugin_fhcount], [File handles statistics]) + AC_PLUGIN([filecount], [yes], [Count files in directories]) + AC_PLUGIN([fscache], [$plugin_fscache], [fscache statistics]) + AC_PLUGIN([gmond], [$with_libganglia], [Ganglia plugin]) + AC_PLUGIN([hddtemp], [yes], [Query hddtempd]) + AC_PLUGIN([interface], [$plugin_interface], [Interface traffic statistics]) + AC_PLUGIN([ipc], [$plugin_ipc], [IPC statistics]) + AC_PLUGIN([ipmi], [$plugin_ipmi], [IPMI sensor statistics]) + AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) + AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics]) + AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics]) + AC_PLUGIN([java], [$with_java], [Embed the Java Virtual Machine]) + AC_PLUGIN([load], [$plugin_load], [System load]) + AC_PLUGIN([log_logstash], [$plugin_log_logstash], [Logstash json_event compatible logging]) + AC_PLUGIN([logfile], [yes], [File logging plugin]) + AC_PLUGIN([lpar], [$with_perfstat], [AIX logical partitions statistics]) + AC_PLUGIN([lvm], [$with_liblvm2app], [LVM statistics]) + AC_PLUGIN([madwifi], [$have_linux_wireless_h], [Madwifi wireless statistics]) + AC_PLUGIN([match_empty_counter], [yes], [The empty counter match]) + AC_PLUGIN([match_hashed], [yes], [The hashed 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]) + AC_PLUGIN([mbmon], [yes], [Query mbmond]) + AC_PLUGIN([md], [$have_linux_raid_md_u_h], [md (Linux software RAID) devices]) + AC_PLUGIN([memcachec], [$with_libmemcached], [memcachec statistics]) + AC_PLUGIN([memcached], [yes], [memcached statistics]) + AC_PLUGIN([memory], [$plugin_memory], [Memory usage]) + AC_PLUGIN([mic], [$with_mic], [Intel Many Integrated Core stats]) + AC_PLUGIN([modbus], [$with_libmodbus], [Modbus plugin]) + AC_PLUGIN([mqtt], [$with_libmosquitto], [MQTT output plugin]) + AC_PLUGIN([multimeter], [$plugin_multimeter], [Read multimeter values]) + AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) + AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin]) + AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics]) + AC_PLUGIN([network], [yes], [Network communication plugin]) + AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) + AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics]) + AC_PLUGIN([notify_desktop], [$with_libnotify], [Desktop notifications]) + AC_PLUGIN([notify_email], [$with_libesmtp], [Email notifier]) + AC_PLUGIN([notify_nagios], [yes], [Nagios notification plugin]) + AC_PLUGIN([ntpd], [yes], [NTPd statistics]) + AC_PLUGIN([numa], [$plugin_numa], [NUMA virtual memory 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([openldap], [$with_libldap], [OpenLDAP statistics]) + AC_PLUGIN([openvpn], [yes], [OpenVPN client statistics]) + AC_PLUGIN([oracle], [$with_oracle], [Oracle plugin]) + AC_PLUGIN([perl], [$plugin_perl], [Embed a Perl interpreter]) + AC_PLUGIN([pf], [$have_net_pfvar_h], [BSD packet filter (PF) statistics]) # FIXME: Check for libevent, too. - AC_PLUGIN([pinba], [$have_protoc_c], [Pinba statistics]) - AC_PLUGIN([ping], [$with_liboping], [Network latency statistics]) - AC_PLUGIN([postgresql], [$with_libpq], [PostgreSQL database statistics]) - AC_PLUGIN([powerdns], [yes], [PowerDNS statistics]) - AC_PLUGIN([processes], [$plugin_processes], [Process statistics]) - AC_PLUGIN([protocols], [$plugin_protocols], [Protocol (IP, TCP, ...) statistics]) - AC_PLUGIN([python], [$with_python], [Embed a Python interpreter]) - AC_PLUGIN([redis], [$with_libhiredis], [Redis plugin]) - AC_PLUGIN([routeros], [$with_librouteros], [RouterOS plugin]) - AC_PLUGIN([rrdcached], [$librrd_rrdc_update], [RRDTool output plugin]) - AC_PLUGIN([rrdtool], [$with_librrd], [RRDTool output plugin]) - AC_PLUGIN([sensors], [$with_libsensors], [lm_sensors statistics]) - AC_PLUGIN([serial], [$plugin_serial], [serial port traffic]) - AC_PLUGIN([sigrok], [$with_libsigrok], [sigrok acquisition sources]) - AC_PLUGIN([smart], [$with_libatasmart], [SMART statistics]) - AC_PLUGIN([snmp], [$with_libnetsnmp], [SNMP querying plugin]) - AC_PLUGIN([statsd], [yes], [StatsD plugin]) - AC_PLUGIN([swap], [$plugin_swap], [Swap usage statistics]) - AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin]) - AC_PLUGIN([table], [yes], [Parsing of tabular data]) - AC_PLUGIN([tail], [yes], [Parsing of logfiles]) - AC_PLUGIN([tail_csv], [yes], [Parsing of CSV files]) - AC_PLUGIN([tape], [$plugin_tape], [Tape drive statistics]) - AC_PLUGIN([target_notification], [yes], [The notification target]) - AC_PLUGIN([target_replace], [yes], [The replace target]) - AC_PLUGIN([target_scale],[yes], [The scale target]) - AC_PLUGIN([target_set], [yes], [The set target]) - AC_PLUGIN([target_v5upgrade], [yes], [The v5upgrade target]) - AC_PLUGIN([tcpconns], [$plugin_tcpconns], [TCP connection statistics]) - 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([threshold], [yes], [Threshold checking plugin]) - AC_PLUGIN([tokyotyrant], [$with_libtokyotyrant], [TokyoTyrant database statistics]) - AC_PLUGIN([turbostat], [$plugin_turbostat], [Advanced statistic on Intel cpu states]) - AC_PLUGIN([unixsock], [yes], [Unixsock communication plugin]) - AC_PLUGIN([uptime], [$plugin_uptime], [Uptime statistics]) - AC_PLUGIN([users], [$plugin_users], [User statistics]) - AC_PLUGIN([uuid], [yes], [UUID as hostname plugin]) - AC_PLUGIN([varnish], [$with_libvarnish], [Varnish cache statistics]) - AC_PLUGIN([virt], [$plugin_virt], [Virtual machine statistics]) - 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_graphite], [yes], [Graphite / Carbon output plugin]) - AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin]) - AC_PLUGIN([write_kafka], [$with_librdkafka], [Kafka output plugin]) - AC_PLUGIN([write_log], [yes], [Log output plugin]) - AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin]) - AC_PLUGIN([write_redis], [$with_libhiredis], [Redis output plugin]) - AC_PLUGIN([write_riemann], [$with_riemann_c], [Riemann output plugin]) - AC_PLUGIN([write_sensu], [yes], [Sensu output plugin]) - AC_PLUGIN([write_tsdb], [yes], [TSDB output plugin]) - AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) - AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics]) - AC_PLUGIN([zone], [$plugin_zone], [Solaris container statistics]) - AC_PLUGIN([zookeeper], [yes], [Zookeeper statistics]) + AC_PLUGIN([pinba], [$have_protoc_c], [Pinba statistics]) + AC_PLUGIN([ping], [$with_liboping], [Network latency statistics]) + AC_PLUGIN([postgresql], [$with_libpq], [PostgreSQL database statistics]) + AC_PLUGIN([powerdns], [yes], [PowerDNS statistics]) + AC_PLUGIN([processes], [$plugin_processes], [Process statistics]) + AC_PLUGIN([protocols], [$plugin_protocols], [Protocol (IP, TCP, ...) statistics]) + AC_PLUGIN([python], [$with_python], [Embed a Python interpreter]) + AC_PLUGIN([redis], [$with_libhiredis], [Redis plugin]) + AC_PLUGIN([routeros], [$with_librouteros], [RouterOS plugin]) + AC_PLUGIN([rrdcached], [$librrd_rrdc_update], [RRDTool output plugin]) + AC_PLUGIN([rrdtool], [$with_librrd], [RRDTool output plugin]) + AC_PLUGIN([sensors], [$with_libsensors], [lm_sensors statistics]) + AC_PLUGIN([serial], [$plugin_serial], [serial port traffic]) + AC_PLUGIN([sigrok], [$with_libsigrok], [sigrok acquisition sources]) + AC_PLUGIN([smart], [$with_libatasmart], [SMART statistics]) + AC_PLUGIN([snmp], [$with_libnetsnmp], [SNMP querying plugin]) + AC_PLUGIN([statsd], [yes], [StatsD plugin]) + AC_PLUGIN([swap], [$plugin_swap], [Swap usage statistics]) + AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin]) + AC_PLUGIN([table], [yes], [Parsing of tabular data]) + AC_PLUGIN([tail], [yes], [Parsing of logfiles]) + AC_PLUGIN([tail_csv], [yes], [Parsing of CSV files]) + AC_PLUGIN([tape], [$plugin_tape], [Tape drive statistics]) + AC_PLUGIN([target_notification], [yes], [The notification target]) + AC_PLUGIN([target_replace], [yes], [The replace target]) + AC_PLUGIN([target_scale], [yes], [The scale target]) + AC_PLUGIN([target_set], [yes], [The set target]) + AC_PLUGIN([target_v5upgrade], [yes], [The v5upgrade target]) + AC_PLUGIN([tcpconns], [$plugin_tcpconns], [TCP connection statistics]) + 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([threshold], [yes], [Threshold checking plugin]) + AC_PLUGIN([tokyotyrant], [$with_libtokyotyrant], [TokyoTyrant database statistics]) + AC_PLUGIN([turbostat], [$plugin_turbostat], [Advanced statistic on Intel cpu states]) + AC_PLUGIN([unixsock], [yes], [Unixsock communication plugin]) + AC_PLUGIN([uptime], [$plugin_uptime], [Uptime statistics]) + AC_PLUGIN([users], [$plugin_users], [User statistics]) + AC_PLUGIN([uuid], [yes], [UUID as hostname plugin]) + AC_PLUGIN([varnish], [$with_libvarnish], [Varnish cache statistics]) + AC_PLUGIN([virt], [$plugin_virt], [Virtual machine statistics]) + 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_graphite], [yes], [Graphite / Carbon output plugin]) + AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin]) + AC_PLUGIN([write_kafka], [$with_librdkafka], [Kafka output plugin]) + AC_PLUGIN([write_log], [yes], [Log output plugin]) + AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin]) + AC_PLUGIN([write_redis], [$with_libhiredis], [Redis output plugin]) -AC_PLUGIN([write_riemann], [$have_protoc_c], [Riemann output plugin]) ++AC_PLUGIN([write_riemann], [$with_riemann_c], [Riemann output plugin]) + AC_PLUGIN([write_sensu], [yes], [Sensu output plugin]) + AC_PLUGIN([write_tsdb], [yes], [TSDB output plugin]) + AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) + AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics]) + AC_PLUGIN([zone], [$plugin_zone], [Solaris container statistics]) + AC_PLUGIN([zookeeper], [yes], [Zookeeper statistics]) dnl Default configuration file # Load either syslog or logfile