exceptions: move reassembly memcap stats to common counter

Part of making the exception policy stats counters more search
friendly.

Task #7185

diff --git a/etc/schema.json b/etc/schema.json
index 8c6a359b1ddf373077a9a6c80bcc725084e77edb..9b65eb063dbab6b157d00cdab1e5e34f857a69d6 100644 (file)
--- a/etc/schema.json
+++ b/etc/schema.json
@@ -6181,6 +6181,11 @@
                                 "description":
                                         "How many times session memcap exception policy was applied, and which one",
                                 "$ref": "#/$defs/exceptionPolicy"
+                            },
+                            "reassembly": {
+                                "description":
+                                        "How many times reassembly memcap exception policy was applied, and which one",
+                                "$ref": "#/$defs/exceptionPolicy"
                             }
                         }
                     }
@@ -6636,11 +6641,6 @@
                         "pseudo": {
                             "type": "integer"
                         },
-                        "reassembly_exception_policy": {
-                            "description":
-                                    "How many times reassembly memcap exception policy was applied, and which one",
-                            "$ref": "#/$defs/exceptionPolicy"
-                        },
                         "reassembly_gap": {
                             "type": "integer"
                         },

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 811f82fe69bb672ed822492fbd59d39145c6bd78..211780e7e7b6770ffe7cd2f5e28c1ca7ff03b0ce 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -6027,7 +6027,7 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
 
     ExceptionPolicySetStatsCounters(tv, &stt->ra_ctx->counter_tcp_reas_eps,
             &stream_reassembly_memcap_eps_stats, stream_config.reassembly_memcap_policy,
-            "tcp.reassembly_exception_policy.", IsReassemblyMemcapExceptionPolicyStatsValid);
+            "exception_policy.tcp.reassembly.", IsReassemblyMemcapExceptionPolicyStatsValid);
 
     stt->ra_ctx->counter_tcp_segment_from_cache =
             StatsRegisterCounter("tcp.segment_from_cache", tv);