brimdata · philrz · Oct 23, 2024 · Oct 22, 2024
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ To help you get started quickly with [`zq`](https://zed.brimdata.io/docs/command
 | Directory | Format |
 |-----------|--------|
 | [zeek-default/](zeek-default) | [Zeek default output format](https://docs.zeek.org/en/master/log-formats.html#zeek-tsv-format-logs) |
-| [zeek-ndjson/](zeek-ndjson) | [ Newline-delimited JSON (NDJSON)](https://en.wikipedia.org/wiki/JSON_streaming#NDJSON), as output by the Zeek package for [JSON Streaming Logs](https://github.com/corelight/json-streaming-logs) |
+| [zeek-json/](zeek-json) | [ JSON as output by the Zeek package for [JSON Streaming Logs](https://github.com/corelight/json-streaming-logs) |
 | [zng/](zng) | Binary [ZNG](https://zed.brimdata.io/docs/formats/zng), output with [`zq`](https://zed.brimdata.io/docs/commands/zq)'s default LZ4-compressed format |
 | [zng-uncompressed/](zng-uncompressed) | Binary [ZNG](https://zed.brimdata.io/docs/formats/zng), output with [`zq`](https://zed.brimdata.io/docs/commands/zq)'s option `-zng.compress=false` to disable compression |
 | [zson/](zson) | [ZSON](https://zed.brimdata.io/docs/formats/zson), a Zed text output format that has the look and feel of JSON |
@@ -39,7 +39,7 @@ The data set was made from the several PCAP files in the 2018 set. [Zeek v6.2.0]
 # zeek -r wrccdc.pcap local "JSONStreaming::enable_log_rotation=F"
 ```
 
-This produced the logs in Zeek default and NDJSON formats. As ZNG and ZSON are not yet output directly by Zeek, these logs were created by sending each Zeek default log through `zq`, e.g.:
+This produced the logs in Zeek default and JSON formats. As ZNG and ZSON are not yet output directly by Zeek, these logs were created by sending each Zeek default log through `zq`, e.g.:
 
 ```
 # mkdir -p zng && \

diff --git a/zeek-ndjson/analyzer.ndjson.gz → zeek-json/analyzer.json.gz b/zeek-ndjson/analyzer.ndjson.gz → zeek-json/analyzer.json.gz
diff --git a/zeek-ndjson/capture_loss.ndjson.gz → zeek-json/capture_loss.json.gz b/zeek-ndjson/capture_loss.ndjson.gz → zeek-json/capture_loss.json.gz
diff --git a/zeek-ndjson/conn.ndjson.gz → zeek-json/conn.json.gz b/zeek-ndjson/conn.ndjson.gz → zeek-json/conn.json.gz
diff --git a/zeek-ndjson/dce_rpc.ndjson.gz → zeek-json/dce_rpc.json.gz b/zeek-ndjson/dce_rpc.ndjson.gz → zeek-json/dce_rpc.json.gz
diff --git a/zeek-ndjson/dns.ndjson.gz → zeek-json/dns.json.gz b/zeek-ndjson/dns.ndjson.gz → zeek-json/dns.json.gz
diff --git a/zeek-ndjson/dpd.ndjson.gz → zeek-json/dpd.json.gz b/zeek-ndjson/dpd.ndjson.gz → zeek-json/dpd.json.gz
diff --git a/zeek-ndjson/files.ndjson.gz → zeek-json/files.json.gz b/zeek-ndjson/files.ndjson.gz → zeek-json/files.json.gz
diff --git a/zeek-ndjson/ftp.ndjson.gz → zeek-json/ftp.json.gz b/zeek-ndjson/ftp.ndjson.gz → zeek-json/ftp.json.gz
diff --git a/zeek-ndjson/http.ndjson.gz → zeek-json/http.json.gz b/zeek-ndjson/http.ndjson.gz → zeek-json/http.json.gz
diff --git a/zeek-ndjson/kerberos.ndjson.gz → zeek-json/kerberos.json.gz b/zeek-ndjson/kerberos.ndjson.gz → zeek-json/kerberos.json.gz
diff --git a/zeek-ndjson/known_certs.ndjson.gz → zeek-json/known_certs.json.gz b/zeek-ndjson/known_certs.ndjson.gz → zeek-json/known_certs.json.gz
diff --git a/zeek-ndjson/known_hosts.ndjson.gz → zeek-json/known_hosts.json.gz b/zeek-ndjson/known_hosts.ndjson.gz → zeek-json/known_hosts.json.gz
diff --git a/zeek-ndjson/known_services.ndjson.gz → zeek-json/known_services.json.gz b/zeek-ndjson/known_services.ndjson.gz → zeek-json/known_services.json.gz
diff --git a/zeek-ndjson/ldap_search.ndjson.gz → zeek-json/ldap_search.json.gz b/zeek-ndjson/ldap_search.ndjson.gz → zeek-json/ldap_search.json.gz
diff --git a/zeek-ndjson/loaded_scripts.ndjson.gz → zeek-json/loaded_scripts.json.gz b/zeek-ndjson/loaded_scripts.ndjson.gz → zeek-json/loaded_scripts.json.gz
diff --git a/zeek-ndjson/modbus.ndjson.gz → zeek-json/modbus.json.gz b/zeek-ndjson/modbus.ndjson.gz → zeek-json/modbus.json.gz
diff --git a/zeek-ndjson/notice.ndjson.gz → zeek-json/notice.json.gz b/zeek-ndjson/notice.ndjson.gz → zeek-json/notice.json.gz
diff --git a/zeek-ndjson/ntlm.ndjson.gz → zeek-json/ntlm.json.gz b/zeek-ndjson/ntlm.ndjson.gz → zeek-json/ntlm.json.gz
diff --git a/zeek-ndjson/ntp.ndjson.gz → zeek-json/ntp.json.gz b/zeek-ndjson/ntp.ndjson.gz → zeek-json/ntp.json.gz
diff --git a/zeek-ndjson/ocsp.ndjson.gz → zeek-json/ocsp.json.gz b/zeek-ndjson/ocsp.ndjson.gz → zeek-json/ocsp.json.gz
diff --git a/zeek-ndjson/packet_filter.ndjson.gz → zeek-json/packet_filter.json.gz b/zeek-ndjson/packet_filter.ndjson.gz → zeek-json/packet_filter.json.gz
diff --git a/zeek-ndjson/pe.ndjson.gz → zeek-json/pe.json.gz b/zeek-ndjson/pe.ndjson.gz → zeek-json/pe.json.gz
diff --git a/zeek-ndjson/rdp.ndjson.gz → zeek-json/rdp.json.gz b/zeek-ndjson/rdp.ndjson.gz → zeek-json/rdp.json.gz
diff --git a/zeek-ndjson/rfb.ndjson.gz → zeek-json/rfb.json.gz b/zeek-ndjson/rfb.ndjson.gz → zeek-json/rfb.json.gz
diff --git a/zeek-ndjson/smb_files.ndjson.gz → zeek-json/smb_files.json.gz b/zeek-ndjson/smb_files.ndjson.gz → zeek-json/smb_files.json.gz
diff --git a/zeek-ndjson/smb_mapping.ndjson.gz → zeek-json/smb_mapping.json.gz b/zeek-ndjson/smb_mapping.ndjson.gz → zeek-json/smb_mapping.json.gz
diff --git a/zeek-ndjson/smtp.ndjson.gz → zeek-json/smtp.json.gz b/zeek-ndjson/smtp.ndjson.gz → zeek-json/smtp.json.gz
diff --git a/zeek-ndjson/snmp.ndjson.gz → zeek-json/snmp.json.gz b/zeek-ndjson/snmp.ndjson.gz → zeek-json/snmp.json.gz
diff --git a/zeek-ndjson/software.ndjson.gz → zeek-json/software.json.gz b/zeek-ndjson/software.ndjson.gz → zeek-json/software.json.gz
diff --git a/zeek-ndjson/ssh.ndjson.gz → zeek-json/ssh.json.gz b/zeek-ndjson/ssh.ndjson.gz → zeek-json/ssh.json.gz
diff --git a/zeek-ndjson/ssl.ndjson.gz → zeek-json/ssl.json.gz b/zeek-ndjson/ssl.ndjson.gz → zeek-json/ssl.json.gz
diff --git a/zeek-ndjson/stats.ndjson.gz → zeek-json/stats.json.gz b/zeek-ndjson/stats.ndjson.gz → zeek-json/stats.json.gz
diff --git a/zeek-ndjson/syslog.ndjson.gz → zeek-json/syslog.json.gz b/zeek-ndjson/syslog.ndjson.gz → zeek-json/syslog.json.gz
diff --git a/zeek-ndjson/weird.ndjson.gz → zeek-json/weird.json.gz b/zeek-ndjson/weird.ndjson.gz → zeek-json/weird.json.gz
diff --git a/zeek-ndjson/x509.ndjson.gz → zeek-json/x509.json.gz b/zeek-ndjson/x509.ndjson.gz → zeek-json/x509.json.gz