Skip to content

Commit d0b414f

Browse files
committed
zeek add support for iso8601 timestamps
- relates elastic/beats#25564
1 parent b59c156 commit d0b414f

File tree

76 files changed

+273
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+273
-138
lines changed

packages/zeek/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "0.8.1"
3+
changes:
4+
- description: Add support for ISO8601 timestamps
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/1118
27
- version: "0.8.0"
38
changes:
49
- description: Update to ECS 1.10.0, adding processor fields and replacing default tags from . to - between words.

packages/zeek/data_stream/capture_loss/_dev/test/pipeline/test-capture-loss.log-expected.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"event": {
18-
"ingested": "2021-06-14T08:33:52.840653500Z",
18+
"ingested": "2021-06-17T13:41:22.759516Z",
1919
"original": "{\"ts\":1568132368.465338,\"ts_delta\":32.282249,\"peer\":\"bro\",\"gaps\":0,\"acks\":206,\"percent_lost\":0.0}",
2020
"type": "info",
2121
"created": "2020-04-28T11:07:58.223Z",
@@ -40,7 +40,7 @@
4040
}
4141
},
4242
"event": {
43-
"ingested": "2021-06-14T08:33:52.840677100Z",
43+
"ingested": "2021-06-17T13:41:22.759526400Z",
4444
"original": "{\"ts\":1617062640.941952,\"ts_delta\":900.0005369186401,\"peer\":\"zeek\",\"gaps\":58475,\"acks\":65665,\"percent_lost\":89.05048351481003}",
4545
"type": "info",
4646
"created": "2020-04-28T11:07:58.223Z",
@@ -65,7 +65,7 @@
6565
}
6666
},
6767
"event": {
68-
"ingested": "2021-06-14T08:33:52.840684700Z",
68+
"ingested": "2021-06-17T13:41:22.759530800Z",
6969
"original": "{\"ts\":1617063540.942231,\"ts_delta\":900.0002789497376,\"peer\":\"zeek\",\"gaps\":54754,\"acks\":61818,\"percent_lost\":88.5729075673752}",
7070
"type": "info",
7171
"created": "2020-04-28T11:07:58.223Z",
@@ -90,7 +90,7 @@
9090
}
9191
},
9292
"event": {
93-
"ingested": "2021-06-14T08:33:52.840750500Z",
93+
"ingested": "2021-06-17T13:41:22.759536200Z",
9494
"original": "{\"ts\":1617064440.942597,\"ts_delta\":900.0003659725189,\"peer\":\"zeek\",\"gaps\":51022,\"acks\":57974,\"percent_lost\":88.00841756649533}",
9595
"type": "info",
9696
"created": "2020-04-28T11:07:58.223Z",
@@ -115,7 +115,7 @@
115115
}
116116
},
117117
"event": {
118-
"ingested": "2021-06-14T08:33:52.840757600Z",
118+
"ingested": "2021-06-17T13:41:22.759543500Z",
119119
"original": "{\"ts\":1617065340.942651,\"ts_delta\":900.0000541210175,\"peer\":\"zeek\",\"gaps\":55105,\"acks\":62497,\"percent_lost\":88.17223226714883}",
120120
"type": "info",
121121
"created": "2020-04-28T11:07:58.223Z",
@@ -148,7 +148,7 @@
148148
}
149149
},
150150
"event": {
151-
"ingested": "2021-06-14T08:33:52.840763500Z",
151+
"ingested": "2021-06-17T13:41:22.759548900Z",
152152
"original": "{\"ts\":1568132368.465338,\"ts_delta\":32.282249,\"peer\":\"bro\",\"gaps\":0,\"acks\":206,\"percent_lost\":0.0}",
153153
"type": "info",
154154
"created": "2020-04-28T11:07:58.223Z",

packages/zeek/data_stream/capture_loss/elasticsearch/ingest_pipeline/default.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ processors:
6262
field: zeek.capture_loss.ts
6363
formats:
6464
- UNIX
65+
- ISO8601
6566
- set:
6667
field: event.kind
6768
value: metric

packages/zeek/data_stream/connection/_dev/test/pipeline/test-conn.log

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
{"ts":1617062400.703865,"uid":"C3pPjh1YRYcVDiZD3","id.orig_h":"10.156.0.2","id.orig_p":44944,"id.resp_h":"169.254.169.254","id.resp_p":80,"proto":"tcp","conn_state":"OTH","local_orig":true,"local_resp":false,"missed_bytes":0,"history":"C","orig_pkts":0,"orig_ip_bytes":0,"resp_pkts":0,"resp_ip_bytes":0}
1515
{"ts":1617062400.703851,"uid":"ChUxTmYLG37oO5qUb","id.orig_h":"10.156.0.2","id.orig_p":44942,"id.resp_h":"169.254.169.254","id.resp_p":80,"proto":"tcp","conn_state":"OTH","local_orig":true,"local_resp":false,"missed_bytes":0,"history":"C","orig_pkts":0,"orig_ip_bytes":0,"resp_pkts":0,"resp_ip_bytes":0}
1616
{"ts":1617062400.704467,"uid":"CpeAOT3B11CTXJgzw2","id.orig_h":"10.156.0.2","id.orig_p":44946,"id.resp_h":"169.254.169.254","id.resp_p":80,"proto":"tcp","conn_state":"OTH","local_orig":true,"local_resp":false,"missed_bytes":0,"history":"C","orig_pkts":0,"orig_ip_bytes":0,"resp_pkts":0,"resp_ip_bytes":0}
17-
{"preview":false,"offset":0,"result":{"_bkt":"main~0~0758E7C3-1D0C-4B2B-8CF0-682BFEA86CDC","_cd":"0:12","_indextime":"1608752616","_raw":"{\"ts\":1547188417.857497,\"uid\":\"CAcJw21BbVedgFnYH5\",\"id.orig_h\":\"4.4.2.2\",\"id.orig_p\":38334,\"id.resp_h\":\"8.8.8.8\",\"id.resp_p\":53,\"proto\":\"udp\",\"service\":\"dns\",\"duration\":0.076967,\"orig_bytes\":75,\"resp_bytes\":178,\"conn_state\":\"SF\",\"local_orig\":false,\"local_resp\":false,\"missed_bytes\":0,\"history\":\"Dd\",\"orig_pkts\":1,\"orig_ip_bytes\":103,\"resp_pkts\":1,\"resp_ip_bytes\":206,\"tunnel_parents\":[]}","_serial":"0","_si":["b590508aafed","main"],"_sourcetype":"access_log-too_small","_time":"2020-12-23 19:43:35.000 UTC","host":"Lees-MBP.localdomain","index":"main","linecount":"1","my_max":"1608759317","source":"/usr/local/var/log/httpd/access_log","sourcetype":"access_log-too_small","splunk_server":"b590508aafed"}}
17+
{"preview":false,"offset":0,"result":{"_bkt":"main~0~0758E7C3-1D0C-4B2B-8CF0-682BFEA86CDC","_cd":"0:12","_indextime":"1608752616","_raw":"{\"ts\":1547188417.857497,\"uid\":\"CAcJw21BbVedgFnYH5\",\"id.orig_h\":\"4.4.2.2\",\"id.orig_p\":38334,\"id.resp_h\":\"8.8.8.8\",\"id.resp_p\":53,\"proto\":\"udp\",\"service\":\"dns\",\"duration\":0.076967,\"orig_bytes\":75,\"resp_bytes\":178,\"conn_state\":\"SF\",\"local_orig\":false,\"local_resp\":false,\"missed_bytes\":0,\"history\":\"Dd\",\"orig_pkts\":1,\"orig_ip_bytes\":103,\"resp_pkts\":1,\"resp_ip_bytes\":206,\"tunnel_parents\":[]}","_serial":"0","_si":["b590508aafed","main"],"_sourcetype":"access_log-too_small","_time":"2020-12-23 19:43:35.000 UTC","host":"Lees-MBP.localdomain","index":"main","linecount":"1","my_max":"1608759317","source":"/usr/local/var/log/httpd/access_log","sourcetype":"access_log-too_small","splunk_server":"b590508aafed"}}
18+
{"ts":"2021-06-09T20:55:13.160328Z","uid":"C2KP1V3alRLoxl4JB9","id.orig_h":"10.0.2.15","id.orig_p":46408,"id.resp_h":"172.217.9.68","id.resp_p":80,"proto":"tcp","conn_state":"OTH","local_orig":true,"local_resp":false,"missed_bytes":0,"history":"C","orig_pkts":0,"orig_ip_bytes":0,"resp_pkts":0,"resp_ip_bytes":0}

0 commit comments

Comments
 (0)