From 538d8e05a0e2e0908added74a3e63061767c787f Mon Sep 17 00:00:00 2001
From: Juliana Fajardini <jufajardini@oisf.net>
Date: Mon, 24 Mar 2025 12:05:20 -0700
Subject: [PATCH] exceptions: move defrag stats to common counter

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

Task #7185

(cherry picked from commit b4c216a4bab16e28e19791e69e592ff7ba8ba45f)
---
 etc/schema.json | 13 ++++++++-----
 src/decode.c    |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/etc/schema.json b/etc/schema.json
index 2103379e63..2139013c66 100644
--- a/etc/schema.json
+++ b/etc/schema.json
@@ -4855,11 +4855,6 @@
                         "max_frag_hits": {
                             "type": "integer"
                         },
-                        "memcap_exception_policy": {
-                            "description":
-                                    "How many times defrag memcap exception policy was applied, and which one",
-                            "$ref": "#/$defs/exceptionPolicy"
-                        },
                         "ipv4": {
                             "type": "object",
                             "properties": {
@@ -4955,6 +4950,14 @@
                                     "Consolidated stats on how many times app-layer error exception policy was applied, and which one",
                                 "$ref": "#/$defs/exceptionPolicy"
                             }
+                        },
+                        "defrag": {
+                            "type": "object",
+                            "memcap": {
+                                "description":
+                                        "How many times defrag memcap exception policy was applied, and which one",
+                                "$ref": "#/$defs/exceptionPolicy"
+                            }
                         }
                     }
                 },
diff --git a/src/decode.c b/src/decode.c
index 15ffbc54d7..c779baf7fc 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -676,7 +676,7 @@ void DecodeRegisterPerfCounters(DecodeThreadVars *dtv, ThreadVars *tv)
         StatsRegisterCounter("defrag.max_frag_hits", tv);
 
     ExceptionPolicySetStatsCounters(tv, &dtv->counter_defrag_memcap_eps, &defrag_memcap_eps_stats,
-            DefragGetMemcapExceptionPolicy(), "defrag.memcap_exception_policy.",
+            DefragGetMemcapExceptionPolicy(), "exception_policy.defrag.memcap.",
             IsDefragMemcapExceptionPolicyStatsValid);
 
     for (int i = 0; i < DECODE_EVENT_MAX; i++) {