From b573264234d3b671feb399555234cbb5bd2684e1 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 24 Sep 2016 14:16:10 +0200
Subject: [PATCH] collectd.conf: Update for 5.6.0.

---
 debian/collectd.conf | 86 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 2c91a5b..f1759b6 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -95,10 +95,12 @@ LoadPlugin battery
 #LoadPlugin bind
 #LoadPlugin ceph
 #LoadPlugin cgroups
+#LoadPlugin chrony
 #LoadPlugin conntrack
 #LoadPlugin contextswitch
 LoadPlugin cpu
 #LoadPlugin cpufreq
+#LoadPlugin cpusleep
 #LoadPlugin csv
 #LoadPlugin curl
 #LoadPlugin curl_json
@@ -116,6 +118,7 @@ LoadPlugin entropy
 #LoadPlugin filecount
 #LoadPlugin fscache
 #LoadPlugin gmond
+#LoadPlugin gps
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipc
@@ -125,6 +128,7 @@ LoadPlugin interface
 LoadPlugin irq
 #LoadPlugin java
 LoadPlugin load
+#LoadPlugin lua
 #LoadPlugin lvm
 #LoadPlugin madwifi
 #LoadPlugin mbmon
@@ -133,6 +137,7 @@ LoadPlugin load
 #LoadPlugin memcached
 LoadPlugin memory
 #LoadPlugin modbus
+#LoadPlugin mqtt
 #LoadPlugin multimeter
 #LoadPlugin mysql
 #LoadPlugin netlink
@@ -141,6 +146,7 @@ LoadPlugin memory
 #LoadPlugin nginx
 #LoadPlugin notify_desktop
 #LoadPlugin notify_email
+#LoadPlugin notify_nagios
 #LoadPlugin ntpd
 #LoadPlugin numa
 #LoadPlugin nut
@@ -192,6 +198,7 @@ LoadPlugin users
 #LoadPlugin write_riemann
 #LoadPlugin write_sensu
 #LoadPlugin write_tsdb
+#LoadPlugin xencpu
 #LoadPlugin zfs_arc
 #LoadPlugin zookeeper
 
@@ -262,6 +269,7 @@ LoadPlugin users
 #	Host "localhost"
 #	Port "3551"
 #	ReportSeconds true
+#	PersistentConnection true
 #</Plugin>
 
 #<Plugin ascent>
@@ -326,6 +334,12 @@ LoadPlugin users
 #	</Daemon>
 #</Plugin>
 
+#<Plugin chrony>
+#	Host    "localhost"
+#	Port    "323"
+#	Timeout "2"
+#</Plugin>
+
 #<Plugin cgroups>
 #	CGroup "libvirt"
 #	IgnoreSelected false
@@ -537,6 +551,13 @@ LoadPlugin users
 #	</Metric>
 #</Plugin>
 
+#<Plugin gps>
+#	Host "127.0.0.1"
+#	Port "2947"
+#	Timeout 0.015
+#	PauseConnect 5
+#</Plugin>
+
 #<Plugin hddtemp>
 #	Host "127.0.0.1"
 #	Port 7634
@@ -545,6 +566,8 @@ LoadPlugin users
 #<Plugin interface>
 #	Interface "eth0"
 #	IgnoreSelected false
+#	ReportInactive true
+#	UniqueName false
 #</Plugin>
 
 #<Plugin ipmi>
@@ -583,6 +606,12 @@ LoadPlugin users
 #	ReportRelative true
 #</Plugin>
 
+#<Plugin lua>
+#	BasePath "/usr/share/collectd/lua"
+#	Script "script1.lua"
+#	Script "script2.lua"
+#</Plugin>
+
 #<Plugin madwifi>
 #	Interface "wlan0"
 #	IgnoreSelected false
@@ -653,6 +682,35 @@ LoadPlugin users
 #	</Host>
 #</Plugin>
 
