X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=fc9b10c50bb8ed2c84a5304e7d8e542f4b4523ba;hb=f7818fbc069c641e1ae40280dbd6f33dc613ec3a;hp=667cd527c75ac7fb81df78c8798414652c78c9df;hpb=10acbebad32481ef261daed297f61b5e4c153879;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 667cd527..fc9b10c5 100644
--- 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 log_logstash
 
 #<Plugin logfile>
 #	LogLevel @DEFAULT_LOG_LEVEL@
@@ -60,6 +61,11 @@
 #	PrintSeverity false
 #</Plugin>
 
+#<Plugin log_logstash>
+#	LogLevel @DEFAULT_LOG_LEVEL@
+#	File "@localstatedir@/log/@PACKAGE_NAME@.json.log"
+#</Plugin>
+
 #<Plugin syslog>
 #	LogLevel @DEFAULT_LOG_LEVEL@
 #</Plugin>
@@ -494,6 +500,7 @@
 #	IgnoreSelected false
 #	HostnameFormat name
 #	InterfaceFormat name
+#	PluginInstanceFormat name
 #</Plugin>
 
 #<Plugin load>
@@ -579,9 +586,11 @@
 #		Password "secret"
 #		Database "db_name"
 #		MasterStats true
+#		ConnectTimeout 10
 #	</Database>
 #
 #	<Database db_name2>
+#		Alias "squeeze"
 #		Host "localhost"
 #		Socket "/var/run/mysql/mysqld.sock"
 #		SlaveStats true
@@ -1170,6 +1179,11 @@
 #		VerifyPeer true
 #		VerifyHost true
 #		CACert "/etc/ssl/ca.crt"
+#		CAPath "/etc/ssl/certs/"
+#		ClientKey "/etc/ssl/client.pem"
+#		ClientCert "/etc/ssl/client.crt"
+#		ClientKeyPass "secret"
+#		SSLVersion "TLSv1"
 #		Format "Command"
 #		StoreRates false
 #	</URL>