Skip to content

Commit b64b80c

Browse files
authored
Move Zeek docs to Integrations area (#4694)
1 parent ed3b086 commit b64b80c

File tree

8 files changed

+337
-337
lines changed

8 files changed

+337
-337
lines changed

CHANGELOG.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ questions.
248248
* Add an `unflatten()` function that turns fields with dot-separated names into fields of nested records (#2277)
249249
* Fix an issue where querying an index in a Zed lake did not return all matched records (#2273)
250250
* Accept type definition names and aliases in shaper functions (#2289)
251-
* Add a reference [shaper for Zeek data](zeek/Shaping-Zeek-NDJSON.md) (#2300, #2368, #2448, #2489, #2601)
251+
* Add a reference [shaper for Zeek data](docs/integrations/zeek/shaping-zeek-ndjson.md) (#2300, #2368, #2448, #2489, #2601)
252252
* Fix an issue where accessing a `null` array element in a `by` grouping caused a panic (#2310)
253253
* Add support for parsing timestamps with offset format `±[hh][mm]` (#2297)
254254
* Remove cropping from `shape()` (#2309)
@@ -326,7 +326,7 @@ questions.
326326
* Fix an issue where `len()` of a `null` array was evaluating to something greater than zero (#2761)
327327
* Fix an issue where `sort` with no fields was ignoring alias types and nested fields when picking a sort field (#2762)
328328
* Fix an issue where unexpected `cut: no record found` warnings were returned by `zed lake query` but not when the same data was queried via `zq` (#2764)
329-
* Move and extend the [Zeek interoperability docs](zeek/README.md) (#2770, #2782, #2830)
329+
* Move and extend the [Zeek interoperability docs](docs/integrations/zeek/README.md) (#2770, #2782, #2830)
330330
* Create endpoints in the Zed lake service API that correspond to underlying Zed lake operations, and expose them via `zapi` commands (#2741, #2774, #2786, #2775, #2794, #2795, #2796, #2920, #2925, #2928)
331331
* Fix an issue where `zq` would surface a syntax error when reading ZSON it had sent as output (#2792)
332332
* Add an `/events` endpoint to the API, which can be used by clients such as the Brim app to be notified of pool updates (#2791)
@@ -365,7 +365,7 @@ questions.
365365
* Fix an issue where temporary spill-to-disk directories were not being deleted upon exit (#3009, #3010)
366366
* Fix a ZSON issue with `union` types with alias decorators (#3015, #3016)
367367
* The ZSON format has been changed such that integer type IDs are no longer output (#3017)
368-
* Update the reference Zed shaper for Zeek ([shaper](zeek/shaper.zed), [docs](zeek/Shaping-Zeek-NDJSON.md)) to reflect changes in Zeek release v4.1.0 (#3021)
368+
* Update the reference Zed shaper for Zeek ([docs](docs/integrations/zeek/shaping-zeek-ndjson.md)) to reflect changes in Zeek release v4.1.0 (#3021)
369369
* Fix an issue where backslash escapes in Zed regular expressions were not accepted (#3040)
370370
* The ZST format has been updated to work for typedef'd outer records (#3047)
371371
* Fix an issue where an empty string could not be output as a JSON field name (#3054)
@@ -416,7 +416,7 @@ questions.
416416

417417
* zqd: Update Zeek pointer to [v3.2.1-brim9](https://github.com/brimdata/zeek/releases/tag/v3.2.1-brim9) which provides the latest [geolocation](https://github.com/brimdata/brim/wiki/Geolocation) data (#2010)
418418
* zqd: Update Suricata pointer to [v5.0.3-brim1](https://github.com/brimdata/build-suricata/releases/tag/v5.0.3-brim1) which disables checksum checks, allowing for alert creation on more types of pcaps (#1975)
419-
* ZSON: Update [Zeek Interoperability doc](zeek/Data-Type-Compatibility.md) to include current ZSON syntax (#1956)
419+
* ZSON: Update [Zeek Interoperability doc](docs/integrations/zeek/data-type-compatibility.md) to include current ZSON syntax (#1956)
420420
* zq: Ensure the output from the [`fuse`](docs/language/operators/fuse.md) operator is deterministic (#1958)
421421
* zq: Fix an issue where the presence of the Greek µ character caused a ZSON read parsing error (#1967)
422422
* zqd: Fix an issue where Zeek events generated during pcap import and written to an archivestore were only visible after ingest completion (#1973)
@@ -500,7 +500,7 @@ questions.
500500

501501
## v0.23.0
502502
* zql: Add `week` as a unit for [time grouping with `every`](docs/language/functions/every.md) (#1374)
503-
* zq: Fix an issue where a `null` value in a [JSON type definition](zeek/README.md) caused a failure without an error message (#1377)
503+
* zq: Fix an issue where a `null` value in a [JSON type definition](docs/integrations/zeek/README.md) caused a failure without an error message (#1377)
504504
* zq: Add [`zst` format](docs/formats/vng.md) to `-i` and `-f` command-line help (#1384)
505505
* zq: ZNG spec and `zq` updates to introduce the beta ZNG storage format (#1375, #1415, #1394, #1457, #1512, #1523, #1529), also addressing the following:
506506
* New data type `bytes` for storing sequences of bytes encoded as base64 (#1315)
@@ -516,11 +516,11 @@ questions.
516516
* zqd: Check and convert alpha ZNG filestores to beta ZNG (#1574, #1576)
517517
* zq: Fix an issue where spill-to-disk file names could collide (#1391)
518518
* zq: Allow the [`fuse` operator](docs/language/operators/fuse.md) to spill-to-disk to avoid memory limitations (#1355, #1402)
519-
* zq: No longer require `_path` as a first column in a [JSON type definition](zeek/README.md) (#1370)
519+
* zq: No longer require `_path` as a first column in a [JSON type definition](docs/integrations/zeek/README.md) (#1370)
520520
* zql: Improve ZQL docs for [aggregate functions](docs/language/operators/summarize.md) and grouping (#1385)
521521
* zql: Point links for developer docs at [pkg.go.dev](https://pkg.go.dev/) instead of [godoc.org](https://godoc.org/) (#1401)
522522
* zq: Add support for timestamps with signed timezone offsets (#1389)
523-
* zq: Add a [JSON type definition](zeek/README.md) for alert events in [Suricata EVE logs](https://suricata.readthedocs.io/en/suricata-5.0.2/output/eve/eve-json-output.html) (#1400)
523+
* zq: Add a [JSON type definition](docs/integrations/zeek/README.md) for alert events in [Suricata EVE logs](https://suricata.readthedocs.io/en/suricata-5.0.2/output/eve/eve-json-output.html) (#1400)
524524
* zq: Update the [ZNG over JSON (ZJSON)](docs/formats/zjson.md) spec and implementation (#1299)
525525
* zar: Use buffered streaming for archive import (#1397)
526526
* zq: Add an `ast` command that prints parsed ZQL as its underlying JSON object (#1416)
@@ -652,7 +652,7 @@ questions.
652652
* zql: Group-by no longer emits records in "deterministic but undefined" order (#914)
653653
* zqd: Revise constraints on Space names (#853, #926, #944, #945)
654654
* zqd: Fix an issue where a file replacement race could cause an "access is denied" error in Brim during pcap import (#925)
655-
* zng: Revise [Zeek compatibility](zeek/Data-Type-Compatibility.md) doc (#919)
655+
* zng: Revise [Zeek compatibility](docs/integrations/zeek/data-type-compatibility.md) doc (#919)
656656
* zql: Clarify [`cut` operator documentation](docs/language/operators/cut.md) (#924)
657657
* zqd: Fix an issue where an invalid 1970 Space start time could be created in Brim during pcap import (#938)
658658

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ with logs from the [Zeek](https://zeek.org/) open source network security
55
monitoring tool. Depending on how you use Zeek, one or more of the following
66
docs may be of interest to you.
77

8-
* [Reading Zeek Log Formats](Reading-Zeek-Log-Formats.md)
9-
* [Zed/Zeek Data Type Compatibility](Data-Type-Compatibility.md)
10-
* [Shaping Zeek NDJSON](Shaping-Zeek-NDJSON.md)
8+
* [Reading Zeek Log Formats](reading-zeek-log-formats.md)
9+
* [Zed/Zeek Data Type Compatibility](data-type-compatibility.md)
10+
* [Shaping Zeek NDJSON](shaping-zeek-ndjson.md)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
position: 3
2+
label: Zeek

zeek/Data-Type-Compatibility.md renamed to docs/integrations/zeek/data-type-compatibility.md

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,29 @@
1-
# Zed/Zeek Data Type Compatibility
2-
3-
- [Introduction](#introduction)
4-
- [Equivalent Types](#equivalent-types)
5-
- [Example](#example)
6-
- [Type-Specific Details](#type-specific-details)
7-
* [`double`](#double)
8-
* [`enum`](#enum)
9-
* [`port`](#port)
10-
* [`set`](#set)
11-
* [`string`](#string)
12-
* [`record`](#record)
1+
---
2+
sidebar_position: 2
3+
sidebar_label: Zed/Zeek Data Type Compatibility
4+
---
135

14-
## Introduction
6+
# Zed/Zeek Data Type Compatibility
157

168
As the Zed data model was in many ways inspired by the
179
[Zeek TSV log format](https://docs.zeek.org/en/master/log-formats.html#zeek-tsv-format-logs),
18-
the rich Zed storage formats ([ZSON](../docs/formats/zson.md),
19-
[ZNG](../docs/formats/zng.md), etc.) maintain comprehensive interoperability
10+
the rich Zed storage formats ([ZSON](../../formats/zson.md),
11+
[ZNG](../../formats/zng.md), etc.) maintain comprehensive interoperability
2012
with Zeek. When Zeek is configured to output its logs in
2113
NDJSON format, much of the rich type information is lost in translation, but
22-
this can be restored by following the guidance for [shaping Zeek NDJSON](Shaping-Zeek-NDJSON.md).
14+
this can be restored by following the guidance for [shaping Zeek NDJSON](shaping-zeek-ndjson.md).
2315
On the other hand, Zeek TSV can be converted to Zed storage formats and back to
2416
Zeek TSV without any loss of information.
2517

2618
This document describes how the Zed type system is able to represent each of
2719
the types that may appear in Zeek logs.
2820

29-
Tools like [`zq`](https://github.com/brimdata/zed) and
30-
[Zui](https://github.com/brimdata/zui) maintain an internal Zed-typed
21+
Tools like [`zq`](../../commands/zq.md) and
22+
[Zui](https://zui.brimdata.io/) maintain an internal Zed-typed
3123
representation of any Zeek data that is read or imported. Therefore, knowing
3224
the equivalent types will prove useful when performing operations in the
33-
[Zed language](../docs/language/README.md) such as
34-
[type casting](../docs/language/README.md#data-types) or looking at the data
25+
[Zed language](../../language/README.md) such as
26+
[type casting](../../language/data-types.md) or looking at the data
3527
when output as ZSON.
3628

3729
## Equivalent Types
@@ -45,20 +37,20 @@ applicable to handling certain types.
4537

4638
| Zeek Type | Zed Type | Additional Detail |
4739
|------------|------------|-------------------|
48-
| [`bool`](https://docs.zeek.org/en/current/script-reference/types.html#type-bool) | [`bool`](../docs/formats/zson.md#33-primitive-values) | |
49-
| [`count`](https://docs.zeek.org/en/current/script-reference/types.html#type-count) | [`uint64`](../docs/formats/zson.md#33-primitive-values) | |
50-
| [`int`](https://docs.zeek.org/en/current/script-reference/types.html#type-int) | [`int64`](../docs/formats/zson.md#33-primitive-values) | |
51-
| [`double`](https://docs.zeek.org/en/current/script-reference/types.html#type-double) | [`float64`](../docs/formats/zson.md#33-primitive-values) | See [`double` details](#double) |
52-
| [`time`](https://docs.zeek.org/en/current/script-reference/types.html#type-time) | [`time`](../docs/formats/zson.md#33-primitive-values) | |
53-
| [`interval`](https://docs.zeek.org/en/current/script-reference/types.html#type-interval) | [`duration`](../docs/formats/zson.md#33-primitive-values) | |
54-
| [`string`](https://docs.zeek.org/en/current/script-reference/types.html#type-string) | [`string`](../docs/formats/zson.md#33-primitive-values) | See [`string` details about escaping](#string) |
55-
| [`port`](https://docs.zeek.org/en/current/script-reference/types.html#type-port) | [`uint16`](../docs/formats/zson.md#33-primitive-values) | See [`port` details](#port) |
56-
| [`addr`](https://docs.zeek.org/en/current/script-reference/types.html#type-addr) | [`ip`](../docs/formats/zson.md#33-primitive-values) | |
57-
| [`subnet`](https://docs.zeek.org/en/current/script-reference/types.html#type-subnet) | [`net`](../docs/formats/zson.md#33-primitive-values) | |
58-
| [`enum`](https://docs.zeek.org/en/current/script-reference/types.html#type-enum) | [`string`](../docs/formats/zson.md#33-primitive-values) | See [`enum` details](#enum) |
59-
| [`set`](https://docs.zeek.org/en/current/script-reference/types.html#type-set) | [`set`](../docs/formats/zson.md#343-set-value) | See [`set` details](#set) |
60-
| [`vector`](https://docs.zeek.org/en/current/script-reference/types.html#type-vector) | [`array`](../docs/formats/zson.md#342-array-value) | |
61-
| [`record`](https://docs.zeek.org/en/current/script-reference/types.html#type-record) | [`record`](../docs/formats/zson.md#341-record-value) | See [`record` details](#record) |
40+
| [`bool`](https://docs.zeek.org/en/current/script-reference/types.html#type-bool) | [`bool`](../../formats/zson.md#23-primitive-values) | |
41+
| [`count`](https://docs.zeek.org/en/current/script-reference/types.html#type-count) | [`uint64`](../../formats/zson.md#23-primitive-values) | |
42+
| [`int`](https://docs.zeek.org/en/current/script-reference/types.html#type-int) | [`int64`](../../formats/zson.md#23-primitive-values) | |
43+
| [`double`](https://docs.zeek.org/en/current/script-reference/types.html#type-double) | [`float64`](../../formats/zson.md#23-primitive-values) | See [`double` details](#double) |
44+
| [`time`](https://docs.zeek.org/en/current/script-reference/types.html#type-time) | [`time`](../../formats/zson.md#23-primitive-values) | |
45+
| [`interval`](https://docs.zeek.org/en/current/script-reference/types.html#type-interval) | [`duration`](../../formats/zson.md#23-primitive-values) | |
46+
| [`string`](https://docs.zeek.org/en/current/script-reference/types.html#type-string) | [`string`](../../formats/zson.md#23-primitive-values) | See [`string` details about escaping](#string) |
47+
| [`port`](https://docs.zeek.org/en/current/script-reference/types.html#type-port) | [`uint16`](../../formats/zson.md#23-primitive-values) | See [`port` details](#port) |
48+
| [`addr`](https://docs.zeek.org/en/current/script-reference/types.html#type-addr) | [`ip`](../../formats/zson.md#23-primitive-values) | |
49+
| [`subnet`](https://docs.zeek.org/en/current/script-reference/types.html#type-subnet) | [`net`](../../formats/zson.md#23-primitive-values) | |
50+
| [`enum`](https://docs.zeek.org/en/current/script-reference/types.html#type-enum) | [`string`](../../formats/zson.md#23-primitive-values) | See [`enum` details](#enum) |
51+
| [`set`](https://docs.zeek.org/en/current/script-reference/types.html#type-set) | [`set`](../../formats/zson.md#243-set-value) | See [`set` details](#set) |
52+
| [`vector`](https://docs.zeek.org/en/current/script-reference/types.html#type-vector) | [`array`](../../formats/zson.md#242-array-value) | |
53+
| [`record`](https://docs.zeek.org/en/current/script-reference/types.html#type-record) | [`record`](../../formats/zson.md#241-record-value) | See [`record` details](#record) |
6254

6355
> **Note:** The [Zeek data type](https://docs.zeek.org/en/current/script-reference/types.html)
6456
> page describes the types in the context of the
@@ -159,8 +151,8 @@ out again in the Zeek TSV log format. Other implementations of the Zed storage
159151
formats (should they exist) may handle these differently.
160152

161153
Multiple Zeek types discussed below are represented via a
162-
[type definition](../docs/formats/zson.md#25-type-definitions) to one of Zed's
163-
[primitive types](../docs/formats/zson.md#33-primitive-values). The Zed type
154+
[type definition](../../formats/zson.md#22-type-decorators) to one of Zed's
155+
[primitive types](../../formats/zson.md#23-primitive-values). The Zed type
164156
definitions maintain the history of the field's original Zeek type name
165157
such that `zq` may restore it if the field is later output in
166158
Zeek format. Knowledge of its original Zeek type may also enable special
@@ -186,7 +178,6 @@ these values are represented with a ZSON type name bound to the Zed `string`
186178
type. See the text above regarding [type definitions](#type-specific-details)
187179
for more details.
188180

189-
190181
### `port`
191182

192183
The numeric values that appear in Zeek logs under this type are represented
@@ -214,7 +205,7 @@ _not_ intended to be read or presented as such. Meanwhile, another Zeek
214205
UTF-8. These details are currently only captured within the Zeek source code
215206
itself that defines how these values are generated.
216207

217-
Zed includes a [primitive type](../docs/formats/zson.md#33-primitive-values)
208+
Zed includes a [primitive type](../../formats/zson.md#23-primitive-values)
218209
called `bytes` that's suited to storing the former "always binary" case and a
219210
`string` type for the latter "always printable" case. However, Zeek logs do
220211
not currently communicate details that would allow an implementation to know
@@ -258,7 +249,7 @@ Zed that refer to the record at a higher level but affect all values lower
258249
down in the record hierarchy.
259250

260251
Revisiting the data from our example, we can output all fields within
261-
`my_record` via a Zed [`cut`](../docs/language/operators/cut.md) operation.
252+
`my_record` via a Zed [`cut`](../../language/operators/cut.md) operation.
262253

263254
#### Command:
264255

0 commit comments

Comments
 (0)