From df5a16effafb5a90bc045f9ce17388a0133e28a9 Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc@bl.uem.li>
Date: Thu, 15 Dec 2016 22:35:07 +0100
Subject: [PATCH] collectd.conf: update for new plugins and config options

---
 debian/collectd.conf | 55 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/debian/collectd.conf b/debian/collectd.conf
index d903119..76a3f54 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -109,6 +109,7 @@ LoadPlugin cpu
 LoadPlugin df
 LoadPlugin disk
 #LoadPlugin dns
+#LoadPlugin dpdkstat
 #LoadPlugin drbd
 #LoadPlugin email
 LoadPlugin entropy
@@ -119,6 +120,7 @@ LoadPlugin entropy
 #LoadPlugin fscache
 #LoadPlugin gmond
 #LoadPlugin gps
+#LoadPlugin hugepages
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipc
@@ -194,6 +196,7 @@ LoadPlugin users
 #LoadPlugin write_http
 #LoadPlugin write_kafka
 #LoadPlugin write_log
+#LoadPlugin write_prometheus
 #LoadPlugin write_redis
 #LoadPlugin write_riemann
 #LoadPlugin write_sensu
@@ -294,6 +297,7 @@ LoadPlugin users
 #<Plugin battery>
 #	ValuesPercentage false
 #	ReportDegraded false
+#	QueryStateFS false
 #</Plugin>
 
 #<Plugin bind>
@@ -499,6 +503,16 @@ LoadPlugin users
 #	SelectNumericQueryTypes false
 #</Plugin>
 
+#<Plugin dpdkstat>
+#       Interval 1
+#       Coremask "0xf"
+#       ProcessType "secondary"
+#       FilePrefix "rte"
+#       EnabledPortMask 0xffff
+#       PortName "interface1"
+#       PortName "interface2"
+#</Plugin>
+
 #<Plugin email>
 #	SocketFile "/var/run/collectd-email"
 #	SocketGroup "collectd"
@@ -563,6 +577,14 @@ LoadPlugin users
 #	Port 7634
 #</Plugin>
 
+#<Plugin hugepages>
+#    ReportPerNodeHP  true
+#    ReportRootHP     true
+#    ValuesPages      true
+#    ValuesBytes      false
+#    ValuesPercentage false
+#</Plugin>
+
 #<Plugin interface>
 #	Interface "eth0"
 #	IgnoreSelected false
@@ -651,7 +673,8 @@ LoadPlugin users
 #	<Instance "local">
 #		Socket "/var/run/memcached.sock"
 # or:
-#		Host "127.0.0.1"
+#		#Host "memcache.example.com"
+#		Address "127.0.0.1"
 #		Port "11211"
 #	</Instance>
 #</Plugin>
@@ -1164,6 +1187,27 @@ LoadPlugin users
 #			Instance "local_user"
 #		</Match>
 #	</File>
+#	<File "/var/log/nginx/apache-time.log">
+#		#Use the following log format in nginx:
+#		#log_format response_time '[$host] "$upstream_response_time" ...'
+#		Instance "apache"
+#		<Match>
+#			Regex "^\\S+ \"([0-9.]+)\""
+#			<DSType Distribution>
+#				Percentile 80    # -> latency-foo-80
+#				Percentile 95    # -> latency-foo-95
+#				Percentile 99    # -> latency-foo-99
+#				Bucket 0   0.1   # -> bucket-latency-foo-0_0.1
+#				Bucket 0.1 0.2   # -> bucket-latency-foo-0.1_0.2
+#				Bucket 0.2 0.5   # -> bucket-latency-foo-0.2_0.5
+#				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
+#			</DSType>
+#			Type "latency"
+#			Instance "foo"
+#		</Match>
+#	</File>
 #</Plugin>
 
 #<Plugin tail_csv>
@@ -1287,6 +1331,8 @@ LoadPlugin users
 #	RefreshInterval 60
 #	Domain "name"
 #	BlockDevice "name:device"
+#	BlockDeviceFormat target
+#	BlockDeviceFormatBasename false
 #	InterfaceDevice "name:device"
 #	IgnoreSelected false
 #	HostnameFormat name
@@ -1310,6 +1356,9 @@ LoadPlugin users
 #		StoreRates true
 #		AlwaysAppendDS false
 #		EscapeCharacter "_"
+#		SeparateInstances false
+#		PreserveSeparator false
+#		DropDuplicateFields false
 #	</Node>
 #</Plugin>
 
@@ -1345,6 +1394,10 @@ LoadPlugin users
 #	</Topic>
 #</Plugin>
 
+#<Plugin write_prometheus>
+#	Port "9103"
+#</Plugin>
+
 #<Plugin write_redis>
 #	<Node "example">
 #		Host "localhost"
-- 
2.30.2