projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
ac0aa2d
..
4efa29e
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-561,6
+561,8
@@
# Coremask "0x2"
# MemoryChannels "4"
# FilePrefix "rte"
# Coremask "0x2"
# MemoryChannels "4"
# FilePrefix "rte"
+# LogLevel "7"
+# RteDriverLibPath "/usr/lib/dpdk-pmd"
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
# EnabledPortMask 0xffff
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
# EnabledPortMask 0xffff
@@
-601,6
+603,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"
@@
-1168,7
+1171,7
@@
# <Database bar>
# Interval 60
# Service "service_name"
# <Database bar>
# Interval 60
# Service "service_name"
-# Query backend # predefined
+# Query backend
s
# predefined
# Query rt36_tickets
# </Database>
# <Database qux>
# Query rt36_tickets
# </Database>
# <Database qux>
@@
-1316,6
+1319,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
+1334,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>