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

Fix closing timestamp of rotated log files in supervised-cluster mode

Browse source
This commit is contained in:
Jon Siwek 2020-08-25 17:04:12 -07:00
parent 8d3c07b62a
commit 99d9a3a48c
6 changed files with 66 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.3.0-dev.196 | 2020-08-25 17:04:12 -0700
* Fix closing timestamp of rotated log files in supervised-cluster mode (Jon Siwek, Corelight)
3.3.0-dev.195 | 2020-08-25 14:32:47 -0700 3.3.0-dev.195 | 2020-08-25 14:32:47 -0700
* Improve an Intel framework btest (Jon Siwek, Corelight) * Improve an Intel framework btest (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.195 3.3.0-dev.196

2
auxil/zeek-archiver

@ -1 +1 @@
Subproject commit 32715bf13222610960f9f1969d6b661d59874aa7 Subproject commit 107b7bd51d530df888996553123992d05f1ee27b

2
scripts/base/frameworks/cluster/nodes/logger.zeek
View file

@ -29,7 +29,7 @@ redef Log::default_rotation_dir = "log-queue";
function supervisor_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath function supervisor_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath
{ {
local open_str = strftime(Log::default_rotation_date_format, ri$open); local open_str = strftime(Log::default_rotation_date_format, ri$open);
local close_str = strftime(Log::default_rotation_date_format, ri$open); local close_str = strftime(Log::default_rotation_date_format, ri$close);
local base = fmt("%s__%s__%s__", ri$path, open_str, close_str); local base = fmt("%s__%s__%s__", ri$path, open_str, close_str);
local rval = Log::RotationPath($file_basename=base); local rval = Log::RotationPath($file_basename=base);
return rval; return rval;

116
testing/btest/Baseline/scripts.base.frameworks.logging.rotate-custom-fmt-func/out
View file

@ -1,32 +1,32 @@
1st test__2011-03-07-03-00-05__2011-03-07-03-00-05__.log test 11-03-07_03.00.05 11-03-07_04.00.05 0 ascii 1st test__2011-03-07-03-00-05__2011-03-07-04-00-05__.log test 11-03-07_03.00.05 11-03-07_04.00.05 0 ascii
1st test__2011-03-07-04-00-05__2011-03-07-04-00-05__.log test 11-03-07_04.00.05 11-03-07_05.00.05 0 ascii 1st test__2011-03-07-04-00-05__2011-03-07-05-00-05__.log test 11-03-07_04.00.05 11-03-07_05.00.05 0 ascii
1st test__2011-03-07-05-00-05__2011-03-07-05-00-05__.log test 11-03-07_05.00.05 11-03-07_06.00.05 0 ascii 1st test__2011-03-07-05-00-05__2011-03-07-06-00-05__.log test 11-03-07_05.00.05 11-03-07_06.00.05 0 ascii
1st test__2011-03-07-06-00-05__2011-03-07-06-00-05__.log test 11-03-07_06.00.05 11-03-07_07.00.05 0 ascii 1st test__2011-03-07-06-00-05__2011-03-07-07-00-05__.log test 11-03-07_06.00.05 11-03-07_07.00.05 0 ascii
1st test__2011-03-07-07-00-05__2011-03-07-07-00-05__.log test 11-03-07_07.00.05 11-03-07_08.00.05 0 ascii 1st test__2011-03-07-07-00-05__2011-03-07-08-00-05__.log test 11-03-07_07.00.05 11-03-07_08.00.05 0 ascii
1st test__2011-03-07-08-00-05__2011-03-07-08-00-05__.log test 11-03-07_08.00.05 11-03-07_09.00.05 0 ascii 1st test__2011-03-07-08-00-05__2011-03-07-09-00-05__.log test 11-03-07_08.00.05 11-03-07_09.00.05 0 ascii
1st test__2011-03-07-09-00-05__2011-03-07-09-00-05__.log test 11-03-07_09.00.05 11-03-07_10.00.05 0 ascii 1st test__2011-03-07-09-00-05__2011-03-07-10-00-05__.log test 11-03-07_09.00.05 11-03-07_10.00.05 0 ascii
1st test__2011-03-07-10-00-05__2011-03-07-10-00-05__.log test 11-03-07_10.00.05 11-03-07_11.00.05 0 ascii 1st test__2011-03-07-10-00-05__2011-03-07-11-00-05__.log test 11-03-07_10.00.05 11-03-07_11.00.05 0 ascii
1st test__2011-03-07-11-00-05__2011-03-07-11-00-05__.log test 11-03-07_11.00.05 11-03-07_12.00.05 0 ascii 1st test__2011-03-07-11-00-05__2011-03-07-12-00-05__.log test 11-03-07_11.00.05 11-03-07_12.00.05 0 ascii
1st test__2011-03-07-12-00-05__2011-03-07-12-00-05__.log test 11-03-07_12.00.05 11-03-07_12.59.55 1 ascii 1st test__2011-03-07-12-00-05__2011-03-07-12-59-55__.log test 11-03-07_12.00.05 11-03-07_12.59.55 1 ascii
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-03-00-05__2011-03-07-03-00-05__.log, path=test2, open=1299466805.0, close=1299470395.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-03-00-05__2011-03-07-03-59-55__.log, path=test2, open=1299466805.0, close=1299470395.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-03-59-55__2011-03-07-03-59-55__.log, path=test2, open=1299470395.0, close=1299470405.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-03-59-55__2011-03-07-04-00-05__.log, path=test2, open=1299470395.0, close=1299470405.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-04-00-05__2011-03-07-04-00-05__.log, path=test2, open=1299470405.0, close=1299473995.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-04-00-05__2011-03-07-04-59-55__.log, path=test2, open=1299470405.0, close=1299473995.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-04-59-55__2011-03-07-04-59-55__.log, path=test2, open=1299473995.0, close=1299474005.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-04-59-55__2011-03-07-05-00-05__.log, path=test2, open=1299473995.0, close=1299474005.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-05-00-05__2011-03-07-05-00-05__.log, path=test2, open=1299474005.0, close=1299477595.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-05-00-05__2011-03-07-05-59-55__.log, path=test2, open=1299474005.0, close=1299477595.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-05-59-55__2011-03-07-05-59-55__.log, path=test2, open=1299477595.0, close=1299477605.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-05-59-55__2011-03-07-06-00-05__.log, path=test2, open=1299477595.0, close=1299477605.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-06-00-05__2011-03-07-06-00-05__.log, path=test2, open=1299477605.0, close=1299481195.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-06-00-05__2011-03-07-06-59-55__.log, path=test2, open=1299477605.0, close=1299481195.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-06-59-55__2011-03-07-06-59-55__.log, path=test2, open=1299481195.0, close=1299481205.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-06-59-55__2011-03-07-07-00-05__.log, path=test2, open=1299481195.0, close=1299481205.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-07-00-05__2011-03-07-07-00-05__.log, path=test2, open=1299481205.0, close=1299484795.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-07-00-05__2011-03-07-07-59-55__.log, path=test2, open=1299481205.0, close=1299484795.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-07-59-55__2011-03-07-07-59-55__.log, path=test2, open=1299484795.0, close=1299484805.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-07-59-55__2011-03-07-08-00-05__.log, path=test2, open=1299484795.0, close=1299484805.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-08-00-05__2011-03-07-08-00-05__.log, path=test2, open=1299484805.0, close=1299488395.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-08-00-05__2011-03-07-08-59-55__.log, path=test2, open=1299484805.0, close=1299488395.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-08-59-55__2011-03-07-08-59-55__.log, path=test2, open=1299488395.0, close=1299488405.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-08-59-55__2011-03-07-09-00-05__.log, path=test2, open=1299488395.0, close=1299488405.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-09-00-05__2011-03-07-09-00-05__.log, path=test2, open=1299488405.0, close=1299491995.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-09-00-05__2011-03-07-09-59-55__.log, path=test2, open=1299488405.0, close=1299491995.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-09-59-55__2011-03-07-09-59-55__.log, path=test2, open=1299491995.0, close=1299492005.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-09-59-55__2011-03-07-10-00-05__.log, path=test2, open=1299491995.0, close=1299492005.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-10-00-05__2011-03-07-10-00-05__.log, path=test2, open=1299492005.0, close=1299495595.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-10-00-05__2011-03-07-10-59-55__.log, path=test2, open=1299492005.0, close=1299495595.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-10-59-55__2011-03-07-10-59-55__.log, path=test2, open=1299495595.0, close=1299495605.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-10-59-55__2011-03-07-11-00-05__.log, path=test2, open=1299495595.0, close=1299495605.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-11-00-05__2011-03-07-11-00-05__.log, path=test2, open=1299495605.0, close=1299499195.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-11-00-05__2011-03-07-11-59-55__.log, path=test2, open=1299495605.0, close=1299499195.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-11-59-55__2011-03-07-11-59-55__.log, path=test2, open=1299499195.0, close=1299499205.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-11-59-55__2011-03-07-12-00-05__.log, path=test2, open=1299499195.0, close=1299499205.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-12-00-05__2011-03-07-12-00-05__.log, path=test2, open=1299499205.0, close=1299502795.0, terminating=F] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-12-00-05__2011-03-07-12-59-55__.log, path=test2, open=1299499205.0, close=1299502795.0, terminating=F]
custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-12-59-55__2011-03-07-12-59-55__.log, path=test2, open=1299502795.0, close=1299502795.0, terminating=T] custom rotate, [writer=Log::WRITER_ASCII, fname=test2__2011-03-07-12-59-55__2011-03-07-12-59-55__.log, path=test2, open=1299502795.0, close=1299502795.0, terminating=T]
#close XXXX-XX-XX-XX-XX-XX #close XXXX-XX-XX-XX-XX-XX
#empty_field (empty) #empty_field (empty)
@ -58,33 +58,33 @@ XXXXXXXXXX.XXXXXX 10.0.0.1 20 10.0.0.2 1032
XXXXXXXXXX.XXXXXX 10.0.0.2 20 10.0.0.3 8 XXXXXXXXXX.XXXXXX 10.0.0.2 20 10.0.0.3 8
XXXXXXXXXX.XXXXXX 10.0.0.1 20 10.0.0.2 1033 XXXXXXXXXX.XXXXXX 10.0.0.1 20 10.0.0.2 1033
XXXXXXXXXX.XXXXXX 10.0.0.2 20 10.0.0.3 9 XXXXXXXXXX.XXXXXX 10.0.0.2 20 10.0.0.3 9
> test2__2011-03-07-03-00-05__2011-03-07-03-00-05__.log > test2__2011-03-07-03-00-05__2011-03-07-03-59-55__.log
> test2__2011-03-07-03-59-55__2011-03-07-03-59-55__.log > test2__2011-03-07-03-59-55__2011-03-07-04-00-05__.log
> test2__2011-03-07-04-00-05__2011-03-07-04-00-05__.log > test2__2011-03-07-04-00-05__2011-03-07-04-59-55__.log
> test2__2011-03-07-04-59-55__2011-03-07-04-59-55__.log > test2__2011-03-07-04-59-55__2011-03-07-05-00-05__.log
> test2__2011-03-07-05-00-05__2011-03-07-05-00-05__.log > test2__2011-03-07-05-00-05__2011-03-07-05-59-55__.log
> test2__2011-03-07-05-59-55__2011-03-07-05-59-55__.log > test2__2011-03-07-05-59-55__2011-03-07-06-00-05__.log
> test2__2011-03-07-06-00-05__2011-03-07-06-00-05__.log > test2__2011-03-07-06-00-05__2011-03-07-06-59-55__.log
> test2__2011-03-07-06-59-55__2011-03-07-06-59-55__.log > test2__2011-03-07-06-59-55__2011-03-07-07-00-05__.log
> test2__2011-03-07-07-00-05__2011-03-07-07-00-05__.log > test2__2011-03-07-07-00-05__2011-03-07-07-59-55__.log
> test2__2011-03-07-07-59-55__2011-03-07-07-59-55__.log > test2__2011-03-07-07-59-55__2011-03-07-08-00-05__.log
> test2__2011-03-07-08-00-05__2011-03-07-08-00-05__.log > test2__2011-03-07-08-00-05__2011-03-07-08-59-55__.log
> test2__2011-03-07-08-59-55__2011-03-07-08-59-55__.log > test2__2011-03-07-08-59-55__2011-03-07-09-00-05__.log
> test2__2011-03-07-09-00-05__2011-03-07-09-00-05__.log > test2__2011-03-07-09-00-05__2011-03-07-09-59-55__.log
> test2__2011-03-07-09-59-55__2011-03-07-09-59-55__.log > test2__2011-03-07-09-59-55__2011-03-07-10-00-05__.log
> test2__2011-03-07-10-00-05__2011-03-07-10-00-05__.log > test2__2011-03-07-10-00-05__2011-03-07-10-59-55__.log
> test2__2011-03-07-10-59-55__2011-03-07-10-59-55__.log > test2__2011-03-07-10-59-55__2011-03-07-11-00-05__.log
> test2__2011-03-07-11-00-05__2011-03-07-11-00-05__.log > test2__2011-03-07-11-00-05__2011-03-07-11-59-55__.log
> test2__2011-03-07-11-59-55__2011-03-07-11-59-55__.log > test2__2011-03-07-11-59-55__2011-03-07-12-00-05__.log
> test2__2011-03-07-12-00-05__2011-03-07-12-00-05__.log > test2__2011-03-07-12-00-05__2011-03-07-12-59-55__.log
> test2__2011-03-07-12-59-55__2011-03-07-12-59-55__.log > test2__2011-03-07-12-59-55__2011-03-07-12-59-55__.log
> test__2011-03-07-03-00-05__2011-03-07-03-00-05__.log > test__2011-03-07-03-00-05__2011-03-07-04-00-05__.log
> test__2011-03-07-04-00-05__2011-03-07-04-00-05__.log > test__2011-03-07-04-00-05__2011-03-07-05-00-05__.log
> test__2011-03-07-05-00-05__2011-03-07-05-00-05__.log > test__2011-03-07-05-00-05__2011-03-07-06-00-05__.log
> test__2011-03-07-06-00-05__2011-03-07-06-00-05__.log > test__2011-03-07-06-00-05__2011-03-07-07-00-05__.log
> test__2011-03-07-07-00-05__2011-03-07-07-00-05__.log > test__2011-03-07-07-00-05__2011-03-07-08-00-05__.log
> test__2011-03-07-08-00-05__2011-03-07-08-00-05__.log > test__2011-03-07-08-00-05__2011-03-07-09-00-05__.log
> test__2011-03-07-09-00-05__2011-03-07-09-00-05__.log > test__2011-03-07-09-00-05__2011-03-07-10-00-05__.log
> test__2011-03-07-10-00-05__2011-03-07-10-00-05__.log > test__2011-03-07-10-00-05__2011-03-07-11-00-05__.log
> test__2011-03-07-11-00-05__2011-03-07-11-00-05__.log > test__2011-03-07-11-00-05__2011-03-07-12-00-05__.log
> test__2011-03-07-12-00-05__2011-03-07-12-00-05__.log > test__2011-03-07-12-00-05__2011-03-07-12-59-55__.log

2
testing/btest/scripts/base/frameworks/logging/rotate-custom-fmt-func.zeek
View file

@ -21,7 +21,7 @@ export {
function my_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath function my_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath
{ {
local open_str = strftime(Log::default_rotation_date_format, ri$open); local open_str = strftime(Log::default_rotation_date_format, ri$open);
local close_str = strftime(Log::default_rotation_date_format, ri$open); local close_str = strftime(Log::default_rotation_date_format, ri$close);
local base = fmt("%s__%s__%s__", ri$path, open_str, close_str); local base = fmt("%s__%s__%s__", ri$path, open_str, close_str);
local rval = Log::RotationPath($file_basename=base); local rval = Log::RotationPath($file_basename=base);
return rval; return rval;