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

If its not a pcap, its a log #716

Merged
merged 1 commit into from
Apr 30, 2020
Merged

If its not a pcap, its a log #716

merged 1 commit into from
Apr 30, 2020

Conversation

jameskerr
Copy link
Member

fixes: #687

Previously we were checking each file to see if was a pcap, zeek, json, or unknown type. Now we just check if any one of them is a pcap. If there is 1 pcap, we send it over the /pcaps/ endpoint, else /logs/.

This makes it simple and lets the backend do the rest of the auto detection. I've been even able to ingest a json and a zeek tsv at the same time now.

@jameskerr jameskerr changed the title fix: If its not a pcap, its a log If its not a pcap, its a log Apr 29, 2020
@jameskerr jameskerr requested a review from a team April 29, 2020 21:46
@mason-fish mason-fish mentioned this pull request Apr 30, 2020
Copy link
Contributor

@mason-fish mason-fish left a comment

Choose a reason for hiding this comment

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

Lgtm! I just kicked off another round of CI and it seems the previous failure on Windows was transient, 👍

@mikesbrown
Copy link
Contributor

The symptoms in the console log looked like brimdata/super#613 but the artifacts for the failed run including any screen shots taken were removed on the rerun before I could get at them, so I can't be sure.

@jameskerr jameskerr merged commit 63233ef into master Apr 30, 2020
@jameskerr jameskerr deleted the less-checks branch April 30, 2020 18:33
@philrz philrz linked an issue May 1, 2020 that may be closed by this pull request
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.

Attempted Zeek ingest of good+bad files halts and shows confusing error Allow loading of GZIP'ed logs
3 participants