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

[Florian Forster]

 configure.in    |    5 +++
 src/Makefile.am |    8 ++++
 src/pf.c        |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/types.db    |    9 ++++-
 4 files changed, 137 insertions(+), 2 deletions(-)

New commits:
commit 499cbd1605850e0feca405fb2579064d330eea8f
Merge: 5131a49 e2fbbb9
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 17 09:42:55 2012 +0100

    Merge branch 'sr/pf'

commit e2fbbb90f9c33c5718ad1a1396f6f43bc872e898
Author: Florian Forster <octo at collectd.org>
Date:   Thu Nov 8 11:52:39 2012 +0100

    pf plugin: Include "common.h".

commit 43bc16aa5e2b7a714e726d202232b02174b299b2
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 17:56:13 2012 +0200

    configure: Activate the PF plugin when net/pfvar.h is available.
    
    Apparently PF has been or is being ported to FreeBSD, so simply checking the OS
    name is not the best of ideas.

commit 96fb8673622dfeed08cf197632bb21dab29acaef
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 14:06:23 2012 +0200

    pf plugin: Coding style changes.
    
    * Move the names array to the top of the module.
    * Avoid type issues by passing an uint64_t to pf_submit(). The fields are
      using the BSD specific u_int64_t type.
    * Use derive rather than counter.
    * Add some more imports that may be required.

commit 2f3702e5ad192b193c3e40a3fcc28eb418f7e76f
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 14:01:40 2012 +0200

    pf plugin: Remove the init() callback.
    
    Instead check for a running PF in the read() callback.

commit c29fa0a4f2f4a3a1ec62209a70a20e58bc13da42
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 13:56:18 2012 +0200

    types.db: Remove unused types.
    
    Also fix a merge bug.

commit e95c6a7731455136b68bbf075739506db8d5c447
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 13:22:32 2012 +0200

    pf plugin: Rearrange functions to get rid of prototypes.
    
    * Add collectd specific includes.
    * Make global variables and functions static.
    * Remove main() function and associated code.

commit 9ad25378a6c3c755bc483067542f3adfcc9aae9a
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 13:17:41 2012 +0200

    Build system: Add the PF plugin.

commit 76a7816d2c066f2feff5c77e7da58df4dbc982c2
Merge: 6eca435 5cf0dd2
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 13:11:22 2012 +0200

    Merge branch 'master' into sr/pf
    
    Conflicts:
    	src/types.db

commit 6eca43522b65a3987c585231446dabb23f40ea22
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 28 19:43:09 2011 +0200

    pf plugin: also collect the current states sum

commit 92c19723b578f03b12c83a87a7f4fce8c5fc5a20
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Mon Apr 25 22:16:08 2011 +0200

    pf plugin: Change warn() to ERROR().

commit 0d11110149376ebaa100c23b5216309fb726518d
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Mon Apr 25 18:13:09 2011 +0200

    pf plugin: dont reinvent code, use code from pfctl

commit cf2856f08eb790c45a57dcf53d1d1412a5cdbd76
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Mon Apr 25 16:46:04 2011 +0200

    pf plugin: cleaner error-handling

commit 3e394c1f397de774d4b33e9c29aab5676e5d8832
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Fri Apr 22 13:04:43 2011 +0200

    pf plugin: define generation new/old depend on OpenBSD Version

commit 22d0859f5c5c43adc8c58ff0dd40be79528681eb
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 21 21:30:04 2011 +0200

    pf plugin: some code cleanup

commit 3b9fe8b7851a694d1c928da5622e771be98a75d9
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Tue Apr 19 08:20:49 2011 +0200

    pf plugin: collect bytes and packets for in and out

commit a8c47cbbb2ff857a43b7ed3966975976ecac6557
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sun Apr 17 13:14:11 2011 +0200

    pf plugin: all types in a single types.db

commit 6ea5e41d656b162d8614cc1af3efd50ed5424950
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sun Apr 17 13:08:49 2011 +0200

    pf plugin: also support OpenBSD 4.9/Current

commit 74661ad4eba34b8ba02fd1b2c27a645b453f3215
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sun Apr 17 11:14:07 2011 +0200

    pf plugin: read permissions are enough for /dev/pf

commit c5303c978bd0a121bf999d035c21847e64f698c1
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sun Apr 17 10:07:06 2011 +0200

    pf plugin:  split up in GAUGE and COUNTER

commit 6ff08df6ba1de1ebd95f569d96f62f7e6e5d68e0
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sun Apr 17 00:53:28 2011 +0200

    pf plugin: add nat and rdr rules

commit b2fd960e60150a50d369bab46e2bceab7014c4ce
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sat Apr 16 23:59:59 2011 +0200

    pf plugin: add more advanced pfrule-plugin
    
    Use rulestring as identifier, e.g
    	 bytes-block-drop-in-on-lo0-proto-icmp-all.rrd
    
    Currently for OpenBSD 4.5 only.
    OpenBSD 4.9/Current follows.

commit 1da78fabe8c12a27a0220392d582a17d5ad01f40
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sat Apr 16 20:59:59 2011 +0200

    pf plugin: pfutils depends on system version

commit 7a0995fb1e8355ef8e89f32d1d50f6382a6c66e8
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sat Apr 16 20:42:38 2011 +0200

    pf plugin: copy print_rule from /usr/src/sbin/pfctl to pfutils

commit 4d5bcab05e9ff4fa2d86f782288f9bc85c88f8d0
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sat Apr 16 12:06:22 2011 +0200

    pf plugin: whitos cleanup and close dev after reading rules

commit 9c9c2655d85e0935da253617dccf5279a9868b88
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Sat Apr 16 11:06:56 2011 +0200

    pf plugin: add very simple rule monitoring

commit 59fc91adb22eeaff143f629cd5e7727732708f6e
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 22:08:53 2011 +0200

    pf plugin: whitespace cleanup

commit 9a964d704b369e2cd165341fab754879c3f647f8
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 21:59:40 2011 +0200

    pf plugin: pf values are GAUGE Part II

commit dc5ba2fae52307d01291a15d3b329e0f85fb0538
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 21:51:44 2011 +0200

    pf plugin: pf values are GAUGE

commit fd7d42d36a96adb7dc505949901eef89b9014086
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 21:22:21 2011 +0200

    pf plugin: add myself to copyright

commit c68a6743817c119301d2c3b2cbabd9dc49851d91
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 21:18:10 2011 +0200

    pf plugin: add types.db for pf-types

commit 223535fabc55e3ef8932e9b429177dcfd2b6b62f
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 21:17:45 2011 +0200

    pf plugin: whitespace cleanup and use sstrncpy like other plugins

commit 3fdb55938b0e70e042f893dadcc62cfe7a92a914
Author: Stefan Rinkes <stefan.rinkes at gmail.com>
Date:   Thu Apr 14 17:47:35 2011 +0200

    pf plugin: init commit - import pf.c from pyr at openbsd.org