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

Sat Mar 23 10:13:09 CET 2013

 AUTHORS               |    3 +
 README                |    4 +
 configure.in          |  137 ++++++------
 src/Makefile.am       |    8 +
 src/collectd.conf.in  |   28 +++
 src/collectd.conf.pod |   91 ++++++++
 src/plugin.c          |    6 +
 src/tail_csv.c        |  565 +++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 779 insertions(+), 63 deletions(-)

New commits:
commit 632e1074beb71748f866087bcdf9b0ba1b1d2405
Merge: 9de567a 21b429b
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 10:13:02 2013 +0100

    Merge branch 'collectd-5.2'
    
    Conflicts:
    	configure.in

commit 21b429b6b5ecd2f9820d9a2516c12577a0e59d19
Merge: 3b51243 ef3e165
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 10:01:19 2013 +0100

    Merge branch 'collectd-5.1' into collectd-5.2

commit 9de567ab3fd0725ce08f0581b6374518e1220e7e
Merge: 044cb79 3da36d6
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 09:54:39 2013 +0100

    Merge branch 'kn/snort'

commit 044cb79594f94632eedf24a7bbfb8e645691a6d3
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 09:53:28 2013 +0100

    src/plugin.c: Assert that "data_sets" is non-NULL.
    
    Otherwise we might run into an assertion in the AVL tree. This can be
    triggered e.g. when calling plugin_get_ds() from within a config
    callback.

commit 3da36d67b99b4bcfd124c5c1d0877307ce7d8c24
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 09:27:24 2013 +0100

    tail_csv plugin: Implement the "TimeFrom" option.

commit 92b0dd636352e8f8e2cbdd8dc33a523e010d63f7
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 08:57:43 2013 +0100

    tail_csv plugin: Rename the "Index" option to "ValueFrom".

commit c842ed2091ed748da35295856d5c4a1042291a17
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 23 08:47:02 2013 +0100

    tail_csv plugin: Some bug fixes.
    
    * Query types in the init-phase rather than the config-phase. The
      types.db is not guaranteed to be available at that time.
    * Make sure the "Instance" option in the <File /> blocks is optional.

commit 5e136b4d9ab110b0a23e48404ca00374063c0184
Author: Florian Forster <octo at collectd.org>
Date:   Fri Mar 22 22:57:43 2013 +0100

    tail_csv plugin: Rename "Instance" blocks to "File".
    
    This way the syntax of tail_csv's configuration is closer to that of the
    csv plugin.

commit 88ed4433eaa37f5859420cc41487ec5ee080d477
Author: Florian Forster <octo at collectd.org>
Date:   Fri Mar 22 22:21:57 2013 +0100

    tail_csv plugin: Rename the "snort" plugin to "tail_csv".
    
    It's actually much more generic than just Snort, so give it an
    appropriately generic name.

commit ef3e165050891997ae1564a58ea1992d1d77dd2b
Author: Florian Forster <octo at collectd.org>
Date:   Fri Mar 22 21:55:02 2013 +0100

    configure.in: Quote AC_LANG_PROGRAM and remove AC_INCLUDES_DEFAULT.
    
    The latter isn't expanded anymore when quoted. There's no easy way
    around this :\

commit 2eb4e445aaa65f27833ec446175955b28e099a18
Author: Florian Forster <octo at collectd.org>
Date:   Wed Mar 6 08:15:35 2013 +0100

    snort plugin: Replace the mmap() code with the tail-code from collectd.
    
    This makes following along a file more I/O friendly, I hope. Also, we
    don't need to do quite as much buffer processing because lines are
    already split for us. Also, in the unlikely case that Snort is writing
    the stats file more often than collectd reads it, this will pick up all
    intermediate values.

commit 99fa51782d5f407e3587d00f8335feee2e0a669b
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 27 08:18:21 2013 +0100

    AUTHORS, README: Add Kris and the snort plugin.

commit eb713c1a6b98e996dc4d539afb5cdace07c2c88a
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 27 08:17:54 2013 +0100

    collectd.conf(5): Add information about the snort plugin.

commit 47f1214f85d7c9ea199f17d976dada4b49e328ce
Author: Florian Forster <octo at collectd.org>
Date:   Tue Feb 26 07:42:21 2013 +0100

    snort plugin: Free md->instance in snort_metric_definition_destroy().

commit 67100d8b7cba7fd8da8966f9f24940a216c66da7
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 14:36:15 2013 +0100

    snort plugin: Implement the "Instance" config option.

commit b4d7785d1c3d8ee532a8e955cf534801fa1093c2
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 09:31:12 2013 +0100

    snort plugin: Assert that the configured "type" has only one data source.
    
    Also uses the utility function from configfile.h to read the metric
    definition's name.

commit 53d05e8592dc3277c88df320c26302c24c918c5b
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 09:14:15 2013 +0100

    snort plugin: Split the snort_read() function.
    
    snort_read() handles the file opening / mmap part of the process.
    snort_read_buffer() parses the buffer, splits the last line and calls
    the submit function. This way cleaning up the FD and memory mapping is
    easier in case of an error when parsing the file.

commit c97c8756a28969fea924a80bfc42c989dcd20ced
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 09:06:39 2013 +0100

    snort plugin: Improve error handling.
    
    This prevents file descriptors and memory from leaking if something goes
    wrong, e.g. the last line in the file is a comment.

commit d0d845e6e44cf123de6647bc095862ebe4b4feb3
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 08:54:46 2013 +0100

    snort plugin: Replace strsep() (a BSD extension).

commit 40b7e63a847baa4b11cdab40747a466946c91928
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 08:47:51 2013 +0100

    snort plugin: Add a bounady check when reading from the metrics array.
    
    Also renamed "count" to "metrics_num" to make it clear that the two
    relate to one another.

commit 5f4cf918e4952271849943d3b6546cb0c1be4635
Author: Kris Nielander <krisnielander at gmail.com>
Date:   Tue Feb 19 23:36:14 2013 +0100

    Updated configuration directives.
    --

commit 56d9d18e1741661f7ef8870022387a02220ac8ce
Author: Kris Nielander <krisnielander at gmail.com>
Date:   Mon Feb 18 23:17:42 2013 +0100

    Requested changes committed.

commit 8475240ad74e29bb52363509659663d856b3894f
Author: Kris Nielander <krisnielander at gmail.com>
Date:   Thu Feb 14 22:45:07 2013 +0100

    Requested changes applied.
    
    --

commit 08aff19113c75def38df69a8e84a224efc484bdf
Author: Kris Nielander <krisnielander at gmail.com>
Date:   Sun Feb 10 14:41:06 2013 +0100

    snort plugin added