Merge branch 'collectd-5.8'

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 5eb17c4..96c2630 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -643,6 +643,7 @@
 #              SSLCACertificateFile "/path/to/root.pem"
 #              SSLCertificateFile "/path/to/client.pem"
 #              SSLCertificateKeyFile "/path/to/client.key"
 #              SSLCACertificateFile "/path/to/root.pem"
 #              SSLCertificateFile "/path/to/client.pem"
 #              SSLCertificateKeyFile "/path/to/client.key"

+#              VerifyPeer true

 #      </Listen>
 #</Plugin>
 
 #      </Listen>
 #</Plugin>
 


@@ -1126,6 +1127,7 @@
 #      Timeout 0.9
 #      TTL 255
 #      SourceAddress "1.2.3.4"
 #      Timeout 0.9
 #      TTL 255
 #      SourceAddress "1.2.3.4"

+#      AddressFamily "any"

 #      Device "eth0"
 #      MaxMissed -1
 #</Plugin>
 #      Device "eth0"
 #      MaxMissed -1
 #</Plugin>


@@ -1201,11 +1203,13 @@
 #      CollectFileDescriptor true
 #      CollectContextSwitch true
 #      CollectMemoryMaps true
 #      CollectFileDescriptor true
 #      CollectContextSwitch true
 #      CollectMemoryMaps true

+#      CollectDelayAccounting false

 #      Process "name"
 #      ProcessMatch "name" "regex"
 #      <Process "collectd">
 #              CollectFileDescriptor false
 #              CollectContextSwitch false
 #      Process "name"
 #      ProcessMatch "name" "regex"
 #      <Process "collectd">
 #              CollectFileDescriptor false
 #              CollectContextSwitch false

+#              CollectDelayAccounting true

 #      </Process>
 #      <ProcessMatch "name" "regex">
 #              CollectFileDescriptor false
 #      </Process>
 #      <ProcessMatch "name" "regex">
 #              CollectFileDescriptor false


@@ -1605,6 +1609,7 @@
 #      PluginInstanceFormat name
 #      Instances 1
 #      ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
 #      PluginInstanceFormat name
 #      Instances 1
 #      ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"

+#      PersistentNotification false

 #</Plugin>
 
 #<Plugin vmem>
 #</Plugin>
 
 #<Plugin vmem>