Reenabled iptables plugin.

collectd now ships libiptc itself. Thus, we can even build the plugin on all
architectures now.

diff --git a/debian/README.Debian b/debian/README.Debian
index 0c640a11d7ee0b01ac79c6178b10042d949f8679..654b5aa6dce4a9d8cde170acc4231517b1e92177 100644 (file)
--- 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 dd54443c48267bb3d7510b7b668e04a35101c758..8607274c9fb786e5cb39c6f6085c181a27c89ca1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ collectd (4.4.0-1) unstable; urgency=low
     - Fixed another issue of the sensors plugin affecting some chip types
       (Closes: #468143).
     - Fixed creation of "vserver" graphs in collection.cgi (Closes: #475120).
+    - collectd now ships libiptc itself.
     New plugins:
     - Ascent server statistics: ascent
     - IPMI sensors information: ipmi
@@ -12,8 +13,11 @@ collectd (4.4.0-1) unstable; urgency=low
     - TeamSpeak2 server statistics: teamspeak2
     - detailed virtual memory statistics: vmem
   * Disable "tcpconns" plugin by default (Closes: #478759).
+  * Reenabled iptables plugin (Closes: #473435).
+    - Added the plugin to collectd.conf.
+    - Added /usr/share/doc/collectd/examples/iptables/.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 26 May 2008 13:32:52 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 26 May 2008 15:13:55 +0200
 
 collectd (4.3.2-1) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 2fdd966007f504aec47ffa01fe45acdbc37da3da..2d5ef83a246916262636b3d6e6196de22298f96b 100644 (file)
--- 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
 #</Plugin>
 
+#<Plugin iptables>
+#      Chain "table" "chain"
+#</Plugin>
+
 #<Plugin irq>
 #      Irq 7
 #      Irq 8

diff --git a/debian/control b/debian/control
index 3635f80ed5f02e38647a04c349183b179ce1f9c9..57f65be465cd364ff79a3b98f8fb1876592aa66c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Description: statistics collection and monitoring daemon
    * harddisk temperature: hddtemp
    * network traffic: interface
    * IPMI sensors information: ipmi
+   * 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 568c9a6ac0acce68917d55abf6d927b16da586b2..f535c971806aa037a117cd69da46f4587bbb5891 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,6 @@ 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
 
@@ -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