Merge branch 'master' into sysevent
authorAndrew Bays <andrew.bays@gmail.com>
Tue, 6 Nov 2018 17:55:23 +0000 (12:55 -0500)
committerGitHub <noreply@github.com>
Tue, 6 Nov 2018 17:55:23 +0000 (12:55 -0500)
1  2 
AUTHORS
Makefile.am
README
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.in
src/collectd.conf.pod
src/types.db

diff --cc AUTHORS
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc README
Simple merge
diff --cc configure.ac
@@@ -6511,162 -6806,165 +6808,166 @@@ 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 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([chrony],              [yes],                     [Chrony statistics])
- 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([cpusleep],            [$plugin_cpusleep],        [CPU sleep 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([dpdkevents],          [$plugin_dpdkevents],      [Events from DPDK])
- AC_PLUGIN([dpdkstat],            [$plugin_dpdkstat],        [Stats from DPDK])
- 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([gps],                 [$plugin_gps],             [GPS plugin])
- AC_PLUGIN([grpc],                [$plugin_grpc],            [gRPC plugin])
- AC_PLUGIN([hddtemp],             [yes],                     [Query hddtempd])
- AC_PLUGIN([hugepages],           [$plugin_hugepages],       [Hugepages statistics])
- AC_PLUGIN([intel_pmu],           [$with_libjevents],        [Intel performance monitor plugin])
- AC_PLUGIN([intel_rdt],           [$with_libpqos],           [Intel RDT monitor plugin])
- 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([lua],                 [$with_liblua],            [Lua plugin])
- 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([mcelog],              [$plugin_mcelog],          [Machine Check Exceptions notifications])
- 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([ovs_events],          [$plugin_ovs_events],      [OVS events plugin])
- AC_PLUGIN([ovs_stats],           [$plugin_ovs_stats],       [OVS statistics 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([amqp1],               [$with_libqpid_proton],      [AMQP 1.0 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([chrony],              [yes],                       [Chrony statistics])
+ 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([cpusleep],            [$plugin_cpusleep],          [CPU sleep 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([dpdkevents],          [$plugin_dpdkevents],        [Events from DPDK])
+ AC_PLUGIN([dpdkstat],            [$plugin_dpdkstat],          [Stats from DPDK])
+ 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([gps],                 [$plugin_gps],               [GPS plugin])
+ AC_PLUGIN([gpu_nvidia],          [$with_cuda],                [NVIDIA GPU plugin])
+ AC_PLUGIN([grpc],                [$plugin_grpc],              [gRPC plugin])
+ AC_PLUGIN([hddtemp],             [yes],                       [Query hddtempd])
+ AC_PLUGIN([hugepages],           [$plugin_hugepages],         [Hugepages statistics])
+ AC_PLUGIN([intel_pmu],           [$with_libjevents],          [Intel performance monitor plugin])
+ AC_PLUGIN([intel_rdt],           [$with_libpqos],             [Intel RDT monitor plugin])
+ 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([lua],                 [$with_liblua],              [Lua plugin])
+ 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([mcelog],              [$plugin_mcelog],            [Machine Check Exceptions notifications])
+ 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([ovs_events],          [$plugin_ovs_events],        [OVS events plugin])
+ AC_PLUGIN([ovs_stats],           [$plugin_ovs_stats],         [OVS statistics plugin])
+ AC_PLUGIN([pcie_errors],         [$plugin_pcie_errors],       [PCIe errors 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],               [$plugin_pinba],           [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],              [$plugin_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],               [$plugin_smart],           [SMART statistics])
- AC_PLUGIN([snmp],                [$with_libnetsnmp],        [SNMP querying plugin])
- AC_PLUGIN([snmp_agent],          [$with_libnetsnmpagent],   [SNMP agent plugin])
- AC_PLUGIN([statsd],              [yes],                     [StatsD plugin])
- AC_PLUGIN([swap],                [$plugin_swap],            [Swap usage statistics])
- AC_PLUGIN([synproxy],            [$plugin_synproxy],        [Synproxy stats plugin])
- AC_PLUGIN([sysevent],            [$plugin_sysevent],        [rsyslog events])
- 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_prometheus],    [$plugin_write_prometheus], [Prometheus write plugin])
- AC_PLUGIN([write_redis],         [$with_libhiredis],        [Redis output plugin])
- AC_PLUGIN([write_riemann],       [$with_libriemann_client], [Riemann output plugin])
- AC_PLUGIN([write_sensu],         [yes],                     [Sensu output plugin])
- AC_PLUGIN([write_tsdb],          [yes],                     [TSDB output plugin])
- AC_PLUGIN([xencpu],              [$plugin_xencpu],          [Xen Host CPU usage])
- 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],               [$plugin_pinba],             [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],              [$plugin_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],               [$plugin_smart],             [SMART statistics])
+ AC_PLUGIN([snmp],                [$with_libnetsnmp],          [SNMP querying plugin])
+ AC_PLUGIN([snmp_agent],          [$with_libnetsnmpagent],     [SNMP agent plugin])
+ AC_PLUGIN([statsd],              [yes],                       [StatsD plugin])
+ AC_PLUGIN([swap],                [$plugin_swap],              [Swap usage statistics])
+ AC_PLUGIN([synproxy],            [$plugin_synproxy],          [Synproxy stats plugin])
++AC_PLUGIN([sysevent],            [$plugin_sysevent],          [rsyslog events])
+ 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_stackdriver],   [$plugin_write_stackdriver], [Google Stackdriver Monitoring 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_prometheus],    [$plugin_write_prometheus],  [Prometheus write plugin])
+ AC_PLUGIN([write_redis],         [$with_libhiredis],          [Redis output plugin])
+ AC_PLUGIN([write_riemann],       [$with_libriemann_client],   [Riemann output plugin])
+ AC_PLUGIN([write_sensu],         [yes],                       [Sensu output plugin])
+ AC_PLUGIN([write_tsdb],          [yes],                       [TSDB output plugin])
+ AC_PLUGIN([xencpu],              [$plugin_xencpu],            [Xen Host CPU usage])
+ 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
Simple merge
Simple merge
Simple merge
diff --cc src/types.db
@@@ -235,8 -239,8 +239,9 @@@ spam_score              value:GAUGE:U:
  spl                     value:GAUGE:U:U
  swap                    value:GAUGE:0:1099511627776
  swap_io                 value:DERIVE:0:U
 +sysevent                value:GAUGE:0:1
  tcp_connections         value:GAUGE:0:4294967295
+ tdp                     value:GAUGE:U:U
  temperature             value:GAUGE:U:U
  threads                 value:GAUGE:0:U
  time_dispersion         value:GAUGE:-1000000:1000000