Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 830add9..2a79dc4 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -52,6 +52,7 @@
 
 @LOAD_PLUGIN_SYSLOG@LoadPlugin syslog
 @LOAD_PLUGIN_LOGFILE@LoadPlugin logfile
+@LOAD_PLUGIN_LOG_LOGSTASH@LoadPlugin logfile
 
 #<Plugin logfile>
 #      LogLevel @DEFAULT_LOG_LEVEL@
@@ -60,6 +61,11 @@
 #      PrintSeverity false
 #</Plugin>
 
+#<Plugin logfile>
+#      LogLevel @DEFAULT_LOG_LEVEL@
+#      File "@localstatedir@/log/@PACKAGE_NAME@.json.log"
+#</Plugin>
+
 #<Plugin syslog>
 #      LogLevel @DEFAULT_LOG_LEVEL@
 #</Plugin>