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

Fixing pack_scale and time-as-int.

Browse source 
Also removing now unneccessary canonifier script, and updating test
baselines.
This commit is contained in:
Robin Sommer 2012-05-14 21:58:58 -07:00
parent 00b592f933
commit fabe891d4f
8 changed files with 144 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

140
testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.rotate/out
View file

@ -20,7 +20,7 @@ test.2011-03-07-12-00-05.ds test 11-03-07_12.00.05 11-03-07_12.59.55 1 dataserie
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -34,17 +34,17 @@ test.2011-03-07-12-00-05.ds test 11-03-07_12.00.05 11-03-07_12.59.55 1 dataserie
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
508 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299467e+09 10.0.0.1 20 10.0.0.2 1024
1.299471e+09 10.0.0.2 20 10.0.0.3 0
1299466805.000000 10.0.0.1 20 10.0.0.2 1024
1299470395.000000 10.0.0.2 20 10.0.0.3 0
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
508 DataSeries: ExtentIndex
> test.2011-03-07-04-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -57,7 +57,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -71,17 +71,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.29947e+09 10.0.0.1 20 10.0.0.2 1025
1.299474e+09 10.0.0.2 20 10.0.0.3 1
1299470405.000000 10.0.0.1 20 10.0.0.2 1025
1299473995.000000 10.0.0.2 20 10.0.0.3 1
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-05-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -94,7 +94,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -108,17 +108,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299474e+09 10.0.0.1 20 10.0.0.2 1026
1.299478e+09 10.0.0.2 20 10.0.0.3 2
1299474005.000000 10.0.0.1 20 10.0.0.2 1026
1299477595.000000 10.0.0.2 20 10.0.0.3 2
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-06-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -131,7 +131,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -145,17 +145,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299478e+09 10.0.0.1 20 10.0.0.2 1027
1.299482e+09 10.0.0.2 20 10.0.0.3 3
1299477605.000000 10.0.0.1 20 10.0.0.2 1027
1299481195.000000 10.0.0.2 20 10.0.0.3 3
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-07-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -168,7 +168,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -182,17 +182,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
512 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299481e+09 10.0.0.1 20 10.0.0.2 1028
1.299485e+09 10.0.0.2 20 10.0.0.3 4
1299481205.000000 10.0.0.1 20 10.0.0.2 1028
1299484795.000000 10.0.0.2 20 10.0.0.3 4
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
512 DataSeries: ExtentIndex
> test.2011-03-07-08-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -205,7 +205,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -219,17 +219,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299485e+09 10.0.0.1 20 10.0.0.2 1029
1.299489e+09 10.0.0.2 20 10.0.0.3 5
1299484805.000000 10.0.0.1 20 10.0.0.2 1029
1299488395.000000 10.0.0.2 20 10.0.0.3 5
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-09-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -242,7 +242,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -256,17 +256,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299488e+09 10.0.0.1 20 10.0.0.2 1030
1.299492e+09 10.0.0.2 20 10.0.0.3 6
1299488405.000000 10.0.0.1 20 10.0.0.2 1030
1299491995.000000 10.0.0.2 20 10.0.0.3 6
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-10-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -279,7 +279,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -293,17 +293,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299492e+09 10.0.0.1 20 10.0.0.2 1031
1.299496e+09 10.0.0.2 20 10.0.0.3 7
1299492005.000000 10.0.0.1 20 10.0.0.2 1031
1299495595.000000 10.0.0.2 20 10.0.0.3 7
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-11-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -316,7 +316,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -330,17 +330,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299496e+09 10.0.0.1 20 10.0.0.2 1032
1.2995e+09 10.0.0.2 20 10.0.0.3 8
1299495605.000000 10.0.0.1 20 10.0.0.2 1032
1299499195.000000 10.0.0.2 20 10.0.0.3 8
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
> test.2011-03-07-12-00-05.ds
# Extent Types ...
<ExtentType name="DataSeries: ExtentIndex">
@ -353,7 +353,7 @@ offset extenttype
</ExtentType>
<ExtentType name="test" version="1.0" namespace="bro-ids.org">
<field type="double" name="t" pack_relative="t" pack_scale="1000" pack_scale_warn="no"/>
<field type="double" name="t" pack_relative="t" pack_scale="1e-6" print_format="%.6f" pack_scale_warn="no"/>
<field type="variable32" name="id.orig_h" pack_unique="yes"/>
<field type="int64" name="id.orig_p" />
<field type="variable32" name="id.resp_h" pack_unique="yes"/>
@ -367,14 +367,14 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
1.299499e+09 10.0.0.1 20 10.0.0.2 1033
1.299503e+09 10.0.0.2 20 10.0.0.3 9
1299499205.000000 10.0.0.1 20 10.0.0.2 1033
1299502795.000000 10.0.0.2 20 10.0.0.3 9
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
372 test
484 DataSeries: ExtentIndex
392 test
516 DataSeries: ExtentIndex