Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "source" field to JSON typing config for Zeek "weird" events #1307

Merged
merged 2 commits into from
Jan 4, 2021

Conversation

philrz
Copy link
Contributor

@philrz philrz commented Dec 24, 2020

I compiled Zeek 4.0.0-rc1 and ran print-types.zeek against it and found they've added one additional field beyond what we were covering in Zeek 3.x: A source field in weird events. While our current JSON typing system is hopefully not long for this earth, since users may start using Zeek 4.x before the new approach is complete, I've added the additional field here.

Incidentally, in the past I'd not really confronted the config duplication that appears to be in play here. I suppose if we were building this from scratch now, we'd extend the "zq as a dependency in node_modules" approach to have the contents of https://github.com/brimsec/zq/blob/master/zeek/types.json automatically reflected in the Brim-side config whenever it changes on the zq side. I'm not proposing we do this since we may never need to use this approach again, but noting it for the record.

This is a companion PR to brimdata/zed#1884 on the zq side.

brim-bot pushed a commit that referenced this pull request Dec 25, 2020
…"weird" events" by philrz

This is an auto-generated commit with a zq dependency update. The zq PR
brimdata/zed#1884, authored by @philrz,
has been merged.

Add "source" field to JSON typing config for Zeek "weird" events

I compiled Zeek 4.0.0-rc1 and ran [print-types.zeek](https://github.com/brimsec/zeek/blob/master/brim/print-types.zeek) against it and found they've added one additional field beyond what we were covering in Zeek 3.x: A `source` field in `weird` events. While our current JSON typing system is hopefully not long for this earth, since users may start using Zeek 4.x before the new approach is complete, I've added the additional field here.

This is a companion PR to #1307 on the Brim side.
@philrz philrz merged commit 673207e into master Jan 4, 2021
@philrz philrz deleted the zeek-4.0.0-rc1-json-typing branch January 4, 2021 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants