Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/seth/json-formatter'

Browse source 
* origin/topic/seth/json-formatter:
  Updating a couple of tests.
  Expanded support for modifying the timestamp format in the JSON formatter.
  Ascii input reader now supports all config options per-input stream.
  Added an option to the JSON formatter to use ISO 8601 for timestamps.
  Refactored formatters and updated the the writers a bit.

Includes some minor bugfixes and cleanup at various places, including
in old code.
This commit is contained in:
Robin Sommer 2014-03-13 16:01:25 -07:00
commit ff261ea626
34 changed files with 1038 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

6
testing/external/scripts/testing-setup.bro vendored
View file

@ -10,3 +10,9 @@
#log forwarding to ES.
redef LogElasticSearch::server_host = "";
@endif
@ifdef ( LogAscii::use_json )
# Don't start logging everything as JSON.
# (json-logs.bro activates this).
redef LogAscii::use_json = F;
@endif