Merging upstream version 1.44.3.

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

9 files changed, 148 insertions, 0 deletions

diff --git a/fluent-bit/tests/runtime_shell/conf/in_dummy_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_dummy_expect.conf
new file mode 100644
index 000000000..1b72d64e8
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_dummy_expect.conf
@@ -0,0 +1,25 @@
+[SERVICE]
+    Flush      1
+    Grace      2
+    Log_Level  info
+
+[INPUT]
+    Name       dummy
+    Dummy      {"r1": "someval", "s1": {"s2": null}, "r2": {"x": 0}}
+    Samples    1
+
+[FILTER]
+    Name                 expect
+    Match                *
+    Log_Level            debug
+    # Rules
+    key_exists           $r1
+    key_not_exists       $r0
+    key_val_is_null      $s1['s2']
+    key_val_is_not_null  $r2['x']
+    key_val_eq           $r1 someval
+    action               exit
+
+[OUTPUT]
+    Name  exit
+    Match *
diff --git a/fluent-bit/tests/runtime_shell/conf/in_expect_base.conf b/fluent-bit/tests/runtime_shell/conf/in_expect_base.conf
new file mode 100644
index 000000000..760b47d53
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_expect_base.conf
@@ -0,0 +1,28 @@
+[SERVICE]
+    Flush        1
+    Grace        1
+    Log_Level    error
+    Parsers_File ${FLB_ROOT}/conf/parsers.conf
+
+[INPUT]
+    name         dummy
+    samples      1
+
+[OUTPUT]
+    name         file
+    match        dummy.*
+    file         ${SIGNAL_FILE_PATH}
+    mkdir        on
+
+[FILTER]
+    Name         expect
+    Match        target_input
+    Log_Level    debug
+    # Rules
+    key_exists   $message
+    key_val_eq   $message Hello!
+    action       exit
+
+[OUTPUT]
+    Name         exit
+    Match        target_input
diff --git a/fluent-bit/tests/runtime_shell/conf/in_http_tls_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_http_tls_expect.conf
new file mode 100644
index 000000000..2b66dff87
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_http_tls_expect.conf
@@ -0,0 +1,13 @@
+@INCLUDE in_expect_base.conf
+
+[INPUT]
+    name         http
+    tag          target_input
+    listen       ${LISTENER_HOST}
+    port         ${LISTENER_PORT}
+    tls.verify   no
+    tls          on
+    tls.vhost    ${LISTENER_VHOST}
+    tls.debug    4
+    tls.crt_file ${FLB_RUNTIME_SHELL_PATH}/tls/certificate.pem
+    tls.key_file ${FLB_RUNTIME_SHELL_PATH}/tls/private_key.pem
\ No newline at end of file
diff --git a/fluent-bit/tests/runtime_shell/conf/in_syslog_tcp_plaintext_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_syslog_tcp_plaintext_expect.conf
new file mode 100644
index 000000000..d47f6e335
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_syslog_tcp_plaintext_expect.conf
@@ -0,0 +1,8 @@
+@INCLUDE in_expect_base.conf
+
+[INPUT]
+    name   syslog
+    tag    target_input
+    listen ${LISTENER_HOST}
+    port   ${LISTENER_PORT}
+    mode   tcp
\ No newline at end of file
diff --git a/fluent-bit/tests/runtime_shell/conf/in_syslog_tcp_tls_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_syslog_tcp_tls_expect.conf
new file mode 100644
index 000000000..afa28e6f5
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_syslog_tcp_tls_expect.conf
@@ -0,0 +1,14 @@
+@INCLUDE in_expect_base.conf
+
+[INPUT]
+    name         syslog
+    tag          target_input
+    listen       ${LISTENER_HOST}
+    port         ${LISTENER_PORT}
+    mode         tcp
+    tls.verify   no
+    tls          on
+    tls.vhost    ${LISTENER_VHOST}
+    tls.debug    4
+    tls.crt_file ${FLB_RUNTIME_SHELL_PATH}/tls/certificate.pem
+    tls.key_file ${FLB_RUNTIME_SHELL_PATH}/tls/private_key.pem
\ No newline at end of file
diff --git a/fluent-bit/tests/runtime_shell/conf/in_syslog_udp_plaintext_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_syslog_udp_plaintext_expect.conf
new file mode 100644
index 000000000..ae92b39e5
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_syslog_udp_plaintext_expect.conf
@@ -0,0 +1,8 @@
+@INCLUDE in_expect_base.conf
+
+[INPUT]
+    name   syslog
+    tag    target_input
+    listen ${LISTENER_HOST}
+    port   ${LISTENER_PORT}
+    mode   udp
\ No newline at end of file
diff --git a/fluent-bit/tests/runtime_shell/conf/in_syslog_uds_dgram_plaintext_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_syslog_uds_dgram_plaintext_expect.conf
new file mode 100644
index 000000000..48b6c375a
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_syslog_uds_dgram_plaintext_expect.conf
@@ -0,0 +1,7 @@
+@INCLUDE in_expect_base.conf
+
+[INPUT]
+    name syslog
+    tag  target_input
+    path ${SOCKET_PATH}
+    mode unix_udp
\ No newline at end of file
diff --git a/fluent-bit/tests/runtime_shell/conf/in_syslog_uds_stream_plaintext_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_syslog_uds_stream_plaintext_expect.conf
new file mode 100644
index 000000000..cfebdd24d
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_syslog_uds_stream_plaintext_expect.conf
@@ -0,0 +1,7 @@
+@INCLUDE in_expect_base.conf
+
+[INPUT]
+    name syslog
+    tag  target_input
+    path ${SOCKET_PATH}
+    mode unix_tcp
\ No newline at end of file
diff --git a/fluent-bit/tests/runtime_shell/conf/in_tail_expect.conf b/fluent-bit/tests/runtime_shell/conf/in_tail_expect.conf
new file mode 100644
index 000000000..7348bacc0
--- /dev/null
+++ b/fluent-bit/tests/runtime_shell/conf/in_tail_expect.conf
@@ -0,0 +1,38 @@
+[SERVICE]
+    Flush              1
+    Grace              2
+    Log_Level          info
+    Parsers_File       ${FLB_ROOT}/conf/parsers.conf
+
+[INPUT]
+    name               tail
+    path               /tmp/flb_tail_expect*.log
+    exclude_path       /tmp/flb_*2.log
+    read_from_head     true
+    parser             json
+    refresh_interval   10
+    rotate_wait        1
+    docker_mode        false
+    docker_mode_flush  4
+    path_key           path_key
+    ignore_older       0
+    buffer_chunk_size  32k
+    buffer_max_size    32k
+    skip_long_lines    false
+    exit_on_eof        false
+    db                 /tmp/flb_tail_expect.db
+    db.sync            full
+
+[FILTER]
+    Name                 expect
+    Match                *
+    Log_Level            debug
+    # Rules
+    key_exists           $path_key
+    key_val_eq           $path_key /tmp/flb_tail_expect_1.log
+    key_not_exists       $nokey
+    action               exit
+
+[OUTPUT]
+    Name  exit
+    Match *