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 #2346 from trenkel/master
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
ac0aa2d
..
261abdf
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-601,6
+601,7
@@
# Size "+10k"
# Recursive true
# IncludeHidden false
# Size "+10k"
# Recursive true
# IncludeHidden false
+# RegularOnly true
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
@@
-1316,6
+1317,8
@@
# Community "community_string"
# Collect "std_traffic"
# Interval 120
# Community "community_string"
# Collect "std_traffic"
# Interval 120
+# Timeout 10
+# Retries 1
# </Host>
# <Host "some.server.mydomain.org">
# Address "192.168.0.42"
# </Host>
# <Host "some.server.mydomain.org">
# Address "192.168.0.42"
@@
-1329,6
+1332,8
@@
# Community "more_communities"
# Collect "powerplus_voltge_input"
# Interval 300
# Community "more_communities"
# Collect "powerplus_voltge_input"
# Interval 300
+# Timeout 5
+# Retries 5
# </Host>
#</Plugin>
# </Host>
#</Plugin>