From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 21 Oct 2017 22:37:32 +0000 (+0200)
Subject: Disable the varnish plugin for now.
X-Git-Tag: collectd-5.7.2-2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8375376db54ecf7ae058aa7b8789d66c7f72899a;p=pkg-collectd.git

Disable the varnish plugin for now.

collectd FTBFS against varnish 5.2.

Cf. https://github.com/collectd/collectd/issues/2498
---

diff --git a/debian/changelog b/debian/changelog
index 567d9b0..8d19913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ collectd (5.7.2-2) unstable; urgency=medium
   * Update to standards-version 4.1.1:
     - Build depend on debhelper (>= 9.20160709~) instead of dh-systemd.
     - Use priority "optional" instead of deprecated priority "extra".
+  * Disable the varnish plugin for now. collectd FTBFS against varnish 5.2.
+    Cf. https://github.com/collectd/collectd/issues/2498
 
- -- Sebastian Harl <tokkee@debian.org>  Sat, 21 Oct 2017 14:01:50 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 22 Oct 2017 00:37:19 +0200
 
 collectd (5.7.2-1) unstable; urgency=medium
 
diff --git a/debian/collectd.conf b/debian/collectd.conf
index 6e8dc54..cf6e8cf 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -187,7 +187,6 @@ LoadPlugin swap
 #LoadPlugin uptime
 LoadPlugin users
 #LoadPlugin uuid
-#LoadPlugin varnish
 #LoadPlugin virt
 #LoadPlugin vmem
 #LoadPlugin vserver
@@ -1297,36 +1296,6 @@ LoadPlugin users
 #	UUIDFile "/etc/uuid"
 #</Plugin>
 
-#<Plugin varnish>
-#	<Instance>
-#		CollectBackend true
-#		CollectBan false           # Varnish 3 and above
-#		CollectCache true
-#		CollectConnections true
-#		CollectDirectorDNS false   # Varnish 3 only
-#		CollectESI false
-#		CollectFetch false
-#		CollectHCB false
-#		CollectObjects false
-#		CollectPurge false         # Varnish 2 only
-#		CollectSession false
-#		CollectSHM true
-#		CollectSMA false           # Varnish 2 only
-#		CollectSMS false
-#		CollectSM false            # Varnish 2 only
-#		CollectStruct false
-#		CollectTotals false
-#		CollectUptime false        # Varnish 3 and above
-#		CollectdVCL false
-#		CollectVSM false           # Varnish 4 only
-#		CollectWorkers false
-#	</Instance>
-#
-#	<Instance "myinstance">
-#		CollectCache true
-#	</Instance>
-#</Plugin>
-
 #<Plugin virt>
 #	Connection "xen:///"
 #	RefreshInterval 60
diff --git a/debian/control b/debian/control
index d0df7ff..bc7c668 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,6 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libtokyotyrant-dev [linux-any],
  libudev-dev [linux-any],
  libupsclient-dev | libupsclient1-dev,
- libvarnishapi-dev,
  libvirt-dev (>= 0.4.0-6) [linux-any],
  libxen-dev [amd64 arm64 armhf i386],
  libxml2-dev,
@@ -81,7 +80,7 @@ Suggests: collectd-dev,
  apache2, apcupsd, bind9, ceph, chrony, default-mysql-server, gpsd, hddtemp,
  iptables, ipvsadm, lm-sensors, mbmon, memcached, nginx, notification-daemon,
  nut, openvpn, olsrd, pdns-server, postgresql, redis-server, slapd,
- time-daemon, varnish, zookeeper,
+ time-daemon, zookeeper,
  ${shlibs:Suggests}, default-jre-headless
 Replaces: collectd (<< 4.8.2-1~)
 Description: statistics collection and monitoring daemon (core system)
@@ -205,7 +204,6 @@ Description: statistics collection and monitoring daemon (core system)
    * system uptime: uptime
    * number of users logged into the system: users
    * set the hostname to an unique identifier: uuid
-   * Varnish HTTP accelerator daemon statistics: varnish
    * CPU, disk, network statistics of guest systems: virt
    * detailed virtual memory statistics: vmem
    * system resources used by Linux-VServers: vserver
diff --git a/debian/rules b/debian/rules
index 4be1b6c..cac99e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,10 @@ confflags += --disable-intel_rdt
 # Cf. https://github.com/collectd/collectd/issues/1574
 confflags += --disable-sigrok
 
+# libvarnishapi 5.2 is not yet supported by collectd
+# Cf. https://github.com/collectd/collectd/issues/2498
+confflags += --disable-varnish
+
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \