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

This plugin requires libyajl which is not available in Lenny; removed
libyajl-dev build-dependency.

diff --git a/debian/changelog b/debian/changelog
index ba252b10dbcc098da1e8d3391c591fed767ca9fd..d92d87a8e127f6e6e3253fb11f7b1d6bd30490e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
     - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
       is not available in Lenny; removed libtokyocabinet-dev and
       libtokyotyrant-dev build-dependencies.
+    - Disabled the "curl_json" plugin, which requires libyajl which is not
+      available in Lenny; removed libyajl-dev build-dependency.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:27:10 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:31:30 +0100
 
 collectd (4.9.1-2) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 79e2e69fe07c6d6df330a31ac5b3d939bd1c6a32..b138a50175dda35263ed89f03d291fb79c3c32c7 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -38,7 +38,6 @@ LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
 #LoadPlugin curl
-#LoadPlugin curl_json
 #LoadPlugin dbi
 LoadPlugin df
 LoadPlugin disk
@@ -174,37 +173,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 dbi>
 #      <Query "num_of_customers">
 #              Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \

diff --git a/debian/control b/debian/control
index 07c0c25cf9bc8ccc1f59ee12d36f2eb302c22b4e..1d4a284e670c35609ca474e4dc2e2013ff2698a6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libupsclient1-dev,
  libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64],
  libxml2-dev,
- libyajl-dev,
  linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64],
  openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
  python-dev
@@ -78,7 +77,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
    * query data from a relational database: dbi
    * disk space usage: df
    * disk and partition throughput: disk

diff --git a/debian/rules b/debian/rules
index e9e39db07060d1da9292a60e525922f96cccfd9e..fb9ad0a1ab965f6785a814d7798259a29425d22f 100755 (executable)
--- 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
 
+# libyajl is required for the curl_json plugin.
+confflags += --disable-curl_json
+
 # libganglia >= 3 is required for the gmond plugin.
 confflags += --disable-gmond