Re-enable the varnish plugin

diff --git a/debian/changelog b/debian/changelog
index 3387713a6c347647402f2e8b8c385d32fbcd3281..2f04a87b6df19b138a48b9f0c7a1f9e8880b5dfa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Enable the intel_rdt plugin, libpqos is now available.
+  * Re-enable the varnish plugin, support for varnish 5.2 now implemented.
 
  -- Marc Fournier <marc@bl.uem.li>  Wed, 21 Feb 2018 07:02:01 +0100
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 2e1bf5fd3982e284bb7bb7c01cb1bdc656186ab5..6bb8516f40bf2d993295e40042564551ac20b44c 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -188,6 +188,7 @@ LoadPlugin swap
 #LoadPlugin uptime
 LoadPlugin users
 #LoadPlugin uuid
+#LoadPlugin varnish
 #LoadPlugin virt
 #LoadPlugin vmem
 #LoadPlugin vserver
@@ -1301,6 +1302,42 @@ LoadPlugin users
 #      UUIDFile "/etc/uuid"
 #</Plugin>
 
+#<Plugin varnish>
+#   This tag support an argument if you want to
+#   monitor the local instance just use </Instance>
+#   If you prefer defining another instance you can do
+#   so by using <Instance "myinstance">
+#   <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 & 4 only
+#      CollectSMS false
+#      CollectSM false            # Varnish 2 only
+#      CollectStruct false
+#      CollectTotals false
+#      CollectUptime false        # Varnish 3 and above
+#      CollectVCL false
+#      CollectVSM false           # Varnish 4 only
+#      CollectWorkers false
+#      CollectLock false          # Varnish 4 only
+#      CollectMempool false       # Varnish 4 only
+#      CollectManagement false    # Varnish 4 only
+#      CollectSMF false           # Varnish 4 only
+#      CollectVBE false           # Varnish 4 only
+#      CollectMSE false           # Varnish-Plus 4 only
+#   </Instance>
+#</Plugin>
+
 #<Plugin virt>
 #      Connection "xen:///"
 #      RefreshInterval 60

diff --git a/debian/control b/debian/control
index 75580390defb68600aca314b162239a622eaa286..abe2b0be3ed89bbe90959ebee68ccd75db25277d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -54,6 +54,7 @@ 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 +82,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, zookeeper,
+ time-daemon, varnish, zookeeper,
  ${shlibs:Suggests}, default-jre-headless
 Replaces: collectd (<< 4.8.2-1~)
 Description: statistics collection and monitoring daemon (core system)
@@ -206,6 +207,7 @@ 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 837d0369c7d92f7d4867bb4f47500e318ed23171..919318cf07efbb7af2dd72f4a1cd21564b01b78b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,10 +89,6 @@ confflags += --disable-grpc
 # 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 += \