tests: update triggered exception flow output ones

To 7.0.12

Related to backport ticket
Task #7623

diff --git a/tests/exception-policy-applayer-01/suricata.yaml b/tests/exception-policy-applayer-01/suricata.yaml
index 0f00268ae1d417022cb54466907f88a33ce55337..7247262a81d87277c54d3e53703458be35394c2c 100644 (file)
--- a/tests/exception-policy-applayer-01/suricata.yaml
+++ b/tests/exception-policy-applayer-01/suricata.yaml
@@ -28,7 +28,8 @@ outputs:
             totals: yes
             threads: no
             deltas: no
-        - flow
+        - flow:
+            exception-policy: true
   - stats:
       enabled: yes
       filename: stats.log

diff --git a/tests/exception-policy-applayer-01/test.yaml b/tests/exception-policy-applayer-01/test.yaml
index 77b3b4b275a6e27cf6aaff2c742425d3aa54b529..aef44cb9a7f4a4cb159b75aadac0dfc4d58da3f9 100644 (file)
--- a/tests/exception-policy-applayer-01/test.yaml
+++ b/tests/exception-policy-applayer-01/test.yaml
@@ -61,7 +61,7 @@ checks:
         stats.exception_policy.app_layer.error.pass_flow: 0
         not-has-key: stats.app_layer.error.tls.exception_policy.drop_flow
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-applayer-02/suricata.yaml b/tests/exception-policy-applayer-02/suricata.yaml
index d4e88fb3e54f0affb892b8df3e451f1f26ff390d..ea73d550f72334efcb512986673d72135b5ff7e5 100644 (file)
--- a/tests/exception-policy-applayer-02/suricata.yaml
+++ b/tests/exception-policy-applayer-02/suricata.yaml
@@ -22,7 +22,8 @@ outputs:
             totals: yes
             threads: no
             deltas: no
-        - flow
+        - flow:
+            exception-policy: true
   - stats:
       enabled: yes
       filename: stats.log

diff --git a/tests/exception-policy-applayer-02/test.yaml b/tests/exception-policy-applayer-02/test.yaml
index 774f5fc4ea90aecf2a2f564d208c1871023e1463..67ff2770b6bb7befe82b4c420d4f9b08bb0881d2 100644 (file)
--- a/tests/exception-policy-applayer-02/test.yaml
+++ b/tests/exception-policy-applayer-02/test.yaml
@@ -50,7 +50,7 @@ checks:
         stats.app_layer.error.tls.exception_policy.drop_packet: 0
         stats.exception_policy.app_layer.error.pass_packet: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-applayer-03/suricata.yaml b/tests/exception-policy-applayer-03/suricata.yaml
index cc8b6a128ec4b6558ab675957e67026822a56d7e..d49eb4e1b2100f0c8aef5780ceead1e3cb2d1796 100644 (file)
--- a/tests/exception-policy-applayer-03/suricata.yaml
+++ b/tests/exception-policy-applayer-03/suricata.yaml
@@ -26,7 +26,8 @@ outputs:
             totals: yes
             threads: no
             deltas: no
-        - flow
+        - flow:
+            exception-policy: true
   - stats:
       enabled: yes
       filename: stats.log

diff --git a/tests/exception-policy-applayer-03/test.yaml b/tests/exception-policy-applayer-03/test.yaml
index 2865997227706108e4321e1907219d1441b07c54..042e7e4eab0e4a8b42500ec7c0c1d5b7dc8206c6 100644 (file)
--- a/tests/exception-policy-applayer-03/test.yaml
+++ b/tests/exception-policy-applayer-03/test.yaml
@@ -72,7 +72,6 @@ checks:
       stats.exception_policy.app_layer.error.pass_packet: 1
       stats.exception_policy.app_layer.error.drop_packet: 0
 - filter:
-    min-version: 8
     count: 1
     match:
       event_type: flow

