reorganize request api

src/stats/snap.rs

@@ -31,11 +31,17 @@ pub struct Sum {
     percent: f32,
 }
 
+#[derive(Serialize)]
+pub struct Request {
+    total: u64,
+    allowed: Sum,
+    blocked: Sum,
+}
+
 #[derive(Serialize)]
 pub struct Snap {
     rules: u64,
-    request: Sum,
+    request: Request,
-    blocked: Sum,
     up: Up,
 }
 
@@ -48,17 +54,20 @@ impl Snap {
         };
         Self {
             rules,
-            request: Sum {
+            request: Request {
                 total: request,
-                percent: if request == 0 {
+                allowed: Sum {
-                    0.0
+                    total: request - blocked,
-                } else {
+                    percent: if request == 0 {
-                    100.0 - blocked_percent
+                        0.0
+                    } else {
+                        100.0 - blocked_percent
+                    },
+                },
+                blocked: Sum {
+                    total: blocked,
+                    percent: blocked_percent,
                 },
-            },
-            blocked: Sum {
-                total: blocked,
-                percent: blocked_percent,
             },
             up: Up::from_startup_seconds(seconds_from_startup),
         }