X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollectd.conf.in;h=42addd270084f09c41f9ead41de8704773d22e18;hb=626041ce6fa004ce49c183f35147f762a63cf302;hp=8cb3fcebeb04bd681a8c05f99692ffbb4091d225;hpb=e73f418e3fcbbe94f95a688094fdb4fde4db33f0;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 8cb3fceb..42addd27 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -17,6 +17,7 @@
 #PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
 #TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
 #Interval     10
+#Timeout      2
 #ReadThreads  5
 
 ##############################################################################
@@ -34,6 +35,7 @@
 #	LogLevel @DEFAULT_LOG_LEVEL@
 #	File STDOUT
 #	Timestamp true
+#	PrintSeverity false
 #</Plugin>
 
 #<Plugin syslog>
@@ -50,6 +52,7 @@
 # to missing dependencies or because they have been deactivated explicitly.  #
 ##############################################################################
 
+#@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
 #@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 #@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
 #@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
@@ -88,6 +91,7 @@
 #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec
 #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory
+#@BUILD_PLUGIN_MODBUS_TRUE@LoadPlugin modbus
 #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter
 #@BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
 #@BUILD_PLUGIN_NETAPP_TRUE@LoadPlugin netapp
@@ -111,6 +115,7 @@
 #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
 #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols
 #@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
+#@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
 #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
 #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
 @LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
@@ -135,6 +140,7 @@
 #@BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
 #@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
 #@BUILD_PLUGIN_WRITE_HTTP_TRUE@LoadPlugin write_http
+#@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
 #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
@@ -145,11 +151,27 @@
 # ription of those options is available in the collectd.conf(5) manual page. #
 ##############################################################################
 
+#<Plugin "amqp">
+#  <Publish "name">
+#    Host "localhost"
+#    Port "5672"
+#    VHost "/"
+#    User "guest"
+#    Password "guest"
+#    Exchange "amq.fanout"
+#    RoutingKey "collectd"
+#    Persistent false
+#    StoreRates false
+#  </Publish>
+#</Plugin>
+
 #<Plugin apache>
-#	URL "http://localhost/status?auto"
-#	User "www-user"
-#	Password "secret"
-#	CACert "/etc/ssl/ca.crt"
+#  <Instance "local">
+#    URL "http://localhost/status?auto"
+#    User "www-user"
+#    Password "secret"
+#    CACert "/etc/ssl/ca.crt"
+#  </Instance>
 #</Plugin>
 
 #<Plugin apcups>
@@ -315,6 +337,7 @@
 #		MTime "-5m"
 #		Size "+10k"
 #		Recursive true
+#		IncludeHidden false
 #	</Directory>
 #</Plugin>
 
@@ -412,6 +435,7 @@
 #		Key "page_key"
 #		<Match>
 #			Regex "(\\d+) bytes sent"
+#			ExcludeRegex "<lines to be excluded>"
 #			DSType CounterAdd
 #			Type "ipt_octets"
 #			Instance "type_instance"
@@ -424,6 +448,26 @@
 #	Port "11211"
 #</Plugin>
 
+#<Plugin modbus>
+#	<Data "data_name">
+#		RegisterBase 1234
+#		RegisterType float
+#		Type gauge
+#		Instance "..."
+#	</Data>
+#
+#	<Host "name">
+#		Address "addr"
+#		Port "1234"
+#		Interval 60
+#
+#		<Slave 1>
+#			Instance "foobar" # optional
+#			Collect "data_name"
+#		</Slave>
+#	</Host>
+#</Plugin>
+
 #<Plugin mysql>
 #	<Database db_name>
 #		Host "database.serv.er"
@@ -503,14 +547,33 @@
 #</Plugin>
 
 @LOAD_PLUGIN_NETWORK@<Plugin network>
+#	# client setup:
 @LOAD_PLUGIN_NETWORK@	Server "ff18::efc0:4a42" "25826"
-@LOAD_PLUGIN_NETWORK@	Server "239.192.74.66" "25826"
-#	Listen "ff18::efc0:4a42" "25826"
-#	Listen "239.192.74.66" "25826"
+@LOAD_PLUGIN_NETWORK@	<Server "239.192.74.66" "25826">
+#		SecurityLevel Encrypt
+#		Username "user"
+#		Password "secret"
+#		Interface "eth0"
+@LOAD_PLUGIN_NETWORK@	</Server>
 #	TimeToLive "128"
-#	Forward false
-#	CacheFlush 1800
+#
+#	# server setup:
+#	Listen "ff18::efc0:4a42" "25826"
+#	<Listen "239.192.74.66" "25826">
+#		SecurityLevel Sign
+#		AuthFile "/etc/collectd/passwd"
+#		Interface "eth0"
+#	</Listen>
+#	MaxPacketSize 1024
+#
+#	# proxy setup (client and server as above):
+#	Forward true
+#
+#	# statistics about the network plugin itself
 #	ReportStats false