diff --git a/tests/exception-policy-default-01/test.yaml b/tests/exception-policy-default-01/test.yaml
index a1f731d091a737f35231024fac6092ad16b0280f..e1af08f10a7737fd3fd7271b1e5529c554c877b1 100644 (file)
--- a/tests/exception-policy-default-01/test.yaml
+++ b/tests/exception-policy-default-01/test.yaml
@@ -23,7 +23,7 @@ checks:
         event_type: tls
         tls.sni: example.com
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-default-02/suricata.yaml b/tests/exception-policy-default-02/suricata.yaml
index bceace8ffe6ba13b440ad4a8bcee3fa1b489b8eb..9d2e0f40e0895770ece2f73ea10ff655070746d9 100644 (file)
--- a/tests/exception-policy-default-02/suricata.yaml
+++ b/tests/exception-policy-default-02/suricata.yaml
@@ -21,7 +21,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-default-02/test.yaml b/tests/exception-policy-default-02/test.yaml
index 738756b05e60eaeabc90e1a807e953ce4651cb89..b785004ccb716fcde05dfae8b4e219616baef29a 100644 (file)
--- a/tests/exception-policy-default-02/test.yaml
+++ b/tests/exception-policy-default-02/test.yaml
@@ -13,7 +13,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-default-03/suricata.yaml b/tests/exception-policy-default-03/suricata.yaml
index 5a86dcd0f7bd21f8516d7c140f2e7440df36b152..cee2c2f9406838294863dd136cee5fb390fbaa1b 100644 (file)
--- a/tests/exception-policy-default-03/suricata.yaml
+++ b/tests/exception-policy-default-03/suricata.yaml
@@ -24,7 +24,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - stats
         - drop:

diff --git a/tests/exception-policy-default-03/test.yaml b/tests/exception-policy-default-03/test.yaml
index 2cddd8c162aeb78eb8882af832574e40882bfceb..1442b1c764c0e1e8a1c2039e1b6f5282e054f8be 100644 (file)
--- a/tests/exception-policy-default-03/test.yaml
+++ b/tests/exception-policy-default-03/test.yaml
@@ -37,7 +37,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-default-04/suricata.yaml b/tests/exception-policy-default-04/suricata.yaml
index 727e94710436001792f65ee05db2ed360a8d51e6..a7b7044f42554376ecf96731fac291d3ccbd1669 100644 (file)
--- a/tests/exception-policy-default-04/suricata.yaml
+++ b/tests/exception-policy-default-04/suricata.yaml
@@ -21,7 +21,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-default-04/test.yaml b/tests/exception-policy-default-04/test.yaml
index 88191d798307e4ada743516d32c06a6081c4eca9..88e6d4b72a70ba8d1e80859f63f4f36041a90921 100644 (file)
--- a/tests/exception-policy-default-04/test.yaml
+++ b/tests/exception-policy-default-04/test.yaml
@@ -24,7 +24,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-01/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-01/suricata.yaml
index db6536fe9311be5c5ec53293ab89e526570f2cd9..285093940b1a425da5962d0f65aa26c1db2bebd4 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-01/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-01/suricata.yaml
@@ -21,7 +21,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml
index e072344d61520f1125215b92fa1d4b105cc50907..07b26450c322cb936105f40dc830b36c88a0b13b 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml
@@ -36,7 +36,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-02/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-02/suricata.yaml
index e9d7d7df5ad3aa0f9243f42782d73e12e922fc5c..a5dfa6d922bd4cacbd38e3f88496c0e1b9d6396b 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-02/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-02/suricata.yaml
@@ -21,7 +21,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml
index 41369a3cd583993f6e8f4113d704afd8d87f3f01..7862ac471cab82dd67d5710bb06b0ee70725d471 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml
@@ -26,7 +26,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-03/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-03/suricata.yaml
index b0edf36d69ae10fef9aba4c41b0e7ea6e8b882b0..9b05c853e1aadbd5aeaa13c1e6bb87c3316ebb16 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-03/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-03/suricata.yaml
@@ -21,7 +21,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml
index 302d878f58423f3a934308ef631121e8945ca7f6..8d141f3535581e9bc64d717120dca1506cb23349 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml
@@ -26,7 +26,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-04/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-04/suricata.yaml
index 07c57894243ca5d78c4db44051600ac00eb82ae3..9365d6e6fc7bc287c74586b4fe707251652b0523 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-04/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-04/suricata.yaml
@@ -25,7 +25,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - stats
         - drop:

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml
index b907f784c0701d6bb4154aae6db729d8669069e9..33155089df19f76a7d976f5cf136bb6c24d3d4aa 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml
@@ -27,7 +27,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-05/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-05/suricata.yaml
index e9d7d7df5ad3aa0f9243f42782d73e12e922fc5c..a5dfa6d922bd4cacbd38e3f88496c0e1b9d6396b 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-05/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-05/suricata.yaml
@@ -21,7 +21,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml
index e34973a03b3ef47cc6dc37703ef7edd64d0f8dee..ffa0bf88655fa1bc0c2ea9b1c12ac6cac908e404 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml
@@ -21,7 +21,7 @@ checks:
       match:
         event_type: http
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-06/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-06/suricata.yaml
index 8a29066ec7ac91384e424d56b87ed177119b12dd..d92490045b24bcba47dd869e91c8135a3026a0c5 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-06/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-06/suricata.yaml
@@ -25,7 +25,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - stats
         - drop:

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml
index 79cd4cced5c17f9b767a5dcb562c96d78eb11ca2..9a5ad4221c8e1a104c12de953837eaa99fde1ca6 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml
@@ -37,7 +37,7 @@ checks:
         log_level: Warning
         engine.module: exception-policy
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-07/suricata.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-07/suricata.yaml
index c5bbe3e8a8d80db97ca077c7c2fd1f5f63419de5..c1bdcfebbd9f6817e8a16539c7d2519dc7622403 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-07/suricata.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-07/suricata.yaml
@@ -25,7 +25,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - stats
         - drop:

diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml
index 6a59a209c111f2e4efa2e0d8467bcfac690f7268..4c753838a0707f3e727b706f75712ef4212179bd 100644 (file)
--- a/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml
+++ b/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml
@@ -37,7 +37,7 @@ checks:
         log_level: Warning
         engine.module: exception-policy
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-midstream-01/suricata.yaml b/tests/exception-policy-midstream-01/suricata.yaml
index 9d62a8033396d7d718dd32649171475e016a81bd..16550c3e6a8d3173f80d87ad2e44dcea452919e8 100644 (file)
--- a/tests/exception-policy-midstream-01/suricata.yaml
+++ b/tests/exception-policy-midstream-01/suricata.yaml
@@ -26,7 +26,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-midstream-01/test.yaml b/tests/exception-policy-midstream-01/test.yaml
index 05a9a9b7078e396e5e6b1b46302cd7e9fb900f24..f820a2cc43f5b736da1187be65163376d8153579 100644 (file)
--- a/tests/exception-policy-midstream-01/test.yaml
+++ b/tests/exception-policy-midstream-01/test.yaml
@@ -25,7 +25,7 @@ checks:
         event_type: stats
         stats.exception_policy.tcp.midstream.pass_flow: 9
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-midstream-02/suricata.yaml b/tests/exception-policy-midstream-02/suricata.yaml
index b463dd27c78ac12f64778bc4ed213ed76fd597d7..4d21772eb34f53d1ffa680df5793f0ec4daca1f3 100644 (file)
--- a/tests/exception-policy-midstream-02/suricata.yaml
+++ b/tests/exception-policy-midstream-02/suricata.yaml
@@ -20,5 +20,6 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: start     # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats

