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

use zeekrunner scripts and zqd cli option #732

Merged
merged 13 commits into from
May 8, 2020
Merged

Conversation

alfred-landrum
Copy link
Contributor

This is part of the brimsec/brim repo side work for #731.

Use the -zeekrunner cli option to zqd ( brimdata/zed#718 ), defaulting to the value of environment variable BRIM_ZEEK_RUNNER, else to the zeekrunner included from the zdeps zeek artifact ( brimdata/zeek#23 ).

@alfred-landrum alfred-landrum changed the title Zeek runner update to use zeekrunner scripts and zqd cli option May 4, 2020
@alfred-landrum alfred-landrum changed the title update to use zeekrunner scripts and zqd cli option use zeekrunner scripts and zqd cli option May 4, 2020
@alfred-landrum alfred-landrum self-assigned this May 4, 2020
@alfred-landrum alfred-landrum force-pushed the zeek-runner branch 3 times, most recently from 3620bb1 to b654376 Compare May 5, 2020 20:58
@alfred-landrum alfred-landrum requested a review from a team May 8, 2020 16:42
@alfred-landrum
Copy link
Contributor Author

The zqd side of this is ready in brimdata/zed#718 , so when this Brim PR is approved, I'll merge the zq PR, then update the zq pointers here and merge.

Copy link
Contributor

@mikesbrown mikesbrown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This passed the Windows integration tests, so I don't have platform concerns. I also verified that locally, zqd and zeek are run like so:

  501 82132 82131   0 10:20AM ttys007    0:04.24 /Users/mikeb/git/brim/zdeps/zqd listen -l localhost:9867 -datadir /Users/mikeb/git/brim/run/data/spaces -config /Users/mikeb/git/brim/run/zqd-config.yaml -zeekrunner /Users/mikeb/git/brim/zdeps/zeek/zeekrunner
  501 82206 82132   0 10:20AM ttys007    0:17.02 /Users/mikeb/git/brim/zdeps/zeek/bin/zeek -C -r - --exec event zeek_init() { Log::disable_stream(PacketFilter::LOG); Log::disable_stream(LoadedScripts::LOG); } local

package-lock.json Outdated Show resolved Hide resolved
@alfred-landrum alfred-landrum merged commit 0d142c5 into master May 8, 2020
@alfred-landrum alfred-landrum deleted the zeek-runner branch May 8, 2020 18:02
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.

None yet

2 participants