This repository was archived by the owner on Aug 20, 2025. It is now read-only.
METRON-1720: Better error messages when there are no results or wireshark is not installed#1154
Closed
merrimanr wants to merge 113 commits intoapache:feature/METRON-1554-pcap-query-panelfrom
Closed
METRON-1720: Better error messages when there are no results or wireshark is not installed#1154merrimanr wants to merge 113 commits intoapache:feature/METRON-1554-pcap-query-panelfrom
merrimanr wants to merge 113 commits intoapache:feature/METRON-1554-pcap-query-panelfrom
Conversation
Conflicts: metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestApplication.java metron-interface/metron-rest/src/main/java/org/apache/metron/rest/controller/PcapQueryController.java metron-interface/metron-rest/src/main/java/org/apache/metron/rest/util/pcapQueryThread.java
Conflicts: src/app/pcap/model/pcap.request.ts src/app/pcap/pcap-panel/pcap-panel.component.ts src/app/pcap/pcap.module.ts src/app/pcap/service/pcap.service.spec.ts src/app/pcap/service/pcap.service.ts
Conflicts: src/app/pcap/pcap-panel/pcap-panel.component.html
PCAP UI - Implement port validation
…ation Revert "PCAP UI - Implement port validation"
Cover the pcap panel component with unit tests.
PCAP UI: add unit tests for search in panel
PCAP UI: add unit tests for pcap packet component
… the test data to the needs of the tests
PCAP UI: covering pcap-packet-line.component with unit tests
…anel' into METRON-1720 # Conflicts: # metron-interface/metron-alerts/src/app/pcap/model/pcap-status-response.ts # metron-interface/metron-alerts/src/app/pcap/model/pcap.mock.ts # metron-interface/metron-alerts/src/app/pcap/pcap-pagination/pcap-pagination.component.html # metron-interface/metron-alerts/src/app/pcap/pcap-panel/pcap-panel.component.spec.ts # metron-interface/metron-alerts/src/app/pcap/pcap-panel/pcap-panel.component.ts # metron-interface/metron-alerts/src/app/pcap/service/pcap.service.spec.ts # metron-interface/metron-alerts/src/app/pcap/service/pcap.service.ts
mmiklavc
reviewed
Aug 8, 2018
Contributor
mmiklavc
left a comment
mmiklavc
left a comment
There was a problem hiding this comment.
Note for observers/rewiewers. This was originally forked from #1122. 1122 has been squashed onto the feature branch which is why this PR is showing 113 commits in the diff. The file diff is correct.
Just one question about removing that error handling line I commented about and this should be good to go pending Travis.
| return this.http.get(`/api/v1/pcap/${id}/pdml?page=${pageId}`, new RequestOptions({headers: new Headers(this.defaultHeaders)})) | ||
| .map(HttpUtil.extractData) | ||
| .catch(HttpUtil.handleError) | ||
| .onErrorResumeNext(); |
Contributor
There was a problem hiding this comment.
What are the implications of removing onErrorResumeNext()?
Contributor
Author
There was a problem hiding this comment.
It won't catch the error if that line is included.
Contributor
There was a problem hiding this comment.
So previously it would catch the error and continue on regardless. Now it catches the error and handles it?
Contributor
Author
There was a problem hiding this comment.
It was not passing the error on to the client observer.
Contributor
|
@merrimanr thanks for the clarification. +1 via inspection. |
asfgit
pushed a commit
that referenced
this pull request
Aug 8, 2018
…ark is not installed (merrimanr) closes #1154
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contributor Comments
This PR adds error handling when pdml results are requested after a pcap job has finished. I also added a small fix to a pcap-panel-component.ts test where the job status wasn't properly set.
Testing
This has been tested in full dev:
yum -y remove wiresharkPull Request Checklist
Thank you for submitting a contribution to Apache Metron.
Please refer to our Development Guidelines for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines for complete smoke testing guides.
In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:
For all changes:
For code changes:
Have you included steps to reproduce the behavior or problem that is being changed or addressed?
Have you included steps or a guide to how the change may be verified and tested manually?
Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:
Have you written or updated unit tests and or integration tests to verify your changes?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?
For documentation related changes:
Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via
site-book/target/site/index.html:Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
It is also recommended that travis-ci is set up for your personal repository such that your branches are built there before submitting a pull request.