From 48d6bc40940bdcd953d802e04fc167876fa684e7 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 27 Apr 2008 16:51:09 +0200 Subject: [PATCH] Reenabled the "iptables" plugin - libiptc is available in Etch. --- debian/README.Debian | 4 ++++ debian/changelog | 3 ++- debian/collectd.conf | 5 +++++ debian/collectd.overrides | 1 + debian/control | 3 ++- debian/rules | 7 ++----- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 0c640a1..654b5aa 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -94,6 +94,10 @@ Examples: documentation for information about setup and configuration: perldoc Collectd.pm. +- iptables/: This directory contains a script which will setup iptables to do + global logging of all traffic going in and out of an interface. This + information can then be collected by collectd's iptables plugin. + - cussh.pl: "Collectd Unix Socket SHell" is a small, interactive front-end for the unixsock plugin. See the embedded POD documentation for details: perldoc cussh.pl. diff --git a/debian/changelog b/debian/changelog index 48b8c2c..ad7adbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ collectd (4.3.2-1~bpo40+1) etch-backports; urgency=low they are not available in Etch and might confuse buildds. * Removed version from libvirt-dev build-dependency - a version with Xen support is currently not available on backports.org. + * Reenabled the "iptables" plugin - libiptc is available in Etch. - -- Sebastian Harl Sun, 27 Apr 2008 15:32:40 +0200 + -- Sebastian Harl Sun, 27 Apr 2008 16:48:59 +0200 collectd (4.3.2-1) unstable; urgency=low diff --git a/debian/collectd.conf b/debian/collectd.conf index 3677425..086820c 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -42,6 +42,7 @@ LoadPlugin entropy #LoadPlugin exec #LoadPlugin hddtemp LoadPlugin interface +#LoadPlugin iptables #LoadPlugin ipvs LoadPlugin irq #LoadPlugin libvirt @@ -125,6 +126,10 @@ LoadPlugin users # IgnoreSelected false # +# +# Chain "table" "chain" +# + # # Irq 7 # Irq 8 diff --git a/debian/collectd.overrides b/debian/collectd.overrides index 9350ff0..5208c6a 100644 --- a/debian/collectd.overrides +++ b/debian/collectd.overrides @@ -1,4 +1,5 @@ collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so +collectd: shlib-with-non-pic-code usr/lib/collectd/iptables.so collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so collectd: spelling-error-in-description mysql MySQL diff --git a/debian/control b/debian/control index 0a25851..aebf6dc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev +Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev Build-Conflicts: libpthread-dev Standards-Version: 3.7.3 Homepage: http://collectd.org/ @@ -47,6 +47,7 @@ Description: statistics collection and monitoring daemon * execution of external programs: exec * harddisk temperature: hddtemp * network traffic: interface + * iptables statistics: iptables * IPVS connection statistics: ipvs * IRQ counters: irq * CPU, dist, network statistics of guest systems: libvirt diff --git a/debian/rules b/debian/rules index 568c9a6..83334b6 100755 --- a/debian/rules +++ b/debian/rules @@ -36,16 +36,13 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \ --disable-xmms \ --without-libstatgrab -# libiptc is no longer available on Debian (see #472655). -confflags += --disable-iptables - # These plugins do not provide any functionality under Linux. confflags += --disable-apple_sensors --disable-tape # The static libraries iptc, netstat and upsclient cannot be used on # 64bit systems (see bugs #358637 and #419684 for more details). ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64)) - confflags += --disable-netlink --disable-nut + confflags += --disable-iptables --disable-netlink --disable-nut endif # libvirt is only available on amd64, i386 and powerpc. @@ -143,7 +140,7 @@ binary-arch: build install-arch dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \ contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \ contrib/exec-nagios.conf contrib/exec-nagios.px \ - contrib/SpamAssassin/ contrib/cussh.pl \ + contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \ contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py dh_installdebconf -a dh_installinit -a -- defaults 95 -- 2.30.2