[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 configure.in                   |   46 ++++
 contrib/iptables/accounting.sh |   29 ++
 src/Makefile.am                |   11 +
 src/collectd.conf.in           |    5 
 src/iptables.c                 |  401 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 491 insertions(+), 1 deletion(-)

New commits:
commit 35248bcc734467e1f1ae39b4a6470849e57624bf
Merge: 946f782063552f0f6db26c8977ff615bcab0c8b0 5ce988e515f51d364b1b2ce422ba2e0d8c83c853
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Wed Mar 14 23:24:38 2007 +0100

    Merge branch 'sb/iptables'
    
    Conflicts:
    
    	configure.in
    	src/Makefile.am
    	src/collectd.conf.in

commit 5ce988e515f51d364b1b2ce422ba2e0d8c83c853
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Wed Mar 14 23:21:56 2007 +0100

    src/collectd.conf.in: Added the iptables plugin.

commit cd4542addb1847673e2cf8791081c86ff87c6be4
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Wed Mar 14 23:21:36 2007 +0100

    iptables plugin: Implemented selection by rule-numbers.

commit 8d0714300b4de887b93fc94d82edf2a89c48f4fb
Author: Florian Forster <octo.trailing-username(a)leading-domain.crystal.wlan.home.verplant.org>
Date:   Sat Mar 3 13:39:41 2007 +0100

    iptables plugin: Fix building under non-Linux systems.

commit 8de91034a0186feba7079b92711b0d140278ce7a
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Sat Mar 3 11:32:58 2007 +0100

    iptables plugin: Use a global `libiptc' if it exists.
    
    Will likely not build under non-Linux systems yet.

commit 863dfcdf274509e4e1836c2c8f1f10f09e1d13be
Author: Sjoerd van der Berg <harekiet.trailing-username(a)leading-domain.gmail.com>
Date:   Sat Mar 3 10:35:35 2007 +0100

    iptables plugin: Adds a plugin to collect iptables'-counters.
    
    My first attempt at a module for this is an iptables modules This will try to
    read out the rules from iptables for a specific table and chain.
    It will go through the rules looking for ones with "comment" matches and will
    use the comment as a base for the generated filename.
    
    So basically looking for lines like
     $ iptables -t mangle -A incoming -p tcp -m comment --comment "tcp"
    will generate a iptables-incoming/tcp.rrd file from the byte counters
    
    There used to also be an account iptables module but that seems to have been
    neglected, which would generate /proc entries for specific rules, don't know
    what would work better. Either way, this seems to work somewhat.