+#
+#	# "garbage collection"
+#	CacheFlush 1800
 @LOAD_PLUGIN_NETWORK@</Plugin>
 
 #<Plugin nginx>
@@ -564,6 +627,10 @@
 
 #<Plugin openvpn>
 #	StatusFile "/etc/openvpn/openvpn-status.log"
+#	ImprovedNamingSchema false
+#	CollectCompression true
+#	CollectIndividualUsers true
+#	CollectUserCount false
 #</Plugin>
 
 #<Plugin oracle>
@@ -650,6 +717,7 @@
 #		Query magic
 #	</Database>
 #	<Database bar>
+#		Interval 60
 #		Service "service_name"
 #		Query backend # predefined
 #		Query rt36_tickets
@@ -690,6 +758,14 @@
 #	</Module>
 #</Plugin>
 
+#<Plugin redis>
+#   <Node example>
+#      Host "redis.example.com"
+#      Port "6379"
+#      Timeout 2000
+#   </Node>
+#</Plugin>
+
 #<Plugin routeros>
 #	<Router>
 #		Host "router.example.com"
@@ -844,83 +920,24 @@
 #</Plugin>
 
 #<Plugin varnish>
-#  Will monitor :
-#  - cache hits
-#  - cache misses
-#  - cache hits for pass
-#  MonitorCache yes
-#
-#  Will monitor :
-#  - client connections accepted
-#  - connection dropped
-#  - client requests received
-#  MonitorConnections yes
-#
-#  Will monitor:
-#  - Objects ESI parsed
-#  - ESI parse errors
-#  MonitorESI yes
-#
-#  Will monitor:
-#  - backend connection : success
-#  - backend connection : not attempted
-#  - backend connection : too many
-#  - backend connection : failures
-#  - backend connection : reuses
-#  - backend connection : was closed
-#  - backend connection : recycles
-#  - backend connection : unused
-#  MonitorBackend yes
-#
-#  Will monitor:
-#  - fetch head
-#  - fetch with Length
-#  - fetch chunked
-#  - fetch EOF
-#  - fetch had bad headers
-#  - fetch wanted close
-#  - fetch pre HTTP/1.1 closed
-#  - fetch zero length
-#  - fetch failed
-#  MonitorFetch yes
-#
-#  Will monitor:
-#  - HCB lookups without lock
-#  - HCB lookups with lock
-#  - HCB inserts
-#  MonitorHCB yes
-#
-#  Will monitor:
-#  - SHM records
-#  - SHM writes
-#  - SHM flushes due to overflow
-#  - SHM MTX contention
-#  - SHM cycles through buffer
-#  MonitorSHM yes
-#
-#  Will monitor:
-#  - SMA allocator requests
-#  - SMA outstanding allocations
-#  - SMA outstanding bytes
-#  - SMA bytes allocated
-#  - SMA bytes free
-#  MonitorSMA yes
-#
-#  Will monitor:
-#  - SMS allocator requests
-#  - SMS outstanding allocations
-#  - SMS outstanding bytes
-#  - SMS bytes allocated
-#  - SMS bytes freed
-#  MonitorSMS yes
-#
-#  Will monitor:
-#  - allocator requests
-#  - outstanding allocations
-#  - bytes allocated
-#  - bytes free
-#  MonitorSM yes
-#
+#   This tag support an argument if you want to
+#   monitor the local instance just use </Instance>
+#   If you prefer defining another instance you can do
+#   so by using <Instance "myinstance">
+#   <Instance>
+#      CollectCache true
+#      CollectBackend true
+#      CollectConnections true
+#      CollectSHM true
+#      CollectESI false
+#      CollectFetch false
+#      CollectHCB false
+#      CollectSMA false
+#      CollectSMS false
+#      CollectSM false
+#      CollectTotals false
+#      CollectWorkers false
+#   </Instance>
 #</Plugin>
 
 #<Plugin vmem>
@@ -931,9 +948,22 @@
 #	<URL "http://example.com/collectd-post">
 #		User "collectd"
 #		Password "weCh3ik0"
+#		VerifyPeer true
+#		VerifyHost true
+#		CACert "/etc/ssl/ca.crt"
+#		Format "Command"
+#		StoreRates false
 #	</URL>
 #</Plugin>
 
+#<Plugin write_redis>
+#	<Node "example">
+#		Host "localhost"
+#		Port "6379"
+#		Timeout 1000
+#	</Node>
+#</Plugin>
+
 ##############################################################################
 # Filter configuration                                                       #
 #----------------------------------------------------------------------------#