From 0c890c36de5c1f39b2ee291297a5bbbd1a8fa5f6 Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc@bl.uem.li>
Date: Fri, 23 Feb 2018 10:16:51 +0100
Subject: [PATCH] collectd.conf: pull in upstream updates for 5.8

---
 debian/collectd.conf | 174 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 160 insertions(+), 14 deletions(-)

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 16a9d36..fc42491 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -109,6 +109,7 @@ LoadPlugin cpu
 LoadPlugin df
 LoadPlugin disk
 #LoadPlugin dns
+#LoadPlugin dpdkevents
 #LoadPlugin dpdkstat
 #LoadPlugin drbd
 #LoadPlugin email
@@ -136,6 +137,7 @@ LoadPlugin load
 #LoadPlugin lvm
 #LoadPlugin madwifi
 #LoadPlugin mbmon
+#LoadPlugin mcelog
 #LoadPlugin md
 #LoadPlugin memcachec
 #LoadPlugin memcached
@@ -158,6 +160,8 @@ LoadPlugin memory
 #LoadPlugin onewire
 #LoadPlugin openldap
 #LoadPlugin openvpn
+#LoadPlugin ovs_events
+#LoadPlugin ovs_stats
 #LoadPlugin perl
 #LoadPlugin pinba
 #LoadPlugin ping
@@ -174,6 +178,7 @@ LoadPlugin rrdtool
 #LoadPlugin sigrok
 #LoadPlugin smart
 #LoadPlugin snmp
+#LoadPlugin snmp_agent
 #LoadPlugin statsd
 LoadPlugin swap
 #LoadPlugin table
@@ -356,6 +361,9 @@ LoadPlugin users
 #	ReportByCpu true
 #	ReportByState true
 #	ValuesPercentage false
+#	ReportNumCpu false
+#	ReportGuestState false
+#	SubtractGuestState true
 #</Plugin>
 
 #<Plugin csv>
@@ -420,6 +428,7 @@ LoadPlugin users
 #<Plugin curl_xml>
 #	<URL "http://localhost/stats.xml">
 #		Host "my_host"
+#		#Plugin "stats"
 #		Instance "some_instance"
 #		User "collectd"
 #		Password "thaiNg0I"
@@ -434,6 +443,7 @@ LoadPlugin users
 #			Type "magic_level"
 #			InstancePrefix "prefix-"
 #			InstanceFrom "td[1]"
+#			#PluginInstanceFrom "td[1]"
 #			ValuesFrom "td[2]/span[@class=\"level\"]"
 #		</XPath>
 #	</URL>
@@ -454,6 +464,7 @@ LoadPlugin users
 #	</Query>
 #
 #	<Database "customers_db">
+#		#Plugin "mycompany"
 #		Driver "mysql"
 #		DriverOption "host" "localhost"
 #		DriverOption "username" "collectd"
@@ -506,14 +517,39 @@ LoadPlugin users
 #	SelectNumericQueryTypes false
 #</Plugin>
 
+#<Plugin "dpdkevents">
+#	<EAL>
+#		Coremask "0x1"
+#		MemoryChannels "4"
+#		FilePrefix "rte"
+#	</EAL>
+#	<Event "link_status">
+#		SendEventsOnUpdate true
+#		EnabledPortMask 0xffff
+#		PortName "interface1"
+#		PortName "interface2"
+#		SendNotification false
+#	</Event>
+#	<Event "keep_alive">
+#		SendEventsOnUpdate true
+#		LCoreMask "0xf"
+#		KeepAliveShmName "/dpdk_keepalive_shm_name"
+#		SendNotification false
+#	</Event>
+#</Plugin>
+
 #<Plugin dpdkstat>
-#       Interval 1
-#       Coremask "0xf"
-#       ProcessType "secondary"
-#       FilePrefix "rte"
-#       EnabledPortMask 0xffff
-#       PortName "interface1"
-#       PortName "interface2"
+#	<EAL>
+#		Coremask "0x2"
+#		MemoryChannels "4"
+#		FilePrefix "rte"
+#		LogLevel "7"
+#		RteDriverLibPath "/usr/lib/dpdk-pmd"
+#	</EAL>
+#	SharedMemObj "dpdk_collectd_stats_0"
+#	EnabledPortMask 0xffff
+#	PortName "interface1"
+#	PortName "interface2"
 #</Plugin>
 
 #<Plugin email>
@@ -543,12 +579,17 @@ LoadPlugin users
 
 #<Plugin filecount>
 #	<Directory "/path/to/dir">
+#		#Plugin "foo"
 #		Instance "foodir"
 #		Name "*.conf"
 #		MTime "-5m"
 #		Size "+10k"
 #		Recursive true
 #		IncludeHidden false
+#		RegularOnly true
+#		#FilesSizeType "bytes"
+#		#FilesCountType "files"
+#		#TypeInstance "instance"
 #	</Directory>
 #</Plugin>
 
