projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into connectivity
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
5f58a6e
..
4fd507a
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-90,6
+90,7
@@
#@BUILD_PLUGIN_AGGREGATION_TRUE@LoadPlugin aggregation
#@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
#@BUILD_PLUGIN_AGGREGATION_TRUE@LoadPlugin aggregation
#@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
+#@BUILD_PLUGIN_AMQP1_TRUE@LoadPlugin amqp1
#@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
#@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
#@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
#@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
#@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
#@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
@@
-101,6
+102,7
@@
#@BUILD_PLUGIN_CEPH_TRUE@LoadPlugin ceph
#@BUILD_PLUGIN_CGROUPS_TRUE@LoadPlugin cgroups
#@BUILD_PLUGIN_CHRONY_TRUE@LoadPlugin chrony
#@BUILD_PLUGIN_CEPH_TRUE@LoadPlugin ceph
#@BUILD_PLUGIN_CGROUPS_TRUE@LoadPlugin cgroups
#@BUILD_PLUGIN_CHRONY_TRUE@LoadPlugin chrony
+#@BUILD_PLUGIN_CONNECTIVITY_TRUE@LoadPlugin connectivity
#@BUILD_PLUGIN_CONNTRACK_TRUE@LoadPlugin conntrack
#@BUILD_PLUGIN_CONTEXTSWITCH_TRUE@LoadPlugin contextswitch
@BUILD_PLUGIN_CPU_TRUE@@BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu
#@BUILD_PLUGIN_CONNTRACK_TRUE@LoadPlugin conntrack
#@BUILD_PLUGIN_CONTEXTSWITCH_TRUE@LoadPlugin contextswitch
@BUILD_PLUGIN_CPU_TRUE@@BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu
@@
-269,6
+271,29
@@
# </Publish>
#</Plugin>
# </Publish>
#</Plugin>
+#<Plugin amqp1>
+# <Transport "name">
+# Host "localhost"
+# Port "5672"
+# User "guest"
+# Password "guest"
+# Address "collectd"
+# RetryDelay 1
+# <Instance "log">
+# Format JSON
+# PreSettle false
+# </Instance>
+# <Instance "notify">
+# Format JSON
+# PreSettle true
+# </Instance>
+# <Instance "telemetry">
+# Format JSON
+# PreSettle false
+# </Instance>
+# </Transport>
+#</Plugin>
+
#<Plugin apache>
# <Instance "local">
# URL "http://localhost/status?auto"
#<Plugin apache>
# <Instance "local">
# URL "http://localhost/status?auto"
@@
-355,6
+380,10
@@
# Timeout "2"
#</Plugin>
# Timeout "2"
#</Plugin>
+#<Plugin connectivity>
+# Interface eth0
+#</Plugin>
+
#<Plugin cgroups>
# CGroup "libvirt"
# IgnoreSelected false
#<Plugin cgroups>
# CGroup "libvirt"
# IgnoreSelected false
@@
-561,6
+590,8
@@
# Coremask "0x2"
# MemoryChannels "4"
# FilePrefix "rte"
# Coremask "0x2"
# MemoryChannels "4"
# FilePrefix "rte"
+# LogLevel "7"
+# RteDriverLibPath "/usr/lib/dpdk-pmd"
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
# EnabledPortMask 0xffff
# </EAL>
# SharedMemObj "dpdk_collectd_stats_0"
# EnabledPortMask 0xffff
@@
-601,6
+632,7
@@
# Size "+10k"
# Recursive true
# IncludeHidden false
# Size "+10k"
# Recursive true
# IncludeHidden false
+# RegularOnly true
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
@@
-640,6
+672,7
@@
# SSLCACertificateFile "/path/to/root.pem"
# SSLCertificateFile "/path/to/client.pem"
# SSLCertificateKeyFile "/path/to/client.key"
# SSLCACertificateFile "/path/to/root.pem"
# SSLCertificateFile "/path/to/client.pem"
# SSLCertificateKeyFile "/path/to/client.key"
+# VerifyPeer true
# </Listen>
#</Plugin>
# </Listen>
#</Plugin>
@@
-662,6
+695,7
@@
# 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"
# 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"
+# Cores "[0-3]"
#</Plugin>
#<Plugin "intel_rdt">
#</Plugin>
#<Plugin "intel_rdt">
@@
-685,6
+719,9
@@
# NotifySensorNotPresent false
# NotifyIPMIConnectionState false
# SELEnabled false
# NotifySensorNotPresent false
# NotifyIPMIConnectionState false
# SELEnabled false
+# SELSensor "some_sensor"
+# SELSensor "another_one"
+# SELIgnoreSelected false
# SELClearEvent false
# </Instance>
# <Instance "remote">
# SELClearEvent false
# </Instance>
# <Instance "remote">
@@
-701,6
+738,9
@@
# NotifySensorNotPresent false
# NotifyIPMIConnectionState false
# SELEnabled false
# NotifySensorNotPresent false
# NotifyIPMIConnectionState false
# SELEnabled false
+# SELSensor "some_sensor"
+# SELSensor "another_one"
+# SELIgnoreSelected false
# SELClearEvent false
# </Instance>
#</Plugin>
# SELClearEvent false
# </Instance>
#</Plugin>
@@
-805,6
+845,8
@@
# RegisterType float
# Type gauge
# Instance "..."
# RegisterType float
# Type gauge
# Instance "..."
+# #Scale 1.0
+# #Shift 0.0
# </Data>
#
# <Host "name">
# </Data>
#
# <Host "name">
@@
-1122,6
+1164,7
@@
# Timeout 0.9
# TTL 255
# SourceAddress "1.2.3.4"
# Timeout 0.9
# TTL 255
# SourceAddress "1.2.3.4"
+# AddressFamily "any"
# Device "eth0"
# MaxMissed -1
#</Plugin>
# Device "eth0"
# MaxMissed -1
#</Plugin>
@@
-1168,7
+1211,7
@@
# <Database bar>
# Interval 60
# Service "service_name"
# <Database bar>
# Interval 60
# Service "service_name"
-# Query backend # predefined
+# Query backend
s
# predefined
# Query rt36_tickets
# </Database>
# <Database qux>
# Query rt36_tickets
# </Database>
# <Database qux>
@@
-1197,11
+1240,13
@@
# CollectFileDescriptor true
# CollectContextSwitch true
# CollectMemoryMaps true
# CollectFileDescriptor true
# CollectContextSwitch true
# CollectMemoryMaps true
+# CollectDelayAccounting false
# Process "name"
# ProcessMatch "name" "regex"
# <Process "collectd">
# CollectFileDescriptor false
# CollectContextSwitch false
# Process "name"
# ProcessMatch "name" "regex"
# <Process "collectd">
# CollectFileDescriptor false
# CollectContextSwitch false
+# CollectDelayAccounting true
# </Process>
# <ProcessMatch "name" "regex">
# CollectFileDescriptor false
# </Process>
# <ProcessMatch "name" "regex">
# CollectFileDescriptor false
@@
-1230,6
+1275,11
@@
# Host "redis.example.com"
# Port "6379"
# Timeout 2000
# Host "redis.example.com"
# Port "6379"
# Timeout 2000
+# <Query "LLEN myqueue">
+# #Database 0
+# Type "queue_length"
+# Instance "myqueue"
+# <Query>
# </Node>
#</Plugin>
# </Node>
#</Plugin>
@@
-1292,21
+1342,31
@@
#<Plugin snmp>
# <Data "powerplus_voltge_input">
#<Plugin snmp>
# <Data "powerplus_voltge_input">
-# Type "voltage"
# Table false
# Table false
-# Instance "input_line1"
+# Type "voltage"
+# TypeInstance "input_line1"
# Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
# </Data>
# <Data "hr_users">
# Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
# </Data>
# <Data "hr_users">
-# Type "users"
# Table false
# Table false
-# Instance ""
+# Type "users"
+# TypeInstance ""
# Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
# </Data>
# <Data "std_traffic">
# Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
# </Data>
# <Data "std_traffic">
+# Table true
# Type "if_octets"
# Type "if_octets"
+# TypeInstanceOID "IF-MIB::ifDescr"
+# #TypeInstancePrefix "port"
+# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
+# #FilterOID "IF-MIB::ifOperStatus"
+# #FilterValues "1", "2"
+# </Data>
+# <Data "interface_traffic">
# Table true
# Table true
-# Instance "IF-MIB::ifDescr"
+# Type "if_octets"
+# Plugin "interface"
+# PluginInstanceOID "IF-MIB::ifDescr"
# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
# </Data>
#
# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
# </Data>
#
@@
-1316,6
+1376,8
@@
# Community "community_string"
# Collect "std_traffic"
# Interval 120
# Community "community_string"
# Collect "std_traffic"
# Interval 120
+# Timeout 10
+# Retries 1
# </Host>
# <Host "some.server.mydomain.org">
# Address "192.168.0.42"
# </Host>
# <Host "some.server.mydomain.org">
# Address "192.168.0.42"
@@
-1329,6
+1391,8
@@
# Community "more_communities"
# Collect "powerplus_voltge_input"
# Interval 300
# Community "more_communities"
# Collect "powerplus_voltge_input"
# Interval 300
+# Timeout 5
+# Retries 5
# </Host>
#</Plugin>
# </Host>
#</Plugin>
@@
-1343,7
+1407,9
@@
# IndexOID "IF-MIB::ifIndex"
# SizeOID "IF-MIB::ifNumber"
# <Data "ifDescr">
# IndexOID "IF-MIB::ifIndex"
# SizeOID "IF-MIB::ifNumber"
# <Data "ifDescr">
-# Instance true
+# <IndexKey>
+# Source "PluginInstance"
+# </IndexKey>
# Plugin "interface"
# OIDs "IF-MIB::ifDescr"
# </Data>
# Plugin "interface"
# OIDs "IF-MIB::ifDescr"
# </Data>
@@
-1597,6
+1663,7
@@
# PluginInstanceFormat name
# Instances 1
# ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
# PluginInstanceFormat name
# Instances 1
# ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
+# PersistentNotification false
#</Plugin>
#<Plugin vmem>
#</Plugin>
#<Plugin vmem>
@@
-1636,6
+1703,7
@@
# Header "X-Custom-Header: custom_value"
# SSLVersion "TLSv1"
# Format "Command"
# 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
# Attribute "key" "value" # only available for KAIROSDB format
# TTL 0 # data ttl, only available for KAIROSDB format
# Metrics true