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 b229f01..261abdf 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -601,6 +601,7 @@
 #              Size "+10k"
 #              Recursive true
 #              IncludeHidden false
+#              RegularOnly true
 #              #FilesSizeType "bytes"
 #              #FilesCountType "files"
 #              #TypeInstance "instance"
@@ -683,6 +684,7 @@
 #              NotifySensorAdd false
 #              NotifySensorRemove true
 #              NotifySensorNotPresent false
+#              NotifyIPMIConnectionState false
 #              SELEnabled false
 #              SELClearEvent false
 #      </Instance>
@@ -698,6 +700,7 @@
 #              NotifySensorAdd false
 #              NotifySensorRemove true
 #              NotifySensorNotPresent false
+#              NotifyIPMIConnectionState false
 #              SELEnabled false
 #              SELClearEvent false
 #      </Instance>
@@ -1314,6 +1317,8 @@
 #       Community "community_string"
 #       Collect "std_traffic"
 #       Interval 120
+#      Timeout 10
+#      Retries 1
 #   </Host>
 #   <Host "some.server.mydomain.org">
 #       Address "192.168.0.42"
@@ -1327,6 +1332,8 @@
 #       Community "more_communities"
 #       Collect "powerplus_voltge_input"
 #       Interval 300
+#      Timeout 5
+#      Retries 5
 #   </Host>
 #</Plugin>
 
@@ -1634,6 +1641,7 @@
 #              Header "X-Custom-Header: custom_value"
 #              SSLVersion "TLSv1"
 #              Format "Command"
+#              Prefix "collectd"  # metric prefix, only available for KAIROSDB format
 #              Attribute "key" "value"     # only available for KAIROSDB format
 #              TTL 0   # data ttl, only available for KAIROSDB format
 #              Metrics true