diff --git a/tests/exception-policy-midstream-02/test.yaml b/tests/exception-policy-midstream-02/test.yaml
index 2c69d095483d6ded838dfcceb08e7ae7c4e7b832..b0f4867eb4c935e44a6f6818d6d865b95dbe24c7 100644 (file)
--- a/tests/exception-policy-midstream-02/test.yaml
+++ b/tests/exception-policy-midstream-02/test.yaml
@@ -37,7 +37,7 @@ checks:
         event_type: stats
         stats.exception_policy.tcp.midstream.drop_flow: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-midstream-03/suricata.yaml b/tests/exception-policy-midstream-03/suricata.yaml
index 32f0f4aa2bbcf7e746a6b7eee02a7c6b0ce806db..950d2ef939d8189a3b1d71a61d366e070f99eb66 100644 (file)
--- a/tests/exception-policy-midstream-03/suricata.yaml
+++ b/tests/exception-policy-midstream-03/suricata.yaml
@@ -13,7 +13,8 @@ outputs:
             payload-printable: yes
             packet: yes
             http: yes
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - stats
   - stats:

diff --git a/tests/exception-policy-midstream-03/test.yaml b/tests/exception-policy-midstream-03/test.yaml
index 3974e7dc3dde8c8587471b06c5ccdac44ab613cf..a46f0fc83cb786058b74af807f29157e7e0c84fd 100644 (file)
--- a/tests/exception-policy-midstream-03/test.yaml
+++ b/tests/exception-policy-midstream-03/test.yaml
@@ -25,7 +25,7 @@ checks:
         event_type: http
         dest_port: 80
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-midstream-04/suricata.yaml b/tests/exception-policy-midstream-04/suricata.yaml
index bf3a180c2de43357f13f29236cef6085f649bafc..ea76cdfcc0d77ebd2d80c4eb762639b34887cc7b 100644 (file)
--- a/tests/exception-policy-midstream-04/suricata.yaml
+++ b/tests/exception-policy-midstream-04/suricata.yaml
@@ -10,7 +10,8 @@ outputs:
       enabled: yes
       types:
         - alert
-        - flow
+        - flow:
+            exception-policy: true
         - http
         - stats
   - stats:

diff --git a/tests/exception-policy-midstream-04/test.yaml b/tests/exception-policy-midstream-04/test.yaml
index e47c1333d379be42ce59cc576b59661766aaa2c8..42a60bdcc35e3c5a1ce23f983e576a7cb3d4201b 100644 (file)
--- a/tests/exception-policy-midstream-04/test.yaml
+++ b/tests/exception-policy-midstream-04/test.yaml
@@ -26,7 +26,7 @@ checks:
       event_type: stats
       stats.exception_policy.tcp.midstream.pass_flow: 2
 - filter:
-    min-version: 8
+    min-version: 7.0.12
     count: 1
     match:
       event_type: flow

diff --git a/tests/exception-policy-midstream-05/suricata.yaml b/tests/exception-policy-midstream-05/suricata.yaml
index b994fe2b7e3d9ab09b039b92cef10af6e083eb87..3e311376abda41ac636a9048e31bce5dfa8382e2 100644 (file)
--- a/tests/exception-policy-midstream-05/suricata.yaml
+++ b/tests/exception-policy-midstream-05/suricata.yaml
@@ -25,7 +25,8 @@ outputs:
               mode: extra-data
               deployment: reverse
               header: X-Forwarded-For
-        - flow
+        - flow:
+            exception-policy: true
         - stats
         - http
         - drop:

diff --git a/tests/exception-policy-midstream-05/test.yaml b/tests/exception-policy-midstream-05/test.yaml
index 4fbba7bead161a421e730890d395ee28ccc6cf16..8b1be07a49e4df1738397c518b5c1f90d34c6956 100644 (file)
--- a/tests/exception-policy-midstream-05/test.yaml
+++ b/tests/exception-policy-midstream-05/test.yaml
@@ -25,7 +25,7 @@ checks:
         event_type: stats
         stats.exception_policy.tcp.midstream.bypass: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-midstream-06/suricata.yaml b/tests/exception-policy-midstream-06/suricata.yaml
