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 b229f01..4efa29e 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -561,6 +561,8 @@
 #    Coremask "0x2"
 #    MemoryChannels "4"
 #    FilePrefix "rte"
+#    LogLevel "7"
+#    RteDriverLibPath "/usr/lib/dpdk-pmd"
 #  </EAL>
 #  SharedMemObj "dpdk_collectd_stats_0"
 #  EnabledPortMask 0xffff
@@ -601,6 +603,7 @@
 #              Size "+10k"
 #              Recursive true
 #              IncludeHidden false
+#              RegularOnly true
 #              #FilesSizeType "bytes"
 #              #FilesCountType "files"
 #              #TypeInstance "instance"
@@ -683,6 +686,7 @@
 #              NotifySensorAdd false
 #              NotifySensorRemove true
 #              NotifySensorNotPresent false
+#              NotifyIPMIConnectionState false
 #              SELEnabled false
 #              SELClearEvent false
 #      </Instance>
@@ -698,6 +702,7 @@
 #              NotifySensorAdd false
 #              NotifySensorRemove true
 #              NotifySensorNotPresent false
+#              NotifyIPMIConnectionState false
 #              SELEnabled false
 #              SELClearEvent false
 #      </Instance>
@@ -1166,7 +1171,7 @@
 #      <Database bar>
 #              Interval 60
 #              Service "service_name"
-#              Query backend # predefined
+#              Query backends # predefined
 #              Query rt36_tickets
 #      </Database>
 #      <Database qux>
@@ -1314,6 +1319,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 +1334,8 @@
 #       Community "more_communities"
 #       Collect "powerplus_voltge_input"
 #       Interval 300
+#      Timeout 5
+#      Retries 5
 #   </Host>
 #</Plugin>
 
@@ -1634,6 +1643,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