From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 3 Jun 2010 12:35:20 +0000 (+0200)
Subject: {collectd,filters}.conf: Added new config options.
X-Git-Tag: collectd-4.10.0-1~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=18ec960ae8f6d90b7f82edf58265d09742f38edf;p=pkg-collectd.git

{collectd,filters}.conf: Added new config options.
---

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 5eea349..b5fc462 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -12,6 +12,7 @@ FQDNLookup true
 #PluginDir "/usr/lib/collectd"
 #TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
 #Interval 10
+#Timeout 2
 #ReadThreads 5
 
 #LoadPlugin logfile
@@ -21,6 +22,7 @@ LoadPlugin syslog
 #	LogLevel "info"
 #	File STDOUT
 #	Timestamp true
+#	PrintSeverity false
 #</Plugin>
 
 <Plugin syslog>
@@ -299,6 +301,7 @@ LoadPlugin users
 #		MTime "-5m"
 #		Size "+10k"
 #		Recursive true
+#		IncludeHidden false
 #	</Directory>
 #</Plugin>
 
@@ -351,6 +354,7 @@ LoadPlugin users
 
 #<Plugin java>
 #	JVMArg "-verbose:jni"
+#	JVMArg "-Djava.class.path=/usr/share/collectd/java/collectd-api.jar"
 #
 #	LoadPlugin "org.collectd.java.GenericJMX"
 #	<Plugin "GenericJMX">
@@ -391,6 +395,7 @@ LoadPlugin users
 #		Key "page_key"
 #		<Match>
 #			Regex "(\\d+) bytes sent"
+#			ExcludeRegex "<lines to be excluded>"
 #			DSType CounterAdd
 #			Type "ipt_octets"
 #			Instance "type_instance"
@@ -439,6 +444,7 @@ LoadPlugin users
 #		SecurityLevel Encrypt
 #		Username "user"
 #		Password "secret"
+#		Interface "eth0"
 #	</Server>
 #	TimeToLive "128"
 #
@@ -447,6 +453,7 @@ LoadPlugin users
 #	<Listen "239.192.74.66" "25826">
 #		SecurityLevel Sign
 #		AuthFile "/etc/collectd/passwd"
+#		Interface "eth0"
 #	</Listen>
 #	MaxPacketSize 1024
 #
@@ -455,6 +462,9 @@ LoadPlugin users
 #
 #	# statistics about the network plugin itself
 #	ReportStats false
+#
+#	# "garbage collection"
+#	CacheFlush 1800
 #</Plugin>
 
 #<Plugin nginx>
@@ -505,6 +515,10 @@ LoadPlugin users
 
 #<Plugin openvpn>
 #	StatusFile "/etc/openvpn/openvpn-status.log"
+#	ImprovedNamingSchema false
+#	CollectCompression true
+#	CollectIndividualUsers true
+#	CollectUserCount false
 #</Plugin>
 
 #<Plugin perl>
@@ -582,6 +596,7 @@ LoadPlugin users
 #	</Database>
 #
 #	<Database bar>
+#		Interval 60
 #		Service "service_name"
 #
 #		Query backend # predefined
@@ -731,6 +746,7 @@ LoadPlugin users
 #		</Match>
 #		<Match>
 #			Regex "\\<R=local_user\\>"
+#			ExcludeRegex "\\<R=local_user\\>.*mail_spool defer"
 #			DSType "CounterInc"
 #			Type "counter"
 #			Instance "local_user"
@@ -784,6 +800,11 @@ LoadPlugin users
 #	<URL "http://example.com/collectd-post">
 #		User "collectd"
 #		Password "secret"
+#		VerifyPeer true
+#		VerifyHost true
+#		CACert "/etc/ssl/ca.crt"
+#		Format "Command"
+#		StoreRates false
 #	</URL>
 #</Plugin>
 
diff --git a/debian/filters.conf b/debian/filters.conf
index ecc7c75..1304b6f 100644
--- a/debian/filters.conf
+++ b/debian/filters.conf
@@ -20,6 +20,7 @@
 #	<Rule "no_fqdn">
 #		<Match "regex">
 #			Host "^[^\.]*$"
+#			Invert false
 #		</Match>
 #		Target "stop"
 #	</Rule>