X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=f002063152a75fe7f1a259eae60a169154b35f02;hb=858760097213b8a4401472eb34c57add4a52e988;hp=c564e1f91f0d0bacb40cd6184fe6fc0f5086fccd;hpb=b34e15480992d9433a0e3fda47b5f6d387bfda5e;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index c564e1f9..f0020631 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -11,12 +11,13 @@
 ##############################################################################
 
 #Hostname    "localhost"
-FQDNLookup   true
+#FQDNLookup   true
 #BaseDir     "@prefix@/var/lib/@PACKAGE_NAME@"
 #PIDFile     "@prefix@/var/run/@PACKAGE_NAME@.pid"
 #PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
 #TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
 #Interval     10
+#Timeout      2
 #ReadThreads  5
 
 ##############################################################################
@@ -34,6 +35,7 @@ FQDNLookup   true
 #	LogLevel @DEFAULT_LOG_LEVEL@
 #	File STDOUT
 #	Timestamp true
+#	PrintSeverity false
 #</Plugin>
 
 #<Plugin syslog>
@@ -88,6 +90,7 @@ FQDNLookup   true
 #@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 +114,7 @@ FQDNLookup   true
 #@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
@@ -130,11 +134,14 @@ FQDNLookup   true
 #@BUILD_PLUGIN_UPTIME_TRUE@LoadPlugin uptime
 #@BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
 #@BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
+#@BUILD_PLUGIN_VARNISH_TRUE@LoadPlugin varnish
 #@BUILD_PLUGIN_VMEM_TRUE@LoadPlugin vmem
 #@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_ZEROMQ_TRUE@LoadPlugin zeromq
 #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
 ##############################################################################
@@ -145,10 +152,12 @@ FQDNLookup   true
 ##############################################################################
 
 #<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>
@@ -314,6 +323,7 @@ FQDNLookup   true
 #		MTime "-5m"
 #		Size "+10k"
 #		Recursive true
+#		IncludeHidden false
 #	</Directory>
 #</Plugin>
 
@@ -386,6 +396,7 @@ FQDNLookup   true
 #	InterfaceDevice "name:device"
 #	IgnoreSelected false
 #	HostnameFormat name
+#	InterfaceFormat name
 #</Plugin>
 
 #<Plugin madwifi>
@@ -410,6 +421,7 @@ FQDNLookup   true
 #		Key "page_key"
 #		<Match>
 #			Regex "(\\d+) bytes sent"
+#			ExcludeRegex "<lines to be excluded>"
 #			DSType CounterAdd
 #			Type "ipt_octets"
 #			Instance "type_instance"
@@ -422,6 +434,26 @@ FQDNLookup   true
 #	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"
@@ -501,16 +533,42 @@ FQDNLookup   true
 #</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 zeromq>
+#   # send data to this socket
+#   SendDataTo "tcp://localhost:6666"
+#   # listen for data on this socket
+#   ListenOn "tcp://*:6666"
+# </Plugin>
+
 #<Plugin nginx>
 #	URL "http://localhost/status?auto"
 #	User "www-user"
@@ -562,6 +620,10 @@ FQDNLookup   true
 
 #<Plugin openvpn>
 #	StatusFile "/etc/openvpn/openvpn-status.log"
+#	ImprovedNamingSchema false
+#	CollectCompression true
+#	CollectIndividualUsers true
+#	CollectUserCount false
 #</Plugin>
 
 #<Plugin oracle>
@@ -648,6 +710,7 @@ FQDNLookup   true
 #		Query magic
 #	</Database>
 #	<Database bar>
+#		Interval 60
 #		Service "service_name"
 #		Query backend # predefined
 #		Query rt36_tickets
@@ -688,6 +751,14 @@ FQDNLookup   true
 #	</Module>
 #</Plugin>
 
+#<Plugin redis>
+#   <Node example>
+#      Host "redis.example.com"
+#      Port "6379"
+#      Timeout 2000
+#   </Node>
+#</Plugin>
+
 #<Plugin routeros>
 #	<Router>
 #		Host "router.example.com"
@@ -841,6 +912,27 @@ FQDNLookup   true
 #	UUIDFile "/etc/uuid"
 #</Plugin>
 
+#<Plugin varnish>
+#   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>
 #	Verbose false
 #</Plugin>
@@ -849,9 +941,22 @@ FQDNLookup   true
 #	<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                                                       #
 #----------------------------------------------------------------------------#