-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Backport: endace: Fix source-dag timestamps #10148
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main-7.0.x #10148 +/- ##
==============================================
- Coverage 82.42% 82.35% -0.08%
==============================================
Files 970 970
Lines 274011 274007 -4
==============================================
- Hits 225858 225659 -199
- Misses 48153 48348 +195
Flags with carried forward coverage won't be shown. Click here to find out more. |
Not sure what is up with the Rust check.The Debian 12 build might need to be re-run. |
@victorjulien not sure what is wrong with the Rust test? The debian build probably just needs to be rerun. |
You should rebase to latest main-7.0.x, and it should go away |
"Bug: 6620" is not a good commit title... |
Bug: 6620. Fix const warning with --enable=dag Fix prototype clang-format errors Master change in OISF#10149
Updated the commit title. It's not a cherry pick since the equivalent master PR is pending, see PR 10149. Could wait for that to be approved and cherry pick instead, but is equivalent? The compiler warning was noticed and fixed in the backport PR. |
I think we want to merge first in master, and then cherry pick, so this PR is waiting on 10149. |
Can do it that way if you prefer. |
@sfd thanks for your work. I am sorry I am not an expert on Endace... I just know a little about the GitHub workflow for Suricata, and why the CI was red for rust... I guess we will have to wait for someone with the endace knowledge to do the approvals and merge in the order they see fit... |
@catenacyber @sfd is the Endace expert as he represents Endace here. We can trust that his Endace specific logic is correct, but can still review on style and process. |
So, now that #10149 was merged, could you make a new PR with the first commit of this one + a cherry-pick of the one from 10149 merged in master ? How does that sound to you ? |
Closed ; continued in PR #10216 |
Bug: #6618
Fix Endace ERF to SCTime_t timestamp conversion
Fix typo preventing compilation with --enable-dag
(cherry picked from commit 879db3d)
Fix compiler const warning with --enable-dag
Link to redmine ticket: 6620
Updates PR #10092