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/1979'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
bab7bca
..
460e93c
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-189,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
@@
-363,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>
@@
-532,7
+536,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">
@@
-554,7
+557,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"
@@
-589,12
+591,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>
@@
-648,10
+654,11
@@
#</Plugin>
#<Plugin intel_pmu>
#</Plugin>
#<Plugin intel_pmu>
-# HWCacheEvents true
-# KernelPMUEvents true
-# SWEvents true
-# HWSpecificEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS"
+# 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">
#</Plugin>
#<Plugin "intel_rdt">
@@
-728,8
+735,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>
@@
-811,6
+821,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>
@@
-937,6
+952,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"
@@
-978,6
+999,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>
@@
-1283,6
+1305,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"
@@
-1305,10
+1351,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>
@@
-1360,6
+1408,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"
@@
-1439,7
+1488,7
@@
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
-# RunningAveragePowerLimit "7"
+# RunningAveragePowerLimit "7"
#</Plugin>
#<Plugin unixsock>
#</Plugin>
#<Plugin unixsock>