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
a959452
..
fc9b10c
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-500,6
+500,7
@@
# IgnoreSelected false
# HostnameFormat name
# InterfaceFormat name
# IgnoreSelected false
# HostnameFormat name
# InterfaceFormat name
+# PluginInstanceFormat name
#</Plugin>
#<Plugin load>
#</Plugin>
#<Plugin load>
@@
-585,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