exceptions: move midstream 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 9b65eb063dbab6b157d00cdab1e5e34f857a69d6..96c3e478b8ad0d798f47de4a587ed2a5e4fac9e1 100644 (file)
--- a/etc/schema.json
+++ b/etc/schema.json
@@ -6177,6 +6177,11 @@
                         },
                         "tcp": {
                             "type": "object",
+                            "midstream": {
+                                "description":
+                                        "How many times midstream exception policy was applied, and which one",
+                                "$ref": "#/$defs/exceptionPolicy"
+                            },
                             "ssn_memcap": {
                                 "description":
                                         "How many times session memcap exception policy was applied, and which one",
@@ -6621,11 +6626,6 @@
                         "midstream_pickups": {
                             "type": "integer"
                         },
-                        "midstream_exception_policy": {
-                            "description":
-                                    "How many times midstream exception policy was applied, and which one",
-                            "$ref": "#/$defs/exceptionPolicy"
-                        },
                         "no_flow": {
                             "type": "integer"
                         },

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 211780e7e7b6770ffe7cd2f5e28c1ca7ff03b0ce..02123de0c459e93fec4cc764b1bcf96fa06cce7b 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -6008,11 +6008,11 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
     if (stream_config.midstream) {
         ExceptionPolicySetStatsCounters(tv, &stt->counter_tcp_midstream_eps,
                 &stream_midstream_enabled_eps_stats, stream_config.midstream_policy,
-                "tcp.midstream_exception_policy.", IsMidstreamExceptionPolicyStatsValid);
+                "exception_policy.tcp.midstream.", IsMidstreamExceptionPolicyStatsValid);
     } else {
         ExceptionPolicySetStatsCounters(tv, &stt->counter_tcp_midstream_eps,
                 &stream_midstream_disabled_eps_stats, stream_config.midstream_policy,
-                "tcp.midstream_exception_policy.", IsMidstreamExceptionPolicyStatsValid);
+                "exception_policy.tcp.midstream.", IsMidstreamExceptionPolicyStatsValid);
     }
 
     stt->counter_tcp_wrong_thread = StatsRegisterCounter("tcp.pkt_on_wrong_thread", tv);