X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollectd.conf.in;h=4efa29e451844123338a70fb4af4fadc2d2c1042;hb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;hp=aa6583843316703283588319b33dcdb603cf393c;hpb=c08de9dfe347cfb3f3e1404de58ff90cbf761c51;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index aa658384..4efa29e4 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -364,6 +364,9 @@
# ReportByCpu true
# ReportByState true
# ValuesPercentage false
+# ReportNumCpu false
+# ReportGuestState false
+# SubtractGuestState true
#
#
#
@@ -463,6 +466,7 @@
#
#
# Host "my_host"
+# #Plugin "stats"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
@@ -477,6 +481,7 @@
# Type "magic_level"
# #InstancePrefix "prefix-"
# InstanceFrom "td[1]"
+# #PluginInstanceFrom "td[1]"
# ValuesFrom "td[2]/span[@class=\"level\"]"
#
#
@@ -492,6 +497,7 @@
#
#
#
+# #Plugin "mycompany"
# Driver "mysql"
# DriverOption "host" "localhost"
# DriverOption "username" "collectd"
@@ -555,6 +561,8 @@
# Coremask "0x2"
# MemoryChannels "4"
# FilePrefix "rte"
+# LogLevel "7"
+# RteDriverLibPath "/usr/lib/dpdk-pmd"
#
# SharedMemObj "dpdk_collectd_stats_0"
# EnabledPortMask 0xffff
@@ -595,6 +603,7 @@
# Size "+10k"
# Recursive true
# IncludeHidden false
+# RegularOnly true
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
@@ -670,12 +679,33 @@
#
#
-# Sensor "some_sensor"
-# Sensor "another_one"
-# IgnoreSelected false
-# NotifySensorAdd false
-# NotifySensorRemove true
-# NotifySensorNotPresent false
+#
+# Sensor "some_sensor"
+# Sensor "another_one"
+# IgnoreSelected false
+# NotifySensorAdd false
+# NotifySensorRemove true
+# NotifySensorNotPresent false
+# NotifyIPMIConnectionState false
+# SELEnabled false
+# SELClearEvent false
+#
+#
+# Host "server.example.com"
+# Address "1.2.3.4"
+# Username "user"
+# Password "secret"
+# #AuthType "md5"
+# Sensor "some_sensor"
+# Sensor "another_one"
+# IgnoreSelected false
+# NotifySensorAdd false
+# NotifySensorRemove true
+# NotifySensorNotPresent false
+# NotifyIPMIConnectionState false
+# SELEnabled false
+# SELClearEvent false
+#
#
#
@@ -818,6 +848,11 @@
# QoS 2
# Topic "collectd/#"
# CleanSession true
+# CACert "/etc/ssl/ca.crt"
+# CertificateFile "/etc/ssl/client.crt"
+# CertificateKeyFile "/etc/ssl/client.pem"
+# TLSProtocol "tlsv1.2"
+# CipherSuite "ciphers"
#
#
@@ -1037,6 +1072,7 @@
#
#
#
+# #Plugin "warehouse"
# ConnectID "db01"
# Username "oracle"
# Password "secret"
@@ -1123,6 +1159,7 @@
# StoreRates true
#
#
+# #Plugin "kingdom"
# Host "hostname"
# Port "5432"
# User "username"
@@ -1134,7 +1171,7 @@
#
# Interval 60
# Service "service_name"
-# Query backend # predefined
+# Query backends # predefined
# Query rt36_tickets
#
#
@@ -1162,6 +1199,7 @@
#
# CollectFileDescriptor true
# CollectContextSwitch true
+# CollectMemoryMaps true
# Process "name"
# ProcessMatch "name" "regex"
#
@@ -1281,6 +1319,8 @@
# Community "community_string"
# Collect "std_traffic"
# Interval 120
+# Timeout 10
+# Retries 1
#
#
# Address "192.168.0.42"
@@ -1294,6 +1334,8 @@
# Community "more_communities"
# Collect "powerplus_voltge_input"
# Interval 300
+# Timeout 5
+# Retries 5
#
#
@@ -1343,10 +1385,12 @@
# ReportBytes true
# ValuesAbsolute true
# ValuesPercentage false
+# ReportIO true
#
#
#
+# #Plugin "table"
# Instance "slabinfo"
# Separator " "
#
@@ -1398,6 +1442,7 @@
# 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
+# #BucketType "bucket"
#
# Type "latency"
# Instance "foo"
@@ -1477,7 +1522,7 @@
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
-# RunningAveragePowerLimit "7"
+# RunningAveragePowerLimit "7"
#
#
@@ -1527,7 +1572,7 @@
# CollectPurge false # Varnish 2 only
# CollectSession false
# CollectSHM true
-# CollectSMA false # Varnish 2 only
+# CollectSMA false # Varnish 2 & 4 only
# CollectSMS false
# CollectSM false # Varnish 2 only
# CollectStruct false
@@ -1536,6 +1581,12 @@
# CollectVCL false
# CollectVSM false # Varnish 4 only
# CollectWorkers false
+# CollectLock false # Varnish 4 only
+# CollectMempool false # Varnish 4 only
+# CollectManagement false # Varnish 4 only
+# CollectSMF false # Varnish 4 only
+# CollectVBE false # Varnish 4 only
+# CollectMSE false # Varnish-Plus 4 only
#
#
@@ -1592,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