+#<Plugin mqtt>
+#	<Publish "name">
+#		Host "localhost"
+#		Port 1883
+#		ClientId "localhost"
+#		User "user"
+#		Password "secret"
+#		QoS 0
+#		Prefix "collectd"
+#		StoreRates true
+#		Retain false
+#		CACert "/etc/ssl/ca.crt"
+#		CertificateFile "/etc/ssl/client.crt"
+#		CertificateKeyFile "/etc/ssl/client.pem"
+#		TLSProtocol "tlsv1.2"
+#		CipherSuite "ciphers"
+#	<Publish>
+#	<Subscribe "name">
+#		Host "localhost"
+#		Port 1883
+#		ClientId "localhost"
+#		User "user"
+#		Password "secret"
+#		QoS 2
+#		Topic "collectd/#"
+#		CleanSession true
+#	</Subscribe>
+#</Plugin>
+
 #<Plugin mysql>
 #	<Database db_name>
 #		Host "database.serv.er"
@@ -660,6 +718,11 @@ LoadPlugin users
 #		User "db_user"
 #		Password "secret"
 #		Database "db_name"
+#		SSLKey "/path/to/key.pem"
+#		SSLCert "/path/to/cert.pem"
+#		SSLCA "/path/to/ca.pem"
+#		SSLCAPath "/path/to/cas/"
+#		SSLCipher "DHE-RSA-AES256-SHA"
 #		MasterStats true
 #		ConnectTimeout 10
 #		InnodbStats true
@@ -672,6 +735,13 @@ LoadPlugin users
 #		SlaveStats true
 #		SlaveNotifications true
 #	</Database>
+#
+#	<Database galera>
+#		Alias "galera"
+#		Host "localhost"
+#		Socket "/var/run/mysql/mysqld.sock"
+#		WsrepStats true
+#	</Database>
 #</Plugin>
 
 #<Plugin netlink>
@@ -742,6 +812,10 @@ LoadPlugin users
 #	Recipient "email2@domain2.com"
 #</Plugin>
 
+#<Plugin notify_nagios>
+#	CommandFile "/usr/local/nagios/var/rw/nagios.cmd"
+#</Plugin>
+
 #<Plugin ntpd>
 #	Host "localhost"
 #	Port 123
@@ -1038,6 +1112,7 @@ LoadPlugin users
 #	DeleteTimers   false
 #	DeleteGauges   false
 #	DeleteSets     false
+#	CounterSum     false
 #	TimerPercentile 90.0
 #	TimerPercentile 95.0
 #	TimerPercentile 99.0
@@ -1151,10 +1226,10 @@ LoadPlugin users
 ##	None of the following option should be set manually
 ##	This plugin automatically detect most optimal options
 ##	Only set values here if:
-##	- The module ask you to
+##	- The module asks you to
 ##	- You want to disable the collection of some data
-##	- Your (intel) CPU is not supported (yet) by the module
-##	- The module generate a lot of errors 'MSR offset 0x... read failed'
+##	- Your (Intel) CPU is not supported (yet) by the module
+##	- The module generates a lot of errors 'MSR offset 0x... read failed'
 ##	In the last two cases, please open a bug request
 #
 #	TCCActivationTemp "100"
@@ -1228,6 +1303,7 @@ LoadPlugin users
 #		Host "localhost"
 #		Port "2003"
 #		Protocol "tcp"
+#		ReconnectInterval 0
 #		LogSendErrors true
 #		Prefix "collectd"
 #		Postfix "collectd"
@@ -1249,12 +1325,16 @@ LoadPlugin users
 #		ClientKey "/etc/ssl/client.pem"
 #		ClientCert "/etc/ssl/client.crt"
 #		ClientKeyPass "secret"
+#		Header "X-Custom-Header: custom_value"
 #		SSLVersion "TLSv1"
 #		Format "Command"
+#		Metrics true
+#		Notifications false
 #		StoreRates false
 #		BufferSize 4096
 #		LowSpeedLimit 0
 #		Timeout 0
+#		Prefix "collectd/"
 #	</Node>
 #</Plugin>
 
-- 
2.30.2