From: Florian Forster Date: Wed, 7 Aug 2013 06:39:28 +0000 (+0200) Subject: Merge branch 'ff/statsd' X-Git-Tag: collectd-5.4.0~13 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fc4c1f412c4002b787b5ce24b08e3091ced08a5;p=collectd.git Merge branch 'ff/statsd' --- 7fc4c1f412c4002b787b5ce24b08e3091ced08a5 diff --cc configure.in index 0838de8b,3701d8ad..dbdc0589 --- a/configure.in +++ b/configure.in @@@ -5166,8 -5098,8 +5166,9 @@@ AC_PLUGIN([rrdcached], [$librrd_rrdc_ 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([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]) @@@ -5505,8 -5436,8 +5506,9 @@@ Configuration rrdtool . . . . . . . $enable_rrdtool sensors . . . . . . . $enable_sensors serial . . . . . . . $enable_serial + sigrok . . . . . . . $enable_sigrok snmp . . . . . . . . $enable_snmp + statsd . . . . . . . $enable_statsd swap . . . . . . . . $enable_swap syslog . . . . . . . $enable_syslog table . . . . . . . . $enable_table diff --cc src/collectd.conf.in index e471a7d9,c5ab3ce8..e8d4d28e --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@@ -154,8 -149,8 +154,9 @@@ @LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool #@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial +#@BUILD_PLUGIN_SIGROK_TRUE@LoadPlugin sigrok #@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp + #@BUILD_PLUGIN_STATSD_TRUE@LoadPlugin statsd #@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap #@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table #@BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail