X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=136681d8da697a13cce522c66fb57e388dd5a3a6;hp=066e5a932ce475acf06e034cfa36fb31a9c9b6fe;hb=a811574a6acbf87f23948411876a231fecaeb491;hpb=d3eae6bf3df995566cad90c96a1dea49652b5dd2

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 066e5a93..136681d8 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -223,6 +223,7 @@
 #@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@LoadPlugin write_riemann
 #@BUILD_PLUGIN_WRITE_SENSU_TRUE@LoadPlugin write_sensu
 #@BUILD_PLUGIN_WRITE_STACKDRIVER_TRUE@LoadPlugin write_stackdriver
+#@BUILD_PLUGIN_WRITE_SYSLOG_TRUE@LoadPlugin write_syslog
 #@BUILD_PLUGIN_WRITE_TSDB_TRUE@LoadPlugin write_tsdb
 #@BUILD_PLUGIN_XENCPU_TRUE@LoadPlugin xencpu
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
@@ -403,6 +404,7 @@
 #<Plugin curl>
 #  <Page "stock_quotes">
 #    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
+#    AddressFamily "any"
 #    User "foo"
 #    Password "bar"
 #    Digest false
@@ -425,6 +427,7 @@
 
 #<Plugin curl_json>
 #  <URL "http://localhost:80/test.json">
+#    AddressFamily "any"
 #    Instance "test_http_json"
 #    <Key "testArray/0">
 #      Type "gauge"
@@ -461,6 +464,7 @@
 # }
 ## See: http://wiki.apache.org/couchdb/Runtime_Statistics
 #  <URL "http://localhost:5984/_stats">
+#    AddressFamily "ipv4"
 #    Instance "httpd"
 #    <Key "httpd/requests/count">
 #      Type "http_requests"
@@ -476,6 +480,7 @@
 #  </URL>
 ## Database status metrics:
 #  <URL "http://localhost:5984/_all_dbs">
+#    AddressFamily "ipv6"
 #    Instance "dbs"
 #    <Key "*/doc_count">
 #      Type "gauge"
@@ -491,6 +496,7 @@
 
 #<Plugin curl_xml>
 #  <URL "http://localhost/stats.xml">
+#    AddressFamily "any"
 #    Host "my_host"
 #    #Plugin "stats"
 #    Instance "some_instance"
@@ -703,6 +709,7 @@
 
 #<Plugin "intel_rdt">
 #  Cores "0-2"
+#  Processes "sshd"
 #</Plugin>
 
 #<Plugin interface>
@@ -1395,6 +1402,7 @@
 #       Version 2
 #       Community "another_string"
 #       Collect "std_traffic" "hr_users"
+#       BulkSize 0
 #   </Host>
 #   <Host "some.ups.mydomain.org">
 #       Address "192.168.0.3"
@@ -1405,6 +1413,15 @@
 # 	Timeout 5
 #	Retries 5
 #   </Host>
+#   <Host "highend.switch.example.org">
+#       Address "192.168.0.3"
+#       Version 2
+#       Community "another_string"
+#       Collect "std_traffic"
+#       Interval 10
+#       Timeout 10
+#       BulkSize 100
+#   </Host>
 #</Plugin>
 
 #<Plugin snmp_agent>
@@ -1664,6 +1681,8 @@
 #	Connection "xen:///"
 #	RefreshInterval 60
 #	Domain "name"
+#	ReportBlockDevices true
+#	ReportNetworkInterfaces true
 #	BlockDevice "name:device"
 #	BlockDeviceFormat target
 #	BlockDeviceFormatBasename false
@@ -1675,7 +1694,7 @@
 #	InterfaceFormat name
 #	PluginInstanceFormat name
 #	Instances 1
-#	ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
+#	ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpu vcpupin disk_physical disk_allocation disk_capacity memory"
 #	PersistentNotification false
 #</Plugin>
 
@@ -1698,6 +1717,7 @@
 #    SeparateInstances false
 #    PreserveSeparator false
 #    DropDuplicateFields false
+#    ReverseHost false
 #  </Node>
 #</Plugin>
 
@@ -1806,6 +1826,18 @@
 #  Url "https://monitoring.googleapis.com/v3"
 #</Plugin>
 
+#<Plugin write_syslog>
+#	<Node>
+#		Host "localhost"
+#		Port "44514"
+#		Prefix "collectd"
+#		MessageFormat "human"
+#		HostTags ""
+#		StoreRates false
+#		AlwaysAppendDS false
+#	</Node>
+#</Plugin>
+
 #<Plugin write_tsdb>
 #	<Node>
 #		Host "localhost"