collectd.conf, control, rules: Re-enabled rrdcached plugin.

An up-to-date version of librrd is now available in bpo.

diff --git a/debian/changelog b/debian/changelog
index c7d9763de00d22876305e69eda8e1de40ce82c55..6e6be0213ee6565d47010d140c5983599f15ede4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,6 @@ collectd (4.10.1-1~bpo50+1) lenny-backports; urgency=low
       not available in Lenny; removed build-dependency on libganglia-dev.
     - Disabled the "memcachec" plugin, which requires libmemcached which is
       not available in Lenny; removed build-dependency on libmemcached-dev.
-    - Disabled the "rrdcached" plugin, which requires rrdclient support in
-      librrd; removed version from librrd-dev build-dependency.
     - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
       is not available in Lenny; removed libtokyocabinet-dev and
       libtokyotyrant-dev build-dependencies.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 54a207110b6a375228b0b5695cf387fcbd81dbb1..6c2bacf08c420309eb596188ecf43379f384eb68 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -82,6 +82,7 @@ LoadPlugin memory
 LoadPlugin processes
 #LoadPlugin protocols
 #LoadPlugin python
+#LoadPlugin rrdcached
 LoadPlugin rrdtool
 #LoadPlugin sensors
 #LoadPlugin serial
@@ -562,6 +563,13 @@ LoadPlugin users
 #      </Module>
 #</Plugin>
 
+#<Plugin rrdcached>
+#      DaemonAddress "unix:/var/run/rrdcached.sock"
+#      DataDir "/var/lib/rrdcached/db/collectd"
+#      CreateFiles true
+#      CollectStatistics true
+#</Plugin>
+
 <Plugin rrdtool>
        DataDir "/var/lib/collectd/rrd"
 #      CacheTimeout 120

diff --git a/debian/control b/debian/control
index 75321eccf73eda7ce43f9483258277074bc7f8a6..76f7a6aca893a82c328446eea868f50d89c9a962 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- librrd-dev,
+ librrd-dev (>= 1.4~),
  libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libsnmp-dev | libsnmp9-dev,
  libupsclient1-dev,
@@ -122,6 +122,7 @@ Description: statistics collection and monitoring daemon (core system)
    * number of processes: processes
    * information about network protocols: protocols
    * embedded Python interpreter: python
+   * write data via the RRD accelerator daemon: rrdcached
    * output to RRD files: rrdtool
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial

diff --git a/debian/rules b/debian/rules
index 0a948cb40ddd32ffc4b2041996f4512a5e719fdd..1020b9d8549d31d69d7def4d5e0d392873ccda65 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,9 +89,6 @@ confflags += --disable-pinba
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros
 
-# rrdclient support in librrd is required for the rrdcached plugin.
-confflags += --disable-rrdcached
-
 # libtokyotyrant is required for the tokyotyrant plugin.
 confflags += --disable-tokyotyrant