X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=f31f8f8ef223f8ca653bf78c0933de49d7e96b41;hb=ed2b2f6bd8b23f2ec371d37681350eb03dab12b8;hp=8ad24d600f873c2cd5f0d2bfdfd845394d030154;hpb=cc893903f8453dc96a797b319bdd4e294052de6f;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 8ad24d60..f31f8f8e 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -142,6 +142,7 @@
 #@BUILD_PLUGIN_LVM_TRUE@LoadPlugin lvm
 #@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
 #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
+#@BUILD_PLUGIN_MCELOG_TRUE@LoadPlugin mcelog
 #@BUILD_PLUGIN_MD_TRUE@LoadPlugin md
 #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec
 #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
@@ -167,6 +168,7 @@
 #@BUILD_PLUGIN_OPENLDAP_TRUE@LoadPlugin openldap
 #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
 #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
+#@BUILD_PLUGIN_OVS_LINK_TRUE@LoadPlugin ovs_link
 #@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 #@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
 #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
@@ -690,6 +692,11 @@
 #	Port "411"
 #</Plugin>
 
+#<Plugin mcelog>
+#	McelogClientSocket "/var/run/mcelog-client"
+#	McelogLogfile "/var/log/mcelog"
+#</Plugin>
+
 #<Plugin md>
 #	Device "/dev/md0"
 #	IgnoreSelected false
@@ -985,6 +992,12 @@
 #  </Database>
 #</Plugin>
 
+#<Plugin ovs_link>
+#  OvsDbServerUrl "tcp:127.0.0.1:6640"
+#  Interfaces "br0" "veth0"
+#  SendNotification false
+#</Plugin>
+
 #<Plugin perl>
 #	IncludeDir "/my/include/path"
 #	BaseName "Collectd::Plugins"
@@ -1272,6 +1285,27 @@
 #      Instance "local_user"
 #    </Match>
 #  </File>
+#  <File "/var/log/nginx/apache-time.log">
+#    #Use the following log format in nginx:
+#    #log_format response_time '[$host] "$upstream_response_time" ...'
+#    Instance "apache"
+#    <Match>
+#      Regex "^\\S+ \"([0-9.]+)\""
+#      <DSType Distribution>
+#        Percentile 80    # -> latency-foo-80
+#        Percentile 95    # -> latency-foo-95
+#        Percentile 99    # -> latency-foo-99
+#        Bucket 0   0.1   # -> bucket-latency-foo-0_0.1
+#        Bucket 0.1 0.2   # -> bucket-latency-foo-0.1_0.2
+#        Bucket 0.2 0.5   # -> bucket-latency-foo-0.2_0.5
+#        Bucket 0.5 1.0   # -> bucket-latency-foo-0.5_1
+#        Bucket 1.0 2.0   # -> bucket-latency-foo-1_2
+#        Bucket 2.0 0     # -> bucket-latency-foo-2_inf
+#      </DSType>
+#      Type "latency"
+#      Instance "foo"
+#    </Match>
+#  </File>
 #</Plugin>
 
 #<Plugin tail_csv>
@@ -1420,6 +1454,7 @@
 #	HostnameFormat name
 #	InterfaceFormat name
 #	PluginInstanceFormat name
+#	Instances 1
 #</Plugin>
 
 #<Plugin vmem>
@@ -1439,6 +1474,7 @@
 #    AlwaysAppendDS false
 #    EscapeCharacter "_"
 #    SeparateInstances false
+#    PreserveSeparator false
 #    DropDuplicateFields false
 #  </Node>
 #</Plugin>