rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 10:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5606 from Cropi/imjournal-dicarded

Browse Source 
imuxsock: Add statistics counter for discarded messages
This commit is contained in:
Rainer Gerhards 2025-06-09 13:58:54 +02:00 committed by GitHub
commit f0372aa8b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/imuxsock/imuxsock.c
View File

@ -1030,10 +1030,12 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
MsgSetRcvFrom(pMsg, pLstn->hostName == NULL ? glbl.GetLocalHostNameProp() : pLstn->hostName); MsgSetRcvFrom(pMsg, pLstn->hostName == NULL ? glbl.GetLocalHostNameProp() : pLstn->hostName);
CHKiRet(MsgSetRcvFromIP(pMsg, pLocalHostIP)); CHKiRet(MsgSetRcvFromIP(pMsg, pLocalHostIP));
MsgSetRuleset(pMsg, pLstn->pRuleset); MsgSetRuleset(pMsg, pLstn->pRuleset);
ratelimitAddMsg(ratelimiter, NULL, pMsg); CHKiRet(ratelimitAddMsg(ratelimiter, NULL, pMsg));
STATSCOUNTER_INC(ctrSubmit, mutCtrSubmit); STATSCOUNTER_INC(ctrSubmit, mutCtrSubmit);
finalize_it: finalize_it:
if(iRet != RS_RET_OK) { if (iRet == RS_RET_DISCARDMSG) {
STATSCOUNTER_INC(ctrLostRatelimit, mutCtrLostRatelimit);
} else if(iRet != RS_RET_OK) {
if(pMsg != NULL) if(pMsg != NULL)
msgDestruct(&pMsg); msgDestruct(&pMsg);
} }

37
tests/imuxsock_impstats.sh Executable file
View File

@ -0,0 +1,37 @@
#!/bin/bash
# This test tests impstats omfwd counters in TCP mode
# added 2025-03-17 by Croppi. Released under ASL 2.0
. ${srcdir:=.}/diag.sh init
generate_conf
export STATSFILE="$RSYSLOG_DYNNAME.stats"
add_conf '
module(load="../plugins/impstats/.libs/impstats" log.file="'$STATSFILE'"
interval="1" ruleset="stats" log.syslog="off")
template(name="outfmt" type="string" string="%msg:F,58:2%\n")
ruleset(name="stats") {
stop # nothing to do here
}
module(load="../plugins/imuxsock/.libs/imuxsock" sysSock.use="off")
input(type="imuxsock" Socket="'$RSYSLOG_DYNNAME'-testbench_socket" RateLimit.Interval="10" RateLimit.Burst="750"
)
if $msg contains "msgnum:" then {
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
file=`echo $RSYSLOG_OUT_LOG`)
}
'
startup
# 1000 messages should be enough
seq 1 1000 | sed 's/^/Test message /' | logger -d -u $RSYSLOG_DYNNAME-testbench_socket
shutdown_when_empty
wait_shutdown
cat -n $STATSFILE
# We submitted 1000 messages within 10 seconds, so we should have 750 messages in the queue and 250 discarded
content_check --regex "imuxsock: origin=imuxsock submitted=750 ratelimit.discarded=250 ratelimit.numratelimiters=1" "$STATSFILE"
exit_test