X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=e4ab11170ea4be6fb187a689edc779b6330d48c4;hb=c7f23810d1f09f45cb4016da6eca6021d56bb0f7;hp=037371bca80d21084cb6e78f369a4e615f1fc2fb;hpb=1d888f3f3a131f8eb2d9e0884665b6951ecee550;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 037371bc..e4ab1117 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_EVENTS_TRUE@LoadPlugin ovs_events
#@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
#@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
#@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
@@ -524,13 +526,15 @@
#
#
-# Interval 1
-# Coremask "0xf"
-# ProcessType "secondary"
-# FilePrefix "rte"
-# EnabledPortMask 0xffff
-# PortName "interface1"
-# PortName "interface2"
+#
+# Coremask "0x2"
+# MemoryChannels "4"
+# ProcessType "secondary"
+# FilePrefix "rte"
+#
+# EnabledPortMask 0xffff
+# PortName "interface1"
+# PortName "interface2"
#
#
@@ -690,6 +694,11 @@
# Port "411"
#
+#
+# McelogClientSocket "/var/run/mcelog-client"
+# McelogLogfile "/var/log/mcelog"
+#
+
#
# Device "/dev/md0"
# IgnoreSelected false
@@ -985,6 +994,14 @@
#
#
+#
+# Port "6640"
+# Address "127.0.0.1"
+# Socket "/var/run/openvswitch/db.sock"
+# Interfaces "br0" "veth0"
+# SendNotification false
+#
+
#
# IncludeDir "/my/include/path"
# BaseName "Collectd::Plugins"
@@ -1278,18 +1295,19 @@
# Instance "apache"
#
# Regex "^\\S+ \"([0-9.]+)\""
-# DSType "Latency"
-# Type "response_time"
-# #LatencyPercentileType "percentile"
-# LatencyPercentile 5
-# LatencyPercentile 30
-# LatencyPercentile 50
-# LatencyPercentile 70
-# LatencyPercentile 95
-# LatencyRateType "requests"
-# LatencyRate 0.001 0.100
-# LatencyRate 0.101 0.200
-# LatencyRate 0.201 0
+#
+# 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
+#
+# Type "latency"
+# Instance "foo"
#
#
#
@@ -1440,6 +1458,8 @@
# HostnameFormat name
# InterfaceFormat name
# PluginInstanceFormat name
+# Instances 1
+# ExtraStats "disk pcpu"
#
#