@@ -615,12 +656,33 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin ipmi>
-#	Sensor "some_sensor"
-#	Sensor "another_one"
-#	IgnoreSelected false
-#	NotifySensorAdd false
-#	NotifySensorRemove true
-#	NotifySensorNotPresent false
+#	<Instance "local">
+#		Sensor "some_sensor"
+#		Sensor "another_one"
+#		IgnoreSelected false
+#		NotifySensorAdd false
+#		NotifySensorRemove true
+#		NotifySensorNotPresent false
+#		NotifyIPMIConnectionState false
+#		SELEnabled false
+#		SELClearEvent false
+#	</Instance>
+#	<Instance "remote">
+#		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
+#	</Instance>
 #</Plugin>
 
 #<Plugin iptables>
@@ -672,6 +734,14 @@ LoadPlugin users
 #	Port 411
 #</Plugin>
 
+#<Plugin mcelog>
+#	<Memory>
+#		McelogClientSocket "/var/run/mcelog-client"
+#		PersistentNotification false
+#	</Memory>
+#	McelogLogfile "/var/log/mcelog"
+#</Plugin>
+
 #<Plugin md>
 #	Device "/dev/md0"
 #	IgnoreSelected false
@@ -829,6 +899,12 @@ LoadPlugin users
 #	CacheFlush 1800
 #</Plugin>
 
+#<Plugin nfs>
+#	ReportV2 false
+#	ReportV3 false
+#	ReportV4 false
+#</Plugin>
+
 #<Plugin nginx>
 #	URL "http://localhost/status?auto"
 #	User "www-user"
@@ -870,6 +946,10 @@ LoadPlugin users
 
 #<Plugin nut>
 #	UPS "upsname@hostname:port"
+#	ForceSSL true
+#	VerifyPeer true
+#	CAPath "/path/to/folder"
+#	#ConnectTimeout 5000
 #</Plugin>
 
 #<Plugin olsrd>
@@ -905,6 +985,22 @@ LoadPlugin users
 #	CollectUserCount false
 #</Plugin>
 
+#<Plugin ovs_events>
+#	Port "6640"
+#	Address "127.0.0.1"
+#	Socket "/var/run/openvswitch/db.sock"
+#	Interfaces "br0" "veth0"
+#	SendNotification true
+#	DispatchValues false
+#</Plugin>
+#
+#<Plugin ovs_stats>
+#	Port "6640"
+#	Address "127.0.0.1"
+#	Socket "/var/run/openvswitch/db.sock"
+#	Bridges "br0" "br_ext"
+#</Plugin>
+
 #<Plugin perl>
 #	IncludeDir "/my/include/path"
 #	BaseName "Collectd::Plugins"
@@ -974,6 +1070,7 @@ LoadPlugin users
 #	</Writer>
 #
 #	<Database foo>
+#		#Plugin "kingdom"
 #		Host "hostname"
 #		Port 5432
 #		User "username"
@@ -989,7 +1086,7 @@ LoadPlugin users
 #		Interval 60
 #		Service "service_name"
 #
-#		Query backend # predefined
+#		Query backends # predefined
 #		Query rt36_tickets
 #	</Database>
 #
@@ -1016,8 +1113,19 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin processes>
+#	CollectFileDescriptor true
+#	CollectContextSwitch true
+#	CollectMemoryMaps true
 #	Process "name"
 #	ProcessMatch "foobar" "/usr/bin/perl foobar\\.pl.*"
+#	<Process "collectd">
+#		CollectFileDescriptor false
+#		CollectContextSwitch false
+#	</Process>
+#	<ProcessMatch "name" "regex">
+#		CollectFileDescriptor false
+#		CollectContextSwitch true
+#	</Process>
 #</Plugin>
 
 #<Plugin protocols>
@@ -1134,6 +1242,8 @@ LoadPlugin users
 #		Community "community_string"
 #		Collect "std_traffic"
 #		Inverval 120
+#		Timeout 10
+#		Retries 1
 #	</Host>
 #	<Host "some.server.mydomain.org">
 #		Address "192.168.0.42"
@@ -1147,9 +1257,35 @@ LoadPlugin users
 #		Community "more_communities"
 #		Collect "powerplus_voltge_input"
 #		Interval 300
+#		Timeout 5
+#		Retries 5
 #	</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"
@@ -1170,10 +1306,14 @@ LoadPlugin users
 #<Plugin swap>
 #	ReportByDevice false
 #	ReportBytes true
+#	ValuesAbsolute true
+#	ValuesPercentage false
+#	ReportIO true
 #</Plugin>
 
 #<Plugin table>
 #	<Table "/proc/slabinfo">
+#		#Plugin "table"
 #		Instance "slabinfo"
 #		Separator " "
 #		<Result>
@@ -1225,6 +1365,7 @@ LoadPlugin users
 #				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"
@@ -1366,6 +1507,8 @@ LoadPlugin users
 #	HostnameFormat name
 #	InterfaceFormat name
 #	PluginInstanceFormat name
+#	Instances 1
+#	ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
 #</Plugin>
 
 #<Plugin vmem>
@@ -1405,6 +1548,9 @@ LoadPlugin users
 #		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
 #		Notifications false
 #		StoreRates false
-- 
2.30.2