Disable the gmond plugin for now.

Ganglia is not available in testing (cf. #812462) and the package hasn't been
touched in 18 months.

Thanks to Santiago Vila for reporting this!
Closes: #819241

diff --git a/debian/changelog b/debian/changelog
index d9edf57b14cc2c39bb16f6f6ee5b7e6e12f52640..e9dacee6ac5170c18dde8d403c93309dde00cc82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+collectd (5.5.1-2) unstable; urgency=medium
+
+  * Disable the gmond plugin for now. Ganglia is not available in testing
+    (cf. #812462). Thanks to Santiago Vila for reporting this
+    (Closes: #819241).
+
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 02 Apr 2016 10:41:27 +0200
+
 collectd (5.5.1-1) unstable; urgency=medium
 
   * New upstream release:

diff --git a/debian/collectd.conf b/debian/collectd.conf
index cea1e59202e0b9f0f4f2f0a5555be835596addf3..da1c79b14b9e7657b9109ba597a90a25db89f1ee 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -115,7 +115,6 @@ LoadPlugin entropy
 #LoadPlugin fhcount
 #LoadPlugin filecount
 #LoadPlugin fscache
-#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipc
@@ -520,22 +519,6 @@ 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 f6982bd1703bf7a3cf897000e86850ef44eb687f..9a717bac30e82918892407d7e1415b9e1c74a161 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ 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,
@@ -120,7 +119,6 @@ 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 b25ae8e9e1ba1c0e663d77bc8b37172881681051..db3b61f05762cd1dadf902e5c06c472bc4456ac9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,10 @@ 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