Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 98449c5..8a05912 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -111,22 +111,23 @@ FQDNLookup   true
 #      CACert "/etc/ssl/ca.crt"
 #</Plugin>
 
-#<Plugin bind>
-#      URL "http://localhost:8053/"
-#      # Features
-#      Requests true
-#      Rejects true
-#      Responses true
-#      Queries true
-#      RCode true
-#      ZoneStats true
-#      OpCodes true
-#      Resolver true
-#      DNSSEC true
-#      RRQueriesIn true
-#      QueryResults true
-#      Updates true
-#      ZoneMaintenance true
+#<Plugin "bind">
+#  URL "http://localhost:8053/"
+#  OpCodes         true
+#  QTypes          true
+#
+#  ServerStats     true
+#  ZoneMaintStats  true
+#  ResolverStats   false
+#  MemoryStats     true
+#
+#  <View "_default">
+#    QTypes        true
+#    ResolverStats true
+#    CacheRRSets   true
+#
+#    Zone "127.in-addr.arpa/IN"
+#  </View>
 #</Plugin>
 
 #<Plugin csv>
@@ -537,6 +538,7 @@ FQDNLookup   true
 # Load required matches:
 #@BUILD_PLUGIN_MATCH_REGEX_TRUE@LoadPlugin match_regex
 #@BUILD_PLUGIN_MATCH_VALUE_TRUE@LoadPlugin match_value
+#@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@LoadPlugin match_timediff
 
 # Load required targets:
 #@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@LoadPlugin target_notification