collectd.conf, control, rules: Enabled the "gmond" plugin.

libganglia >= 3 is now available in testing / unstable. Build-depend on
libganglia1-dev (>= 3) and added a sample config to collectd.conf.

diff --git a/debian/changelog b/debian/changelog
index 1ff742b596f26e6aba4df7b6a5f0bd07d46523e7..8481ba03ea60e370efd2f3ca61650fa18356639c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,7 @@ collectd (4.7.2-1) unstable; urgency=low
     New plugins:
     - Connection tracking table size: conntrack
     - Linux file-system based caching framework statistics: fscache
-    - Receive and interpret Ganglia multicast traffic: gmond (disabled in
-      Debian, libganglia >= 3 is required)
+    - Receive and interpret Ganglia multicast traffic: gmond
     - Embedded Java Virtual Machine: java
     - Query and parse data from a memcache daemon: memcachec
     - Information about network protocols: protocols
@@ -24,10 +23,11 @@ collectd (4.7.2-1) unstable; urgency=low
       if any prerequisites are missing.
   * debian/control:
     - Build-depend on openjdk-6-jdk.
+    - Build-depend on libganglia1-dev (>= 3), required by the gmond plugin.
   * debian/collectd.install:
     - Install collectd-java.5.
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 23 Jul 2009 22:14:37 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 23 Jul 2009 22:53:53 +0200
 
 collectd (4.6.3-1) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 2c34b78edc6743f4542354886aeb2c43da7172ab..3d26fa6f4ef4ea7f1ec711a4caec8511cc7a9748 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -46,6 +46,7 @@ LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin filecount
 #LoadPlugin fscache
+#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipmi
@@ -236,6 +237,22 @@ LoadPlugin users
 #      </Directory>
 #</Plugin>
 
+#<Plugin gmond>
+#      MCReceiveFrom "239.2.11.71" "8649"
+#
+#      <Metric "swap_total">
+#              Type "swap"
+#              TypeInstance "total"
+#              DataSource "value"
+#      </Metric>
+#
+#      <Metric "swap_free">
+#              Type "swap"
+#              TypeInstance "free"
+#              DataSource "value"
+#      </Metric>
+#</Plugin>
+
 #<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port 7634

diff --git a/debian/control b/debian/control
index d626dcff34be862d8030e85c1461dcba70d0ed4b..a62b29b9ce5c30c36d53781a39a393752b0302df 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk, libganglia1-dev (>= 3)
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.8.1
 Homepage: http://collectd.org/
@@ -54,6 +54,7 @@ Description: statistics collection and monitoring daemon
    * execution of external programs: exec
    * count the number of files in directories: filecount
    * Linux file-system based caching framework statistics: fscache
+   * Receive and interpret Ganglia multicast traffic: gmond
    * harddisk temperature: hddtemp
    * network traffic: interface
    * IPMI sensors information: ipmi

diff --git a/debian/rules b/debian/rules
index 4ee1b0d2d88ab13ed0cc613f975118d813e23748..0d8a9b100e70f3027284453a884a6b714b8e7d31 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -57,9 +57,6 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
-# libganglia >= 3 is required for the gmond plugin.
-confflags += --disable-gmond
-
 # libowcapi is required for the onewire plugin.
 confflags += --disable-onewire