index 4f94ed11e30bf0c90a849bc0d04260037758f001..8086db31be50f392cd53e1d2a9f6e6e4ef55a6cd 100644 (file)
--- a/tests/exception-policy-midstream-06/suricata.yaml
+++ b/tests/exception-policy-midstream-06/suricata.yaml
@@ -9,8 +9,9 @@ outputs:
   - eve-log:
       enabled: yes
       types:
-        - alert:
-        - flow
+        - alert
+        - flow:
+            exception-policy: true
         - http
         - stats
         - drop:

diff --git a/tests/exception-policy-midstream-06/test.yaml b/tests/exception-policy-midstream-06/test.yaml
index 084613b0f37fb18d5a9b05a81e9b1788e4a5bff0..8a7f74dba000bd3c4e9ad3de515515bca3caa99a 100644 (file)
--- a/tests/exception-policy-midstream-06/test.yaml
+++ b/tests/exception-policy-midstream-06/test.yaml
@@ -23,7 +23,7 @@ checks:
         event_type: stats
         stats.exception_policy.tcp.midstream.drop_flow: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-midstream-07/suricata.yaml b/tests/exception-policy-midstream-07/suricata.yaml
index 67597409a7e7cd9f459cbf7e382aaab0610afe53..f196c772e83baeb244fc84d6285f4b58cccd1247 100644 (file)
--- a/tests/exception-policy-midstream-07/suricata.yaml
+++ b/tests/exception-policy-midstream-07/suricata.yaml
@@ -8,7 +8,8 @@ outputs:
       filename: eve.json
       types:
         - alert
-        - flow
+        - flow:
+            exception-policy: true
         - smb
         - drop:
             alerts: yes

diff --git a/tests/exception-policy-midstream-07/test.yaml b/tests/exception-policy-midstream-07/test.yaml
index 644bb21258737cdb2606c20f6754a41b1ffd06d6..67af543aa0fab8cd42a6ddfeecc598f37efbd3fa 100644 (file)
--- a/tests/exception-policy-midstream-07/test.yaml
+++ b/tests/exception-policy-midstream-07/test.yaml
@@ -19,7 +19,7 @@ checks:
       match:
         event_type: smb
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-reject-action-01/suricata.yaml b/tests/exception-policy-reject-action-01/suricata.yaml
index d8f4722e9f0b35da2b1be4e9899f66c30b9d26d2..509bf19145bbb5126170f3b0b5d9bfcf3bae7969 100644 (file)
--- a/tests/exception-policy-reject-action-01/suricata.yaml
+++ b/tests/exception-policy-reject-action-01/suricata.yaml
@@ -5,8 +5,9 @@ outputs:
   - eve-log:
       enabled: yes
       types:
-        - alert:
-        - flow
+        - alert
+        - flow:
+            exception-policy: true
         - http
         - stats
         - drop:

diff --git a/tests/exception-policy-reject-action-01/test.yaml b/tests/exception-policy-reject-action-01/test.yaml
index a1cda30d1bf2f9fa876f7bb33934c926b8e72d87..46711fa78be662283c7e3c58d1d8c6152170558e 100644 (file)
--- a/tests/exception-policy-reject-action-01/test.yaml
+++ b/tests/exception-policy-reject-action-01/test.yaml
@@ -19,7 +19,7 @@ checks:
         event_type: flow
         flow.action: drop
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-simulated-flow-memcap/suricata.yaml b/tests/exception-policy-simulated-flow-memcap/suricata.yaml
index e9aab5f9a25085a964fca1a9a3e37ac986f9fe54..7431bbe8648c4582387c33e1ccb7f77ec3835836 100644 (file)
--- a/tests/exception-policy-simulated-flow-memcap/suricata.yaml
+++ b/tests/exception-policy-simulated-flow-memcap/suricata.yaml
@@ -23,7 +23,8 @@ outputs:
         - drop:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
