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

Reverting existing tests, adding new test for overriding maxbytes

Browse Source
This commit is contained in:
Barak Shechter 2016-10-11 11:06:26 -04:00
parent 737e085eb2
commit 992233d65a
10 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile.am
View File

@ -350,6 +350,7 @@ if ENABLE_ELASTICSEARCH_TESTS
TESTS += \
es-basic.sh \
es-basic-bulk.sh \
es-maxbytes-bulk.sh \
es-basic-errfile-empty.sh \
es-basic-errfile-popul.sh \
es-bulk-errfile-empty.sh \

13
tests/es-maxbytes-bulk.sh Normal file
View File

@ -0,0 +1,13 @@
#!/bin/bash
# This file is part of the rsyslog project, released under ASL 2.0
echo ===============================================================================
echo \[es-maxbytes-bulk\]: test for elasticsearch functionality with maxbytes bulking
. $srcdir/diag.sh init
. $srcdir/diag.sh es-init
. $srcdir/diag.sh startup es-maxbytes-bulk.conf
. $srcdir/diag.sh injectmsg 0 10000
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
. $srcdir/diag.sh es-getdata 10000
. $srcdir/diag.sh seq-check 0 9999
. $srcdir/diag.sh exit

3
tests/testsuites/es-basic-bulk.conf
View File

@ -7,5 +7,4 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
:msg, contains, "msgnum:" action(type="omelasticsearch"
template="tpl"
searchIndex="rsyslog_testbench"
bulkmode="on"
maxbytes="1k")
bulkmode="on")

1
tests/testsuites/es-bulk-errfile-empty.conf
View File

@ -8,5 +8,4 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
template="tpl"
searchIndex="rsyslog_testbench"
bulkmode="on"
maxbytes="1k"
errorFile="./rsyslog.errorfile")

1
tests/testsuites/es-bulk-errfile-popul-def-format.conf
View File

@ -19,7 +19,6 @@ ruleset(name="foo") {
searchIndex="rsyslog_testbench"
searchType="test-type"
bulkmode="on"
maxbytes="1k"
errorFile="./rsyslog.errorfile")
}

1
tests/testsuites/es-bulk-errfile-popul-def-interleaved.conf
View File

@ -19,7 +19,6 @@ ruleset(name="foo") {
searchIndex="rsyslog_testbench"
searchType="test-type"
bulkmode="on"
maxbytes="1k"
errorFile="./rsyslog.errorfile"
interleaved="on")
}

1
tests/testsuites/es-bulk-errfile-popul-erronly-interleaved.conf
View File

@ -19,7 +19,6 @@ ruleset(name="foo") {
searchIndex="rsyslog_testbench"
searchType="test-type"
bulkmode="on"
maxbytes="1k"
errorFile="./rsyslog.errorfile"
erroronly="on"
interleaved="on")

1
tests/testsuites/es-bulk-errfile-popul-erronly.conf
View File

@ -19,7 +19,6 @@ ruleset(name="foo") {
searchIndex="rsyslog_testbench"
searchType="test-type"
bulkmode="on"
maxbytes="1k"
errorFile="./rsyslog.errorfile"
erroronly="on")
}

1
tests/testsuites/es-bulk-errfile-popul.conf
View File

@ -12,5 +12,4 @@ module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
searchIndex="rsyslog_testbench"
searchType="test-type"
bulkmode="on"
maxbytes="1k"
errorFile="./rsyslog.errorfile")

11
tests/testsuites/es-maxbytes-bulk.conf Normal file
View File

@ -0,0 +1,11 @@
$IncludeConfig diag-common.conf
template(name="tpl" type="string"
string="{\"msgnum\":\"%msg:F,58:2%\"}")
module(load="../plugins/omelasticsearch/.libs/omelasticsearch")
:msg, contains, "msgnum:" action(type="omelasticsearch"
template="tpl"
searchIndex="rsyslog_testbench"
bulkmode="on"
maxbytes="1k")