diff --git a/tests/dynstats_overflow-vg.sh b/tests/dynstats_overflow-vg.sh index fd660b9f4..ed7553e64 100755 --- a/tests/dynstats_overflow-vg.sh +++ b/tests/dynstats_overflow-vg.sh @@ -5,7 +5,7 @@ echo =========================================================================== echo \[dynstats_overflow.sh\]: test for gathering stats when metrics exceed provisioned capacity . $srcdir/diag.sh init . $srcdir/diag.sh startup-vg dynstats_overflow.conf -. $srcdir/diag.sh injectmsg-litteral $srcdir/testsuites/dynstats_input_more_1 +. $srcdir/diag.sh injectmsg-litteral $srcdir/testsuites/dynstats_input_more_0 . $srcdir/diag.sh wait-queueempty . $srcdir/diag.sh content-check "foo 001 0" . $srcdir/diag.sh content-check "bar 002 0" @@ -17,10 +17,13 @@ echo \[dynstats_overflow.sh\]: test for gathering stats when metrics exceed prov . $srcdir/diag.sh content-check "corge 008 -6" . $srcdir/diag.sh content-check "quux 009 -6" . $srcdir/diag.sh content-check "foo 010 0" +sleep 1 +. $srcdir/diag.sh injectmsg-litteral $srcdir/testsuites/dynstats_input_more_1 +. $srcdir/diag.sh wait-queueempty . $srcdir/diag.sh content-check "corge 011 -6" . $srcdir/diag.sh content-check "grault 012 -6" . $srcdir/diag.sh content-check "foo 013 0" -sleep 2 +sleep 1 #sleep above + this = 2 seconds, so metric-names reset should have happened . $srcdir/diag.sh wait-queueempty . $srcdir/diag.sh first-column-sum-check 's/.*foo=\([0-9]\+\)/\1/g' 'foo=' 'rsyslog.out.stats.log' 5 . $srcdir/diag.sh first-column-sum-check 's/.*bar=\([0-9]\+\)/\1/g' 'bar=' 'rsyslog.out.stats.log' 1 diff --git a/tests/dynstats_overflow.sh b/tests/dynstats_overflow.sh index 3d9d97fc5..541d9cd79 100755 --- a/tests/dynstats_overflow.sh +++ b/tests/dynstats_overflow.sh @@ -5,7 +5,7 @@ echo =========================================================================== echo \[dynstats_overflow.sh\]: test for gathering stats when metrics exceed provisioned capacity . $srcdir/diag.sh init . $srcdir/diag.sh startup dynstats_overflow.conf -. $srcdir/diag.sh injectmsg-litteral $srcdir/testsuites/dynstats_input_more_1 +. $srcdir/diag.sh injectmsg-litteral $srcdir/testsuites/dynstats_input_more_0 . $srcdir/diag.sh wait-queueempty . $srcdir/diag.sh content-check "foo 001 0" . $srcdir/diag.sh content-check "bar 002 0" @@ -17,10 +17,13 @@ echo \[dynstats_overflow.sh\]: test for gathering stats when metrics exceed prov . $srcdir/diag.sh content-check "corge 008 -6" . $srcdir/diag.sh content-check "quux 009 -6" . $srcdir/diag.sh content-check "foo 010 0" +sleep 1 +. $srcdir/diag.sh injectmsg-litteral $srcdir/testsuites/dynstats_input_more_1 +. $srcdir/diag.sh wait-queueempty . $srcdir/diag.sh content-check "corge 011 -6" . $srcdir/diag.sh content-check "grault 012 -6" . $srcdir/diag.sh content-check "foo 013 0" -sleep 2 +sleep 1 #sleep above + this = 2 seconds, so metric-names reset should have happened . $srcdir/diag.sh wait-queueempty . $srcdir/diag.sh first-column-sum-check 's/.*foo=\([0-9]\+\)/\1/g' 'foo=' 'rsyslog.out.stats.log' 5 . $srcdir/diag.sh first-column-sum-check 's/.*bar=\([0-9]\+\)/\1/g' 'bar=' 'rsyslog.out.stats.log' 1 diff --git a/tests/testsuites/dynstats_input_more_0 b/tests/testsuites/dynstats_input_more_0 new file mode 100644 index 000000000..8d9ec2393 --- /dev/null +++ b/tests/testsuites/dynstats_input_more_0 @@ -0,0 +1,10 @@ +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 001 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:bar 002 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:baz 003 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 004 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:baz 005 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 006 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:quux 007 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:corge 008 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:quux 009 +<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 010 diff --git a/tests/testsuites/dynstats_input_more_1 b/tests/testsuites/dynstats_input_more_1 index 2945e1982..64da0ef18 100644 --- a/tests/testsuites/dynstats_input_more_1 +++ b/tests/testsuites/dynstats_input_more_1 @@ -1,13 +1,3 @@ -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 001 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:bar 002 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:baz 003 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 004 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:baz 005 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 006 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:quux 007 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:corge 008 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:quux 009 -<167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 010 <167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:corge 011 <167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:grault 012 <167>Mar 6 16:57:54 172.20.245.8 %PIX-7-710005:foo 013 diff --git a/tests/testsuites/dynstats_overflow.conf b/tests/testsuites/dynstats_overflow.conf index 5d8a90a5e..54f7fdcef 100644 --- a/tests/testsuites/dynstats_overflow.conf +++ b/tests/testsuites/dynstats_overflow.conf @@ -4,7 +4,7 @@ ruleset(name="stats") { action(type="omfile" file="./rsyslog.out.stats.log") } -module(load="../plugins/impstats/.libs/impstats" interval="2" severity="7" resetCounters="on" Ruleset="stats" bracketing="on") +module(load="../plugins/impstats/.libs/impstats" interval="1" severity="7" resetCounters="on" Ruleset="stats" bracketing="on") template(name="outfmt" type="string" string="%msg% %$.increment_successful%\n")