Merge remote-tracking branch 'github/pr/703'

diff --combined configure.ac
index fe20609,87cb52c..92fd877
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5354,6 -5354,7 +5354,7 @@@ AC_PLUGIN([write_kafka],  [$with_librdk
  AC_PLUGIN([write_mongodb], [$with_libmongoc],  [MongoDB output plugin])
  AC_PLUGIN([write_redis], [$with_libcredis],    [Redis output plugin])
  AC_PLUGIN([write_riemann], [$have_protoc_c],   [Riemann 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])
  
@@@ -5384,7 -5385,7 +5385,7 @@@ els
        LOAD_PLUGIN_LOGFILE="##"
  fi
  
 -if test "x$enable_logfile" = "xyes"
 +if test "x$enable_log_logstash" = "xyes"
  then
    LOAD_PLUGIN_LOG_LOGSTASH="#"
  else
@@@ -5717,6 -5718,7 +5718,7 @@@ Configuration
      write_mongodb . . . . $enable_write_mongodb
      write_redis . . . . . $enable_write_redis
      write_riemann . . . . $enable_write_riemann
+     write_tsdb  . . . . . $enable_write_tsdb
      xmms  . . . . . . . . $enable_xmms
      zfs_arc . . . . . . . $enable_zfs_arc