From 0f8535b07d47e1fa0f5ff3ca15396e2e759c5301 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Wed, 21 Feb 2018 07:30:29 +0100 Subject: [PATCH] Re-enable the varnish plugin --- debian/changelog | 1 + debian/collectd.conf | 37 +++++++++++++++++++++++++++++++++++++ debian/control | 4 +++- debian/rules | 4 ---- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3387713..2f04a87 100644 --- 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 Wed, 21 Feb 2018 07:02:01 +0100 diff --git a/debian/collectd.conf b/debian/collectd.conf index 2e1bf5f..6bb8516 100644 --- 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" # +# +# This tag support an argument if you want to +# monitor the local instance just use +# If you prefer defining another instance you can do +# so by using +# +# 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 +# +# + # # Connection "xen:///" # RefreshInterval 60 diff --git a/debian/control b/debian/control index 7558039..abe2b0b 100644 --- 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 837d036..919318c 100755 --- 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 += \ -- 2.30.2