rules, control, collectd.conf: Disabled curl_json plugin.

… and removed build-dependency on libyajl-dev, which is not available on Etch.

diff --git a/debian/changelog b/debian/changelog
index 9864c511e6f546f1b7ee652c492dd8b897f0124b..5a3476d32ffd859ab9551deb327f9c93bcc57449 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,10 @@ collectd (4.8.2-1~bpo40+1) etch-backports; urgency=low
       versions >= 3 are not available on Etch.
     - Disabled memcachec plugin and removed build-dependency on
       libmemcached-dev, which is not available on Etch.
+    - Disabled curl_json plugin and removed build-dependency on libyajl-dev,
+      which is not available on Etch.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 11 Jan 2010 18:38:50 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 11 Jan 2010 18:42:25 +0100
 
 collectd (4.8.2-1) unstable; urgency=medium
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index a3b7dd24a198c56b365245b9665ee583dbd09b6f..cde32ee37747047876fcdfc229e054d9e00ed070 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -37,7 +37,6 @@ LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
 #LoadPlugin curl
-#LoadPlugin curl_json
 LoadPlugin df
 LoadPlugin disk
 #LoadPlugin dns
@@ -170,37 +169,6 @@ LoadPlugin users
 #      </Page>
 #</Plugin>
 
-#<Plugin curl_json>
-## See: http://wiki.apache.org/couchdb/Runtime_Statistics
-#  <URL "http://localhost:5984/_stats">
-#    Instance "httpd"
-#    <Key "httpd/requests/count">
-#      Type "http_requests"
-#    </Key>
-#
-#    <Key "httpd_request_methods/*/count">
-#      Type "http_request_methods"
-#    </Key>
-#
-#    <Key "httpd_status_codes/*/count">
-#      Type "http_response_codes"
-#    </Key>
-#  </URL>
-## Database status metrics:
-#  <URL "http://localhost:5984/_all_dbs">
-#    Instance "dbs"
-#    <Key "*/doc_count">
-#      Type "gauge"
-#    </Key>
-#    <Key "*/doc_del_count">
-#      Type "counter"
-#    </Key>
-#    <Key "*/disk_size">
-#      Type "bytes"
-#    </Key>
-#  </URL>
-#</Plugin>
-
 #<Plugin df>
 #      Device "/dev/sda1"
 #      Device "192.168.0.2:/mnt/nfs"

diff --git a/debian/control b/debian/control
index d4ed57cd0e015172762f930fc2953eaf23d3cc7a..873986550af20f273c215c2951ec75ec10b188f5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 5), po-debconf, dpatch,
  libsnmp9-dev,
  libvirt-dev (>= 0.4.0-6),
  libxml2-dev,
- libyajl-dev,
  linux-kernel-headers,
  nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel],
  openjdk-6-jdk [!hppa]
@@ -74,7 +73,6 @@ Description: statistics collection and monitoring daemon (core system)
    * CPU frequency: cpufreq
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
-   * parse JSON files: curl_json
    * disk space usage: df
    * disk and partition throughput: disk
    * DNS traffic information: dns

diff --git a/debian/rules b/debian/rules
index fac70d12900bfe1009d6a726a8535f2247c3db79..afb266ab842c5cf0c7d83082ff7c066b0c83cced 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,9 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
+# libyajl is required for the curl_json plugin.
+confflags += --disable-curl_json
+
 # libganglia >= 3 is required for the gmond plugin.
 confflags += --disable-gmond