projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2354 from rpv-tomsk/issue-2344-nut-rework
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
1e88bec
..
6b59d4d
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-188,6
+188,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
@@
-531,7
+532,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
+553,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"
@@
-970,6
+969,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>
@@
-1027,8
+1027,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>
@@
-1138,7
+1138,18
@@
#</Plugin>
#<Plugin processes>
#</Plugin>
#<Plugin processes>
+# CollectFileDescriptor true
+# CollectContextSwitch 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
+1275,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"
@@
-1495,7
+1530,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
+1570,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