projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #313 from tiwilliam/master
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
667cd52
..
fc9b10c
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_SYSLOG@LoadPlugin syslog
@LOAD_PLUGIN_LOGFILE@LoadPlugin logfile
+@LOAD_PLUGIN_LOG_LOGSTASH@LoadPlugin log_logstash
#<Plugin logfile>
# LogLevel @DEFAULT_LOG_LEVEL@
#<Plugin logfile>
# LogLevel @DEFAULT_LOG_LEVEL@
@@
-60,6
+61,11
@@
# PrintSeverity false
#</Plugin>
# 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>
#<Plugin syslog>
# LogLevel @DEFAULT_LOG_LEVEL@
#</Plugin>
@@
-494,6
+500,7
@@
# IgnoreSelected false
# HostnameFormat name
# InterfaceFormat name
# IgnoreSelected false
# HostnameFormat name
# InterfaceFormat name
+# PluginInstanceFormat name
#</Plugin>
#<Plugin load>
#</Plugin>
#<Plugin load>
@@
-579,9
+586,11
@@
# Password "secret"
# Database "db_name"
# MasterStats true
# Password "secret"
# Database "db_name"
# MasterStats true
+# ConnectTimeout 10
# </Database>
#
# <Database db_name2>
# </Database>
#
# <Database db_name2>
+# Alias "squeeze"
# Host "localhost"
# Socket "/var/run/mysql/mysqld.sock"
# SlaveStats true
# Host "localhost"
# Socket "/var/run/mysql/mysqld.sock"
# SlaveStats true
@@
-1170,6
+1179,11
@@
# VerifyPeer true
# VerifyHost true
# CACert "/etc/ssl/ca.crt"
# 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>
# Format "Command"
# StoreRates false
# </URL>