stats: Memcap pressure max relocation

This commit moves the memcap pressure/pressure_max stats from the global
stats namespace into the memcap namespace.

With per-thread stats, they will be within the flow-manager's values.

Issue: 6398

diff --git a/etc/schema.json b/etc/schema.json
index 15f148e4f6a2d215d8d681756d0527ff5d4269c4..a90630d1644fa364dd8e45cd343bdf279cb64660 100644 (file)
--- a/etc/schema.json
+++ b/etc/schema.json
@@ -3734,15 +3734,6 @@
                         }
                     }
                 },
-                "memcap_pressure": {
-                    "description":
-                            "Percentage of memcaps used by flow, stream, stream-reassembly and app-layer-http",
-                    "type": "integer"
-                },
-                "memcap_pressure_max": {
-                    "description": "Maximum memcap_pressure seen by the engine",
-                    "type": "integer"
-                },
                 "app_layer": {
                     "type": "object",
                     "properties": {
@@ -5298,6 +5289,21 @@
                     },
                     "additionalProperties": false
                 },
+                "memcap": {
+                    "type": "object",
+                    "properties": {
+                        "pressure": {
+                            "description":
+                                    "Percentage of memcaps used by flow, stream, stream-reassembly and app-layer-http",
+                            "type": "integer"
+                        },
+                        "pressure_max": {
+                            "description": "Maximum pressure seen by the engine",
+                            "type": "integer"
+                        }
+                    },
+                    "additionalProperties": false
+                },
                 "ftp": {
                     "type": "object",
                     "properties": {

diff --git a/src/flow-manager.c b/src/flow-manager.c
index bcc1498c8bd880c6f5e639bb08b7a87d4d4a207e..279910cb85babaebce0438a56710a309d8105746 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -654,8 +654,8 @@ static void FlowCountersInit(ThreadVars *t, FlowCounters *fc)
     fc->flow_bypassed_pkts = StatsRegisterCounter("flow_bypassed.pkts", t);
     fc->flow_bypassed_bytes = StatsRegisterCounter("flow_bypassed.bytes", t);
 
-    fc->memcap_pressure = StatsRegisterCounter("memcap_pressure", t);
-    fc->memcap_pressure_max = StatsRegisterMaxCounter("memcap_pressure_max", t);
+    fc->memcap_pressure = StatsRegisterCounter("memcap.pressure", t);
+    fc->memcap_pressure_max = StatsRegisterMaxCounter("memcap.pressure_max", t);
 }
 
 static void FlowCountersUpdate(