projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/1558'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
1e88bec
..
3287e0d
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-129,6
+129,7
@@
#@BUILD_PLUGIN_GRPC_TRUE@LoadPlugin grpc
#@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
#@BUILD_PLUGIN_HUGEPAGES_TRUE@LoadPlugin hugepages
#@BUILD_PLUGIN_GRPC_TRUE@LoadPlugin grpc
#@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
#@BUILD_PLUGIN_HUGEPAGES_TRUE@LoadPlugin hugepages
+#@BUILD_PLUGIN_INTEL_PMU_TRUE@LoadPlugin intel_pmu
#@BUILD_PLUGIN_INTEL_RDT_TRUE@LoadPlugin intel_rdt
@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
#@BUILD_PLUGIN_IPC_TRUE@LoadPlugin ipc
#@BUILD_PLUGIN_INTEL_RDT_TRUE@LoadPlugin intel_rdt
@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
#@BUILD_PLUGIN_IPC_TRUE@LoadPlugin ipc
@@
-188,6
+189,7
@@
#@BUILD_PLUGIN_SIGROK_TRUE@LoadPlugin sigrok
#@BUILD_PLUGIN_SMART_TRUE@LoadPlugin smart
#@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
#@BUILD_PLUGIN_SIGROK_TRUE@LoadPlugin sigrok
#@BUILD_PLUGIN_SMART_TRUE@LoadPlugin smart
#@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
+#@BUILD_PLUGIN_SNMP_AGENT_TRUE@LoadPlugin snmp_agent
#@BUILD_PLUGIN_STATSD_TRUE@LoadPlugin statsd
#@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
#@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table
#@BUILD_PLUGIN_STATSD_TRUE@LoadPlugin statsd
#@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
#@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table
@@
-362,6
+364,9
@@
# ReportByCpu true
# ReportByState true
# ValuesPercentage false
# ReportByCpu true
# ReportByState true
# ValuesPercentage false
+# ReportNumCpu false
+# ReportGuestState false
+# SubtractGuestState true
#</Plugin>
#
#<Plugin csv>
#</Plugin>
#
#<Plugin csv>
@@
-461,6
+466,7
@@
#<Plugin curl_xml>
# <URL "http://localhost/stats.xml">
# Host "my_host"
#<Plugin curl_xml>
# <URL "http://localhost/stats.xml">
# Host "my_host"
+# #Plugin "stats"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
@@
-475,6
+481,7
@@
# Type "magic_level"
# #InstancePrefix "prefix-"
# InstanceFrom "td[1]"
# Type "magic_level"
# #InstancePrefix "prefix-"
# InstanceFrom "td[1]"
+# #PluginInstanceFrom "td[1]"
# ValuesFrom "td[2]/span[@class=\"level\"]"
# </XPath>
# </URL>
# ValuesFrom "td[2]/span[@class=\"level\"]"
# </XPath>
# </URL>
@@
-490,6
+497,7
@@
# </Result>
# </Query>
# <Database "customers_db">
# </Result>
# </Query>
# <Database "customers_db">
+# #Plugin "mycompany"
# Driver "mysql"
# DriverOption "host" "localhost"
# DriverOption "username" "collectd"
# Driver "mysql"
# DriverOption "host" "localhost"
# DriverOption "username" "collectd"
@@
-531,7
+539,6
@@
# <EAL>
# Coremask "0x1"
# MemoryChannels "4"
# <EAL>
# Coremask "0x1"
# MemoryChannels "4"
-# ProcessType "secondary"
# FilePrefix "rte"
# </EAL>
# <Event "link_status">
# FilePrefix "rte"
# </EAL>
# <Event "link_status">
@@
-553,7
+560,6
@@
# <EAL>
# Coremask "0x2"
# MemoryChannels "4"
# <EAL>
# Coremask "0x2"
# MemoryChannels "4"
-# ProcessType "secondary"
# FilePrefix "rte"
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
# FilePrefix "rte"
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
@@
-588,12
+594,16
@@
#<Plugin filecount>
# <Directory "/path/to/dir">
#<Plugin filecount>
# <Directory "/path/to/dir">
+# #Plugin "foo"
# Instance "foodir"
# Name "*.conf"
# MTime "-5m"
# Size "+10k"
# Recursive true
# IncludeHidden false
# Instance "foodir"
# Name "*.conf"
# MTime "-5m"
# Size "+10k"
# Recursive true
# IncludeHidden false
+# #FilesSizeType "bytes"
+# #FilesCountType "files"
+# #TypeInstance "instance"
# </Directory>
#</Plugin>
# </Directory>
#</Plugin>
@@
-646,6
+656,14
@@
# ValuesPercentage false
#</Plugin>
# ValuesPercentage false
#</Plugin>
+#<Plugin intel_pmu>
+# ReportHardwareCacheEvents true
+# ReportKernelPMUEvents true
+# ReportSoftwareEvents true
+# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
+# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+#</Plugin>
+
#<Plugin "intel_rdt">
# Cores "0-2"
#</Plugin>
#<Plugin "intel_rdt">
# Cores "0-2"
#</Plugin>
@@
-720,8
+738,11
@@
#</Plugin>
#<Plugin mcelog>
#</Plugin>
#<Plugin mcelog>
-# McelogClientSocket "/var/run/mcelog-client"
-# McelogLogfile "/var/log/mcelog"
+# <Memory>
+# McelogClientSocket "/var/run/mcelog-client"
+# PersistentNotification false
+# </Memory>
+# McelogLogfile "/var/log/mcelog"
#</Plugin>
#<Plugin md>
#</Plugin>
#<Plugin md>
@@
-803,6
+824,11
@@
# QoS 2
# Topic "collectd/#"
# CleanSession true
# 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"
# </Subscribe>
#</Plugin>
# </Subscribe>
#</Plugin>
@@
-929,6
+955,12
@@
# CacheFlush 1800
@LOAD_PLUGIN_NETWORK@</Plugin>
# CacheFlush 1800
@LOAD_PLUGIN_NETWORK@</Plugin>
+#<Plugin nfs>
+# ReportV2 false
+# #ReportV3 false
+# #ReportV4 false
+#</Plugin>
+
#<Plugin nginx>
# URL "http://localhost/status?auto"
# User "www-user"
#<Plugin nginx>
# URL "http://localhost/status?auto"
# User "www-user"
@@
-970,6
+1002,7
@@
# ForceSSL true
# VerifyPeer true
# CAPath "/path/to/folder"
# ForceSSL true
# VerifyPeer true
# CAPath "/path/to/folder"
+# #ConnectTimeout 5000
#</Plugin>
#<Plugin olsrd>
#</Plugin>
#<Plugin olsrd>
@@
-1015,6
+1048,7
@@
# </Result>
# </Query>
# <Database "product_information">
# </Result>
# </Query>
# <Database "product_information">
+# #Plugin "warehouse"
# ConnectID "db01"
# Username "oracle"
# Password "secret"
# ConnectID "db01"
# Username "oracle"
# Password "secret"
@@
-1027,8
+1061,8
@@
# Address "127.0.0.1"
# Socket "/var/run/openvswitch/db.sock"
# Interfaces "br0" "veth0"
# Address "127.0.0.1"
# Socket "/var/run/openvswitch/db.sock"
# Interfaces "br0" "veth0"
-# SendNotification
fals
e
-# DispatchValues
tru
e
+# SendNotification
tru
e
+# DispatchValues
fals
e
#</Plugin>
#<Plugin ovs_stats>
#</Plugin>
#<Plugin ovs_stats>
@@
-1101,6
+1135,7
@@
# StoreRates true
# </Writer>
# <Database foo>
# StoreRates true
# </Writer>
# <Database foo>
+# #Plugin "kingdom"
# Host "hostname"
# Port "5432"
# User "username"
# Host "hostname"
# Port "5432"
# User "username"
@@
-1138,7
+1173,19
@@
#</Plugin>
#<Plugin processes>
#</Plugin>
#<Plugin processes>
+# CollectFileDescriptor true
+# CollectContextSwitch true
+# CollectMemoryMaps true
# Process "name"
# Process "name"
+# ProcessMatch "name" "regex"
+# <Process "collectd">
+# CollectFileDescriptor false
+# CollectContextSwitch false
+# </Process>
+# <ProcessMatch "name" "regex">
+# CollectFileDescriptor false
+# CollectContextSwitch true
+# </Process>
#</Plugin>
#<Plugin protocols>
#</Plugin>
#<Plugin protocols>
@@
-1264,6
+1311,30
@@
# </Host>
#</Plugin>
# </Host>
#</Plugin>
+#<Plugin snmp_agent>
+# <Data "memAvailReal">
+# Plugin "memory"
+# Type "memory"
+# TypeInstance "free"
+# OIDs "1.3.6.1.4.1.2021.4.6.0"
+# </Data>
+# <Table "ifTable">
+# IndexOID "IF-MIB::ifIndex"
+# SizeOID "IF-MIB::ifNumber"
+# <Data "ifDescr">
+# Instance true
+# Plugin "interface"
+# OIDs "IF-MIB::ifDescr"
+# </Data>
+# <Data "ifOctets">
+# Plugin "interface"
+# Type "if_octets"
+# TypeInstance ""
+# OIDs "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
+# </Data>
+# </Table>
+#</Plugin>
+
#<Plugin statsd>
# Host "::"
# Port "8125"
#<Plugin statsd>
# Host "::"
# Port "8125"
@@
-1286,10
+1357,12
@@
# ReportBytes true
# ValuesAbsolute true
# ValuesPercentage false
# ReportBytes true
# ValuesAbsolute true
# ValuesPercentage false
+# ReportIO true
#</Plugin>
#<Plugin table>
# <Table "/proc/slabinfo">
#</Plugin>
#<Plugin table>
# <Table "/proc/slabinfo">
+# #Plugin "table"
# Instance "slabinfo"
# Separator " "
# <Result>
# Instance "slabinfo"
# Separator " "
# <Result>
@@
-1341,6
+1414,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
# 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"
# </DSType>
# Type "latency"
# Instance "foo"
# </DSType>
# Type "latency"
# Instance "foo"
@@
-1420,7
+1494,7
@@
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
-# RunningAveragePowerLimit "7"
+# RunningAveragePowerLimit "7"
#</Plugin>
#<Plugin unixsock>
#</Plugin>
#<Plugin unixsock>
@@
-1470,7
+1544,7
@@
# CollectPurge false # Varnish 2 only
# CollectSession false
# CollectSHM true
# 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
# CollectSMS false
# CollectSM false # Varnish 2 only
# CollectStruct false
@@
-1479,6
+1553,11
@@
# CollectVCL false
# CollectVSM false # Varnish 4 only
# CollectWorkers false
# 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
# </Instance>
#</Plugin>
# </Instance>
#</Plugin>
@@
-1495,7
+1574,7
@@
# InterfaceFormat name
# PluginInstanceFormat name
# Instances 1
# InterfaceFormat name
# PluginInstanceFormat name
# Instances 1
-# ExtraStats "
disk pcpu
"
+# ExtraStats "
cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin
"
#</Plugin>
#<Plugin vmem>
#</Plugin>
#<Plugin vmem>
@@
-1535,6
+1614,8
@@
# Header "X-Custom-Header: custom_value"
# SSLVersion "TLSv1"
# Format "Command"
# Header "X-Custom-Header: custom_value"
# SSLVersion "TLSv1"
# Format "Command"
+# Attribute "key" "value" # only available for KAIROSDB format
+# TTL 0 # data ttl, only available for KAIROSDB format
# Metrics true
# Notifications false
# StoreRates false
# Metrics true
# Notifications false
# StoreRates false