From: Marc Fournier <marc@bl.uem.li>
Date: Tue, 24 May 2016 06:14:53 +0000 (+0200)
Subject: Re-enable gmond plugin
X-Git-Tag: collectd-5.5.1-3~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7e074e32ca7f776c66afc942ddda4d7327f2f5d9;p=pkg-collectd.git

Re-enable gmond plugin

This is a partial revert of 5883298
---

diff --git a/debian/changelog b/debian/changelog
index 50bfcaa..fce5050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+collectd (5.5.1-3) UNRELEASED; urgency=medium
+
+  * Re-enable gmond plugin. Thanks to Michael Tautschnig and Jean-Michel
+    Nirgal Vourgère for fixing #812462.
+
+ -- Marc Fournier <marc@bl.uem.li>  Tue, 24 May 2016 08:10:45 +0200
+
 collectd (5.5.1-2) unstable; urgency=medium
 
   * Disable the gmond plugin for now. Ganglia is not available in testing
@@ -1570,7 +1577,7 @@ collectd (3.9.4+debian-1) unstable; urgency=low
   * Initial release (Closes: #373008).
   * Removed upstream's debian/ directory from .orig.tar.gz.
   * getifaddrs.dpatch: Patching src/traffic.c to read data from /proc instead
-    of using getifaddrs(). getifaddrs() does not seem to work correctly on 
+    of using getifaddrs(). getifaddrs() does not seem to work correctly on
     AMD64.
 
  -- Sebastian Harl <sh@tokkee.org>  Fri,  7 Jul 2006 15:49:42 +0200
diff --git a/debian/collectd.conf b/debian/collectd.conf
index da1c79b..cea1e59 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -115,6 +115,7 @@ LoadPlugin entropy
 #LoadPlugin fhcount
 #LoadPlugin filecount
 #LoadPlugin fscache
+#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipc
@@ -519,6 +520,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 b504c1f..ddeb8ff 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdbi0-dev,
  libesmtp-dev,
+ libganglia1-dev (>= 3) [linux-any],
  libgcrypt11-dev,
  libglib2.0-dev,
  libhiredis-dev,
@@ -119,6 +120,7 @@ Description: statistics collection and monitoring daemon (core system)
    * count the number of files in directories: filecount
    * Linux file-system based caching framework statistics: fscache
    * query data from Java processes using JMX: GenericJMX (Java based plugin)
+   * receive and interpret Ganglia multicast traffic: gmond
    * harddisk temperature: hddtemp
    * network traffic: interface
    * IPC statistics: ipc
diff --git a/debian/rules b/debian/rules
index db3b61f..b25ae8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,10 +67,6 @@ confflags += --disable-tape
 # libaquaero5 is required for the aquaero plugin
 confflags += --disable-aquaero
 
-# Ganglia is not available in testing atm and hasn't been touched in a long
-# time, http://bugs.debian.org/812462
-confflags += --disable-gmond
-
 # libmic is required for the mic plugin
 confflags += --disable-mic