-        - flow
+        - flow:
+            exception-policy: true
         - stats
 
 exception-policy: ignore

diff --git a/tests/exception-policy-simulated-flow-memcap/test.yaml b/tests/exception-policy-simulated-flow-memcap/test.yaml
index 56fac5be2806f45df23d77cd65f45a846ec53ce0..4a94af70f706bbb9c31fa893c16ec02300838cd9 100644 (file)
--- a/tests/exception-policy-simulated-flow-memcap/test.yaml
+++ b/tests/exception-policy-simulated-flow-memcap/test.yaml
@@ -40,7 +40,7 @@ checks:
         stats.exception_policy.flow.memcap.drop_packet: 1
         stats.exception_policy.flow.memcap.pass_packet: 0
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-reassembly-memcap-01/suricata.yaml b/tests/exception-policy-stream-reassembly-memcap-01/suricata.yaml
index 30bc85d7124b790955bdc9a55032c2802ebcb1af..7fff7b701ba787a9d537aff377f5a9601f55e808 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-01/suricata.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-01/suricata.yaml
@@ -24,7 +24,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats:
             totals: yes       # stats for all threads merged together
             threads: no       # per thread stats

diff --git a/tests/exception-policy-stream-reassembly-memcap-01/test.yaml b/tests/exception-policy-stream-reassembly-memcap-01/test.yaml
index ad59cf1c8f267d30203ffec7d57fe2ac59f0e84b..1413f4111024700c3df66d9060f3572d06a790d4 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-01/test.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-01/test.yaml
@@ -55,7 +55,7 @@ checks:
         stats.ips.drop_reason.stream_reassembly: 1
         stats.exception_policy.tcp.reassembly.drop_flow: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-reassembly-memcap-02/suricata.yaml b/tests/exception-policy-stream-reassembly-memcap-02/suricata.yaml
index 67c3f4f342a86c65f06bb7cb816ef7433c20f1e0..9e2882042afe743a0c1e67191c16ca343f76d5fb 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-02/suricata.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-02/suricata.yaml
@@ -23,7 +23,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats
 action-order:
   - pass

diff --git a/tests/exception-policy-stream-reassembly-memcap-02/test.yaml b/tests/exception-policy-stream-reassembly-memcap-02/test.yaml
index 95e257d04adf7b1dea7db67c879b3c06a9f61ce8..157d40743858e3d67503bc6b85977a838042153c 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-02/test.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-02/test.yaml
@@ -33,7 +33,7 @@ checks:
         app_proto: tls
         flow.action: pass
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-reassembly-memcap-03/suricata.yaml b/tests/exception-policy-stream-reassembly-memcap-03/suricata.yaml
index ed429c88261faa8d35ea475015e80b43d57c52bc..615fc5b78691c2499ce4d3dcccc7ee6f71488d10 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-03/suricata.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-03/suricata.yaml
@@ -19,7 +19,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats
 
 stats:

diff --git a/tests/exception-policy-stream-reassembly-memcap-03/test.yaml b/tests/exception-policy-stream-reassembly-memcap-03/test.yaml
index 0ceed1d6a41dd35b20aa3c0988a29ac9b4bd3994..c6bec393dfba111a9d824f6fa554c1acc7656b77 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-03/test.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-03/test.yaml
@@ -31,7 +31,7 @@ checks:
         event_type: flow
         flow.state: bypassed
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-reassembly-memcap-04/suricata.yaml b/tests/exception-policy-stream-reassembly-memcap-04/suricata.yaml
index 6262115447796c7dd45ac939fc7cf3f06117a362..e643d9212b600ca7ccba987aa3722e6ba856d007 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-04/suricata.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-04/suricata.yaml
@@ -17,7 +17,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats:
             totals: yes       # stats for all threads merged together
             threads: no       # per thread stats

