From 43cfbe59438fd7dcdf5efa505bd447d7f3631d71 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 3 Jun 2010 13:45:24 +0200
Subject: [PATCH] changelog, collectd.conf, control, rules: Added new plugins.

 * curl_xml
 * modbus (disabled; libmodbus is not available)
 * pinba
---
 debian/changelog     |  9 +++++++--
 debian/collectd.conf | 31 +++++++++++++++++++++++++++++++
 debian/control       |  2 ++
 debian/rules         |  3 +++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e4abed..48b15a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 collectd (4.10.0-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+    New plugins:
+    - Parse XML data: curl_xml
+    - Parse values from Modbus/TCP enabled devices: modbus (disabled in
+      Debian; libmodbus is not available)
+    - Timing values from Pinba: pinba
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Jun 2010 12:58:27 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Jun 2010 13:36:01 +0200
 
 collectd (4.9.1-2) unstable; urgency=low
 
diff --git a/debian/collectd.conf b/debian/collectd.conf
index a331985..5eea349 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -39,6 +39,7 @@ LoadPlugin cpu
 #LoadPlugin csv
 #LoadPlugin curl
 #LoadPlugin curl_json
+#LoadPlugin curl_xml
 #LoadPlugin dbi
 LoadPlugin df
 LoadPlugin disk
@@ -76,6 +77,7 @@ LoadPlugin memory
 #LoadPlugin olsrd
 #LoadPlugin openvpn
 #LoadPlugin perl
+#LoadPlugin pinba
 #LoadPlugin ping
 #LoadPlugin postgresql
 #LoadPlugin powerdns
@@ -209,6 +211,25 @@ LoadPlugin users
 #  </URL>
 #</Plugin>
 
+#<Plugin "curl_xml">
+#	<URL "http://localhost/stats.xml">
+#		Host "my_host"
+#		Instance "some_instance"
+#		User "collectd"
+#		Password "thaiNg0I"
+#		VerifyPeer true
+#		VerifyHost true
+#		CACert "/path/to/ca.crt"
+#
+#		<XPath "table[@id=\"magic_level\"]/tr">
+#			Type "magic_level"
+#			InstancePrefix "prefix-"
+#			InstanceFrom "td[1]"
+#			ValuesFrom "td[2]/span[@class=\"level\"]"
+#		</XPath>
+#	</URL>
+#</Plugin>
+
 #<Plugin dbi>
 #	<Query "num_of_customers">
 #		Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \
@@ -499,6 +520,16 @@ LoadPlugin users
 #	</Plugin>
 #</Plugin>
 
+#<Plugin pinba>
+#	Address "::0"
+#	Port "30002"
+#	<View "name">
+#		Host "host name"
+#		Server "server name"
+#		Script "script name"
+#	<View>
+#</Plugin>
+
 #<Plugin ping>
 #	Host "host.foo.bar"
 #	Host "host.baz.qux"
diff --git a/debian/control b/debian/control
index 054cea9..d8308cc 100644
--- a/debian/control
+++ b/debian/control
@@ -85,6 +85,7 @@ Description: statistics collection and monitoring daemon (core system)
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
    * parse JSON files: curl_json
+   * parse XML data: curl_xml
    * query data from a relational database: dbi
    * disk space usage: df
    * disk and partition throughput: disk
@@ -126,6 +127,7 @@ Description: statistics collection and monitoring daemon (core system)
    * OpenVPN traffic and compression statistics: openvpn
    * OpenVZ statistics: OpenVZ (Perl based plugin)
    * embedded Perl interpreter: perl
+   * timing values from Pinba: pinba
    * network latency statistics: ping
    * PostgreSQL database statistics: postgresql
    * PowerDNS name server statistics: powerdns
diff --git a/debian/rules b/debian/rules
index 94a8045..e9487ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,9 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
+# libmodbus is required for the modbus plugin.
+confflags += --disable-modbus
+
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp
 
-- 
2.30.2