*.conf: Updated to reflect changes in 5.0.0.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index b5fc462a6ac48126122eb2b6e19cbda81851e0f0..9f1a918f851cfd3f4ee14e1e79a2b41ca53d38f8 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -29,6 +29,7 @@ LoadPlugin syslog
        LogLevel info
 </Plugin>
 
+#LoadPlugin amqp
 #LoadPlugin apache
 #LoadPlugin apcups
 #LoadPlugin ascent
@@ -103,11 +104,26 @@ LoadPlugin swap
 #LoadPlugin uptime
 LoadPlugin users
 #LoadPlugin uuid
+#LoadPlugin varnish
 #LoadPlugin vmem
 #LoadPlugin vserver
 #LoadPlugin wireless
 #LoadPlugin write_http
 
+#<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>
 #      <Instance "foo">
 #              URL "http://localhost/server-status?auto"
@@ -324,7 +340,6 @@ LoadPlugin users
 #<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port 7634
-#      TranslateDevicename false
 #</Plugin>
 
 #<Plugin interface>
@@ -371,6 +386,7 @@ LoadPlugin users
 #      InterfaceDevice "name:device"
 #      IgnoreSelected false
 #      HostnameFormat name
+#      InterfaceFormat name
 #</Plugin>
 
 #<Plugin madwifi>
@@ -786,12 +802,34 @@ LoadPlugin users
 #      SocketFile "/var/run/collectd-unixsock"
 #      SocketGroup "collectd"
 #      SocketPerms "0660"
+#      DeleteSocket false
 #</Plugin>
 
 #<Plugin uuid>
 #      UUIDFile "/etc/uuid"
 #</Plugin>
 
+#<Plugin varnish>
+#      <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>
+#
+#      <Instance "myinstance">
+#              CollectCache true
+#      </Instance>
+#</Plugin>
+
 #<Plugin vmem>
 #      Verbose false
 #</Plugin>

diff --git a/debian/filters.conf b/debian/filters.conf
index 1304b6ff0c375560e3423461ca2e12e462ca133d..5dbf89003be9aebd196cb75cbc6c8f89fef05ac6 100644 (file)
--- a/debian/filters.conf
+++ b/debian/filters.conf
@@ -15,6 +15,7 @@
 #LoadPlugin target_replace
 #LoadPlugin target_scale
 #LoadPlugin target_set
+#LoadPlugin target_v5upgrade
 
 #<Chain "PreCache">
 #      <Rule "no_fqdn">
@@ -26,6 +27,7 @@
 #      </Rule>
 #</Chain>
 
+# Default behavior:
 #<Chain "PostCache">
 #      Target "write"
 #</Chain>

diff --git a/debian/thresholds.conf b/debian/thresholds.conf
index c28bbe2468b89662fdfacaf2a65ba1990890f533..53c62beebcc97c8103272212aff533e4e5c742ce 100644 (file)
--- a/debian/thresholds.conf
+++ b/debian/thresholds.conf
@@ -2,7 +2,8 @@
 #
 # See the section "THRESHOLD CONFIGURATION" in collectd.conf(5) for details.
 
-#<Threshold>
+#LoadPlugin "threshold"
+#<Plugin "threshold">
 #      <Type "counter">
 #              WarningMin 0.00
 #              WarningMax 1000.00
@@ -13,11 +14,6 @@
 #              Instance "some_instance"
 #      </Type>
 #
-#      <Type "df">
-#              WarningMax 90
-#              Percentage true
-#      </Type>
-#
 #      <Type "load">
 #              DataSource "midterm"
 #              WarningMax 1
@@ -51,5 +47,5 @@
 #                      </Type>
 #              </Plugin>
 #      </Host>
-#</Threshold>
+#</Plugin>