[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta2-21-g81c42f4

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  81c42f49163bc01c441f0f3e9703b0393fb64860 (commit)
       via  6277d2e0e47fecc72807e09938307b18934a03df (commit)
       via  75397ed7508ac6cd870b3bb49a59d46b3c3f51cf (commit)
       via  5d95b081721b54eb33355bd79e299ef3eca388f4 (commit)
       via  51a540c27efa3b22f550d7f3da734dcebdc4b204 (commit)
       via  6252d24e0b45f57b8e5545c41292aa41863147a6 (commit)
       via  a95c95f74c345c0a6fd00f536cde0d46ee614335 (commit)
       via  e98346b555b39e689a1c2c6d0e643d0846ff61f6 (commit)
      from  ee8da21e3626bc02b878a0523f9f6294d134ff05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 81c42f49163bc01c441f0f3e9703b0393fb64860
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 3 13:22:46 2014 +0100

    log-stats: expand membuffer if necessary
    
    Many threads could lead to a membuffer size requirement bigger than
    64k. So use the expansion call to grow the buffer as needed.

commit 6277d2e0e47fecc72807e09938307b18934a03df
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 3 13:09:15 2014 +0100

    MemBuffer: add expansion call
    
    For some of the buffer users it's hard to predict how big the data
    will be. In the stats.log case this depends on chosen runmode and
    number of threads.
    
    To deal with this case a 'MemBufferExpand' call is added. This realloc's
    the buffer.

commit 75397ed7508ac6cd870b3bb49a59d46b3c3f51cf
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 4 09:17:10 2014 +0100

    stats: expose stats to Lua output
    
    Register with type 'stats':
    
        function init (args)
            local needs = {}
            needs["type"] = "stats"
            return needs
        end
    
    The stats are passed as an array of tables:
    
        { 1, { name=<name>, tmname=<tm_name>, value=<value>, pvalue=<pvalue>}}
        { 2, { name=<name>, tmname=<tm_name>, value=<value>, pvalue=<pvalue>}}
        etc
    
    Name is the counter name (e.g. decoder.invalid), tm_name is the thread name
    (e.g. AFPacketeth05), value is current value, and pvalue is the value of the
    last time the script was invoked.

commit 5d95b081721b54eb33355bd79e299ef3eca388f4
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 3 13:30:14 2014 +0100

    output streaming: cleanup at runmode destruction

commit 51a540c27efa3b22f550d7f3da734dcebdc4b204
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 3 13:00:26 2014 +0100

    stats: disable stats if no loggers are enabled

commit 6252d24e0b45f57b8e5545c41292aa41863147a6
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 4 10:34:28 2014 +0100

    stats: initialize after outputs
    
    Initialize stats after outputs so that we can check if we need to
    initialize the stats api at all.

commit a95c95f74c345c0a6fd00f536cde0d46ee614335
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 3 12:27:09 2014 +0100

    stats: introduce global config
    
    As the stats api calls the loggers at a global interval, the global
    interval should be configured globally.
    
     # global stats configuration
     stats:
       enabled: yes
       # The interval field (in seconds) controls at what interval
       # the loggers are invoked.
       interval: 8
    
    If this config isn't found, the old config will be supported.

commit e98346b555b39e689a1c2c6d0e643d0846ff61f6
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Oct 31 23:37:04 2014 +0100

    Introduce stats log API, convert existing output
    
    Convert regular 'stats.log' output to this new API.
    
    In addition to the current stats value, also give the last value. This
    makes it easy to display the difference.

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am                       |    2 +
 src/counters.c                        |  323 ++++++++++++++-------------------
 src/counters.h                        |   21 ---
 src/log-stats.c                       |  241 ++++++++++++++++++++++++
 src/{output-lua.h => log-stats.h}     |    8 +-
 src/output-lua.c                      |   59 ++++++
 src/{output-flow.c => output-stats.c} |   84 +++++----
 src/output-stats.h                    |   55 ++++++
 src/output-streaming.c                |   11 ++
 src/output-streaming.h                |    2 +
 src/output.c                          |   70 +++++++
 src/output.h                          |    8 +
 src/runmode-unix-socket.c             |    2 +-
 src/runmodes.c                        |   11 +-
 src/suricata.c                        |    9 +-
 src/tm-modules.c                      |    2 +
 src/tm-threads-common.h               |    2 +
 src/util-buffer.c                     |   28 +++
 src/util-buffer.h                     |    6 +
 src/util-error.c                      |    1 +
 src/util-error.h                      |    1 +
 suricata.yaml.in                      |   10 +-
 22 files changed, 695 insertions(+), 261 deletions(-)
 create mode 100644 src/log-stats.c
 copy src/{output-lua.h => log-stats.h} (86%)
 copy src/{output-flow.c => output-stats.c} (73%)
 create mode 100644 src/output-stats.h


hooks/post-receive
-- 
OISF