Adding upstream version 8.2402.0.upstream/8.2402.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/clickhouse-errorfile.sh b/tests/clickhouse-errorfile.sh
new file mode 100755
index 0000000..6004861
--- /dev/null
+++ b/tests/clickhouse-errorfile.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# add 2018-12-07 by Pascal Withopf, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+echo looks like clickhouse does no longer generate exceptions on error - skip until investigated
+exit 77
+generate_conf
+add_conf '
+module(load="../plugins/imtcp/.libs/imtcp")
+module(load="../plugins/omclickhouse/.libs/omclickhouse")
+input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port")
+
+template(name="outfmt" option.stdsql="on" type="string" string="INSERT INTO rsyslog.errorfile (id, severity, facility, timestamp, ipaddress, tag, message) VALUES (%msg:F,58:2%, %syslogseverity%, %syslogfacility%, '
+add_conf "'%timereported:::date-unixtimestamp%', '%fromhost-ip%', '%syslogtag%', '%msg%')"
+add_conf '")
+
+
+:syslogtag, contains, "tag" action(type="omclickhouse" server="localhost" port="8443"
+					user="default" pwd="" template="outfmt"
+					bulkmode="off" errorfile="'$RSYSLOG_OUT_LOG'")
+'
+
+clickhouse-client --query="CREATE TABLE IF NOT EXISTS rsyslog.errorfile ( id Int32, severity Int8, facility Int8, timestamp DateTime, ipaddress String, tag String, message String ) ENGINE = MergeTree() PARTITION BY severity Order By id"
+
+startup
+tcpflood -m1 -M "\"<129>Mar 10 01:00:00 172.20.245.8 tag: msgnum:NoInteger\""
+shutdown_when_empty
+wait_shutdown
+
+content_check --regex "msgnum:NoInteger.*DB::Exception:"
+
+clickhouse-client --query="DROP TABLE rsyslog.errorfile"
+exit_test