diff --git a/tests/exception-policy-stream-reassembly-memcap-04/test.yaml b/tests/exception-policy-stream-reassembly-memcap-04/test.yaml
index d13ce3bdfeec1c97cd2fa62282d608a987480d13..1d0109b3eb8a7d61cab91ad18f666547dd84910c 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-04/test.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-04/test.yaml
@@ -53,7 +53,7 @@ checks:
         event_type: stats
         stats.ips.drop_reason.stream_reassembly: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-reassembly-memcap-05/suricata.yaml b/tests/exception-policy-stream-reassembly-memcap-05/suricata.yaml
index 6262115447796c7dd45ac939fc7cf3f06117a362..e643d9212b600ca7ccba987aa3722e6ba856d007 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-05/suricata.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-05/suricata.yaml
@@ -17,7 +17,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats:
             totals: yes       # stats for all threads merged together
             threads: no       # per thread stats

diff --git a/tests/exception-policy-stream-reassembly-memcap-05/test.yaml b/tests/exception-policy-stream-reassembly-memcap-05/test.yaml
index 7ffe07f20c5dc27c61a383d60fc1b883bc2c21b2..2a3647a586f2d9f2a33e6cfc62bfba0894d85d2d 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-05/test.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-05/test.yaml
@@ -54,7 +54,7 @@ checks:
         event_type: stats
         stats.ips.drop_reason.stream_reassembly: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-reassembly-memcap-06/suricata.yaml b/tests/exception-policy-stream-reassembly-memcap-06/suricata.yaml
index 37a8865a9d5d680e98126a624f92478be065c25d..4e1d504387dc47fc51607c00c60b6424ae361a80 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-06/suricata.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-06/suricata.yaml
@@ -17,7 +17,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats
 
   - stats:

diff --git a/tests/exception-policy-stream-reassembly-memcap-06/test.yaml b/tests/exception-policy-stream-reassembly-memcap-06/test.yaml
index e34e39cd2a7379f2cbab36dc9d0b897aeef87c1c..d276e7ec762068aecbebe733d242ca8a5d840ef5 100644 (file)
--- a/tests/exception-policy-stream-reassembly-memcap-06/test.yaml
+++ b/tests/exception-policy-stream-reassembly-memcap-06/test.yaml
@@ -54,7 +54,7 @@ checks:
         event_type: stats
         stats.exception_policy.tcp.reassembly.pass_packet: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow

diff --git a/tests/exception-policy-stream-ssn-memcap-01/suricata.yaml b/tests/exception-policy-stream-ssn-memcap-01/suricata.yaml
index 73c956016d80ab643c334883a71daad142abebf2..c4f6c982cf8b8bd710ce3b14f9b10edba40da9b0 100644 (file)
--- a/tests/exception-policy-stream-ssn-memcap-01/suricata.yaml
+++ b/tests/exception-policy-stream-ssn-memcap-01/suricata.yaml
@@ -23,7 +23,8 @@ outputs:
             alerts: yes      # log alerts that caused drops
             flows: all       # start or all: 'start' logs only a single drop
                              # per flow direction. All logs each dropped pkt.
-        - flow
+        - flow:
+            exception-policy: true
         - stats
 
 action-order:

diff --git a/tests/exception-policy-stream-ssn-memcap-01/test.yaml b/tests/exception-policy-stream-ssn-memcap-01/test.yaml
index 4726fa032d7e7bd6d767d6b5d1bd415a073ced14..71f4a84657a8477cf44ae3aa298e835dc0f8de8f 100644 (file)
--- a/tests/exception-policy-stream-ssn-memcap-01/test.yaml
+++ b/tests/exception-policy-stream-ssn-memcap-01/test.yaml
@@ -58,7 +58,7 @@ checks:
         event_type: stats
         stats.exception_policy.tcp.ssn_memcap.drop_flow: 1
   - filter:
-      min-version: 8
+      min-version: 7.0.12
       count: 1
       match:
         event_type: flow