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

next/649/20241128/v1 #12178

Merged
merged 4 commits into from
Nov 29, 2024
Merged

Conversation

Nancyenos and others added 4 commits November 28, 2024 21:28
In the situation where the mem buffer cannot be expanded to the
requested size, drop the log message.

For each JSON log context, a warning will be emitted once with a partial
bit of the log record being dropped to identify what event types may be
leading to large log records.

This also fixes the call to MemBufferExpand which is supposed be
passed the amount to expand by, not the new size required.

Ticket: OISF#7300
@victorjulien victorjulien requested a review from a team as a code owner November 28, 2024 22:39
Copy link

codecov bot commented Nov 28, 2024

Codecov Report

Attention: Patch coverage is 42.85714% with 8 lines in your changes missing coverage. Please review.

Project coverage is 49.98%. Comparing base (4ec90bd) to head (287d836).
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #12178      +/-   ##
==========================================
+ Coverage   49.75%   49.98%   +0.23%     
==========================================
  Files         912      912              
  Lines      257055   257066      +11     
==========================================
+ Hits       127895   128503     +608     
+ Misses     129160   128563     -597     
Flag Coverage Δ
fuzzcorpus 60.98% <42.85%> (-0.01%) ⬇️
livemode 19.41% <21.42%> (-0.01%) ⬇️
pcap 44.40% <14.28%> (?)
suricata-verify 62.71% <42.85%> (+<0.01%) ⬆️
unittests 9.01% <0.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.http.byterange.memuse 99602115 104101775 104.52%

Pipeline 23598

Copy link
Member

@jasonish jasonish left a comment

Choose a reason for hiding this comment

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

Looks OK.

Copy link
Member

@inashivb inashivb left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.uptime 624 648 103.85%

Pipeline 23601

@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 23603

@victorjulien victorjulien merged commit 287d836 into OISF:master Nov 29, 2024
59 of 61 checks passed
@victorjulien victorjulien deleted the next/649/20241128/v1 branch November 29, 2024 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants