From 603bce54f18e6f377bbd5ea7cdb4cf96dfe6ed31 Mon Sep 17 00:00:00 2001
From: Jordan Blasenhauer <blasenhauer.jordan.dev@gmail.com>
Date: Fri, 2 Feb 2024 18:22:58 +0100
Subject: [PATCH] metric work + start update ui

*function execution calling app object working
*start updating core plugins component and key names for template.html and actions.py
---
 src/common/core/antibot/ui/actions.py      |  13 +-
 src/common/core/antibot/ui/template.html   |   4 +-
 src/common/core/authbasic/ui/actions.py    |  18 +-
 src/common/core/badbehavior/ui/actions.py  |  22 ++-
 src/common/core/blacklist/ui/actions.py    |  34 ++--
 src/common/core/blacklist/ui/template.html |  10 +-
 src/common/core/cors/ui/actions.py         |  19 +-
 src/common/core/cors/ui/template.html      |   2 +-
 src/common/core/country/ui/actions.py      |  13 ++
 src/common/core/country/ui/template.html   |  53 +-----
 src/common/core/dnsbl/ui/actions.py        |  19 +-
 src/common/core/dnsbl/ui/template.html     |  83 ++++----
 src/common/core/errors/ui/actions.py       |  21 +-
 src/common/core/greylist/ui/actions.py     |  22 +--
 src/common/core/greylist/ui/template.html  | 211 ++-------------------
 src/common/core/limit/ui/actions.py        |  21 +-
 src/common/core/misc/ui/actions.py         |  23 ++-
 src/common/core/misc/ui/template.html      |   4 +-
 src/common/core/reversescan/ui/actions.py  |  25 +--
 src/common/core/whitelist/ui/actions.py    |  22 +--
 src/common/core/whitelist/ui/template.html | 204 ++------------------
 src/ui/main.py                             |   6 +-
 src/ui/src/Instances.py                    |   6 +-
 23 files changed, 254 insertions(+), 601 deletions(-)

diff --git a/src/common/core/antibot/ui/actions.py b/src/common/core/antibot/ui/actions.py
index be7c4748c..52b4f80f6 100644
--- a/src/common/core/antibot/ui/actions.py
+++ b/src/common/core/antibot/ui/actions.py
@@ -1,2 +1,11 @@
-def antibot():
-    return {"counter_failed_challenges": 0}
+def antibot(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("antibot")
+
+        if data.get("counter_failed_challenges") is None:
+            data["counter_failed_challenges"] = 0
+
+        return data
+
+    except:
+        return {"counter_failed_challenges": 0}
diff --git a/src/common/core/antibot/ui/template.html b/src/common/core/antibot/ui/template.html
index 6cc57a3a8..338068f13 100644
--- a/src/common/core/antibot/ui/template.html
+++ b/src/common/core/antibot/ui/template.html
@@ -36,8 +36,8 @@
       <h5 data-count class="mb-1 font-bold dark:text-white/90">"unknown"</h5>
 
       <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-sky-500 mx-0.5"
-          >total number
+        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5"
+          >total failed
         </span>
       </p>
     </div>
diff --git a/src/common/core/authbasic/ui/actions.py b/src/common/core/authbasic/ui/actions.py
index 64fd4d12f..f40e8fcbb 100644
--- a/src/common/core/authbasic/ui/actions.py
+++ b/src/common/core/authbasic/ui/actions.py
@@ -1,8 +1,10 @@
-def authbasic():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "count": 3,
-        },
-    }
+def authbasic(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("authbasic")
+
+        if data.get("counter_failed_challenges") is None:
+            data["counter_failed_challenges"] = 0
+
+        return data
+    except:
+        return {"counter_failed_challenges": 0}
diff --git a/src/common/core/badbehavior/ui/actions.py b/src/common/core/badbehavior/ui/actions.py
index 84a7b362e..648c1b38f 100644
--- a/src/common/core/badbehavior/ui/actions.py
+++ b/src/common/core/badbehavior/ui/actions.py
@@ -1,9 +1,13 @@
-def badbehavior():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "count": 3,
-            "items": [{"code": 400, "count": 24}, {"code": 403, "count": 845}, {"code": 402, "count": 12}],
-        },
-    }
+def badbehavior(**kwargs):
+    try:
+        # Here we will have a list { 'counter_403': X, 'counter_401': Y ... }
+        data = kwargs["app"].config["INSTANCES"].get_metrics("badbehavior")
+        format_data = []
+        # Format to fit [{code: 403, count: X}, {code: 401, count: Y} ...]
+        for key, value in data.items():
+            format_data[key] = {"code": int(key.split("_")[1]), "count": value}
+
+        return {"items": format_data}
+
+    except:
+        return {"items": []}
diff --git a/src/common/core/blacklist/ui/actions.py b/src/common/core/blacklist/ui/actions.py
index 5b8b538a8..86a9feb87 100644
--- a/src/common/core/blacklist/ui/actions.py
+++ b/src/common/core/blacklist/ui/actions.py
@@ -1,11 +1,23 @@
-def blacklist():
-    return {
-        "message": "ok",
-        "data": {
-            "count_url": 4,
-            "count_ip": 2,
-            "count_rdns": 1,
-            "count_asn": 10,
-            "count_user_agent": 10,
-        },
-    }
+def blacklist(**kwargs):
+    keys = [
+        "counter_blacklist_url",
+        "counter_blacklist_ip",
+        "counter_blacklist_rdns",
+        "counter_blacklist_asn",
+        "counter_blacklist_usa",
+    ]
+
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("blacklist")
+
+        for key in keys:
+            if data.get(key) is None:
+                data[key] = 0
+
+        return data
+
+    except:
+        data = {}
+        for key in keys:
+            data[key] = 0
+        return data
diff --git a/src/common/core/blacklist/ui/template.html b/src/common/core/blacklist/ui/template.html
index 687dfdcbe..e2c75a2a7 100644
--- a/src/common/core/blacklist/ui/template.html
+++ b/src/common/core/blacklist/ui/template.html
@@ -235,27 +235,27 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      count_url: {
+      counter_blacklist_url: {
         el: document.querySelector("[data-count-url]"),
         value: "unknown",
         type: "text",
       },
-      count_ip: {
+      counter_blacklist_ip: {
         el: document.querySelector("[data-count-ip]"),
         value: "unknown",
         type: "text",
       },
-      count_rdns: {
+      counter_blacklist_rdns: {
         el: document.querySelector("[data-count-rdns]"),
         value: "unknown",
         type: "text",
       },
-      count_asn: {
+      counter_blacklist_asn: {
         el: document.querySelector("[data-count-asn]"),
         value: "unknown",
         type: "text",
       },
-      count_user_agent: {
+      counter_blacklist_ua: {
         el: document.querySelector("[data-count-user-agent]"),
         value: "unknown",
         type: "text",
diff --git a/src/common/core/cors/ui/actions.py b/src/common/core/cors/ui/actions.py
index ebc717152..13aab1b98 100644
--- a/src/common/core/cors/ui/actions.py
+++ b/src/common/core/cors/ui/actions.py
@@ -1,8 +1,11 @@
-def cors():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "count": 3,
-        },
-    }
+def cors(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("cors")
+
+        if data.get("counter_failed_cors") is None:
+            data["counter_failed_cors"] = 0
+
+        return data
+
+    except:
+        return {"counter_failed_cors": 0}
diff --git a/src/common/core/cors/ui/template.html b/src/common/core/cors/ui/template.html
index e9dfdc281..a71563da4 100644
--- a/src/common/core/cors/ui/template.html
+++ b/src/common/core/cors/ui/template.html
@@ -74,7 +74,7 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      count: {
+      counter_failed_cors: {
         el: document.querySelector("[data-count]"),
         value: "unknown",
         type: "text",
diff --git a/src/common/core/country/ui/actions.py b/src/common/core/country/ui/actions.py
index a9b64b967..1f3356eb4 100644
--- a/src/common/core/country/ui/actions.py
+++ b/src/common/core/country/ui/actions.py
@@ -7,3 +7,16 @@ def country():
             "whitelist_count": 23,
         },
     }
+
+
+def country(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("country")
+
+        if data.get("counter_failed_country") is None:
+            data["counter_failed_country"] = 0
+
+        return data
+
+    except:
+        return {"counter_failed_country": 0}
diff --git a/src/common/core/country/ui/template.html b/src/common/core/country/ui/template.html
index 49ad3ccbb..e3a8c6e63 100644
--- a/src/common/core/country/ui/template.html
+++ b/src/common/core/country/ui/template.html
@@ -35,11 +35,11 @@
       >
         Country
       </p>
-      <h5 data-count-blacklist class="mb-1 font-bold dark:text-white/90"></h5>
+      <h5 data-count class="mb-1 font-bold dark:text-white/90"></h5>
 
       <p class="mb-0 dark:text-white dark:opacity-60">
         <span class="font-bold leading-normal text-sm text-red-500 mx-0.5"
-          >blacklist request blocked</span
+          >request blocked</span
         >
       </p>
     </div>
@@ -67,46 +67,6 @@
     <!-- end icon -->
   </div>
 
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        Country
-      </p>
-      <h5 data-count-whitelist class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-green-500 mx-0.5"
-          >whitelist request passed</span
-        >
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-green-700"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-75 leading-none text-lg relative stroke-green-700 fill-white"
-      >
-        <path
-          fill-rule="evenodd"
-          d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm13.36-1.814a.75.75 0 1 0-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 0 0-1.06 1.06l2.25 2.25a.75.75 0 0 0 1.14-.094l3.75-5.25Z"
-          clip-rule="evenodd"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
   <script>
     // Use SetupPlugin class that is on static/js/plugins/setup.js
     const setPlugin = new SetupPlugin({
@@ -115,13 +75,8 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      blacklist_count: {
-        el: document.querySelector("[data-count-blacklist]"),
-        value: "",
-        type: "text",
-      },
-      whitelist_count: {
-        el: document.querySelector("[data-count-whitelist]"),
+      counter_failed_country: {
+        el: document.querySelector("[data-count]"),
         value: "",
         type: "text",
       },
diff --git a/src/common/core/dnsbl/ui/actions.py b/src/common/core/dnsbl/ui/actions.py
index 365be77ec..7a30d4fb0 100644
--- a/src/common/core/dnsbl/ui/actions.py
+++ b/src/common/core/dnsbl/ui/actions.py
@@ -1,8 +1,11 @@
-def dnsbl():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "items": [{"server_name": "www.example.com", "status": "ok"}, {"server_name": "app1.com", "status": "ok"}, {"server_name": "test.2.fr", "status": "ko"}],
-        },
-    }
+def dnsbl(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("dnsbl")
+
+        if data.get("counter_failed_dnsbl") is None:
+            data["counter_failed_dnsbl"] = 0
+
+        return data
+
+    except:
+        return {"counter_failed_dnsbl": 0}
diff --git a/src/common/core/dnsbl/ui/template.html b/src/common/core/dnsbl/ui/template.html
index 825651028..e1589de0c 100644
--- a/src/common/core/dnsbl/ui/template.html
+++ b/src/common/core/dnsbl/ui/template.html
@@ -24,47 +24,45 @@
   <!-- end info -->
 
   <div
-    data-fetch-success-show
-    class="hidden col-span-12 md:col-span-8 3xl:col-span-9 w-full xl:max-w-[600px] overflow-hidden grid grid-cols-12 max-h-100 sm:max-h-125 p-4 relative break-words bg-white shadow-xl dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
+    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
   >
-    <div class="col-span-12">
-      <h5 class="mb-4 mt-2 font-bold dark:text-white/90 mx-2">DNSBL LIST</h5>
-    </div>
-    <div class="col-span-12 overflow-y-auto overflow-x-auto">
-      <!-- list container-->
-      <div class="min-w-[400px] w-full grid grid-cols-12 rounded p-2">
-        <!-- header-->
-        <p
-          class="dark:text-gray-300 h-8 text-sm font-bold col-span-8 m-0 pb-2 border-b border-gray-400"
+    <!-- text -->
+    <div>
+      <p
+        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
+      >
+        DNSBL
+      </p>
+      <h5 data-count class="mb-1 font-bold dark:text-white/90"></h5>
+
+      <p class="mb-0 dark:text-white dark:opacity-60">
+        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5"
+          >request blocked</span
         >
-          Server name
-        </p>
-        <p
-          class="dark:text-gray-300 h-8 text-sm font-bold col-span-4 m-0 pb-2 border-b border-gray-400"
-        >
-          Status
-        </p>
-        <!-- end header-->
-        <!-- list -->
-        <ul class="col-span-12 w-full">
-          <li
-            data-item
-            class="items-center grid grid-cols-12 border-b border-gray-300 py-2.5"
-          >
-            <p
-              data-name="server_name"
-              class="dark:text-gray-400 dark:opacity-80 text-sm col-span-8 m-0 my-1"
-            ></p>
-            <p
-              data-name="status"
-              class="dark:text-gray-400 dark:opacity-80 text-sm col-span-4 ml-2 m-0 my-1"
-            ></p>
-          </li>
-        </ul>
-        <!-- end list-->
-      </div>
-      <!-- end list container-->
+      </p>
     </div>
+    <!-- end text -->
+    <!-- icon -->
+    <div
+      role="img"
+      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-red-700"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke-width="1.5"
+        stroke="currentColor"
+        class="scale-75 leading-none text-lg relative fill-red-700 stroke-white"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"
+        />
+      </svg>
+    </div>
+    <!-- end icon -->
   </div>
 
   <script>
@@ -75,11 +73,10 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      items: {
-        el: document.querySelector("[data-item]"),
-        value: [],
-        type: "list",
-        listNames: ["server_name", "status"],
+      counter_failed_dnsbl: {
+        el: document.querySelector("[data-count]"),
+        value: "unknown",
+        type: "text",
       },
     });
   </script>
diff --git a/src/common/core/errors/ui/actions.py b/src/common/core/errors/ui/actions.py
index 6b2da6100..4b7f885cf 100644
--- a/src/common/core/errors/ui/actions.py
+++ b/src/common/core/errors/ui/actions.py
@@ -1,8 +1,13 @@
-def errors():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "items": [{"count": 74, "code": "403"}, {"count": 82, "code": "404"}, {"count": "32", "code": "400"}],
-        },
-    }
+def errors(**kwargs):
+    try:
+        # Here we will have a list { 'counter_403': X, 'counter_401': Y ... }
+        data = kwargs["app"].config["INSTANCES"].get_metrics("errors")
+        format_data = []
+        # Format to fit [{code: 403, count: X}, {code: 401, count: Y} ...]
+        for key, value in data.items():
+            format_data[key] = {"code": int(key.split("_")[1]), "count": value}
+
+        return {"items": format_data}
+
+    except:
+        return {"items": []}
diff --git a/src/common/core/greylist/ui/actions.py b/src/common/core/greylist/ui/actions.py
index 603f75042..3bd3bb452 100644
--- a/src/common/core/greylist/ui/actions.py
+++ b/src/common/core/greylist/ui/actions.py
@@ -1,11 +1,11 @@
-def greylist():
-    return {
-        "message": "ok",
-        "data": {
-            "count_url": 4,
-            "count_ip": 2,
-            "count_rdns": 1,
-            "count_asn": 10,
-            "count_user_agent": 10,
-        },
-    }
+def greylist(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("greylist")
+
+        if data.get("counter_failed_greylist") is None:
+            data["counter_failed_greylist"] = 0
+
+        return data
+
+    except:
+        return {"counter_failed_greylist": 0}
diff --git a/src/common/core/greylist/ui/template.html b/src/common/core/greylist/ui/template.html
index 687dfdcbe..64d60f27f 100644
--- a/src/common/core/greylist/ui/template.html
+++ b/src/common/core/greylist/ui/template.html
@@ -24,7 +24,6 @@
     </div>
     <!-- end info -->
   </div>
-
   <div
     class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
   >
@@ -33,194 +32,34 @@
       <p
         class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
       >
-        URL
+        GREYLIST
       </p>
-      <h5 data-count-url class="mb-1 font-bold dark:text-white/90"></h5>
+      <h5 data-count class="mb-1 font-bold dark:text-white/90"></h5>
 
       <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
+        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5"
+          >request blocked</span
+        >
       </p>
     </div>
     <!-- end text -->
     <!-- icon -->
     <div
       role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-red-600"
+      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-red-700"
     >
       <svg
         xmlns="http://www.w3.org/2000/svg"
+        fill="none"
         viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-[0.6] leading-none text-lg relative fill-white"
+        stroke-width="1.5"
+        stroke="currentColor"
+        class="scale-75 leading-none text-lg relative fill-red-700 stroke-white"
       >
         <path
-          fill-rule="evenodd"
-          d="M19.902 4.098a3.75 3.75 0 0 0-5.304 0l-4.5 4.5a3.75 3.75 0 0 0 1.035 6.037.75.75 0 0 1-.646 1.353 5.25 5.25 0 0 1-1.449-8.45l4.5-4.5a5.25 5.25 0 1 1 7.424 7.424l-1.757 1.757a.75.75 0 1 1-1.06-1.06l1.757-1.757a3.75 3.75 0 0 0 0-5.304Zm-7.389 4.267a.75.75 0 0 1 1-.353 5.25 5.25 0 0 1 1.449 8.45l-4.5 4.5a5.25 5.25 0 1 1-7.424-7.424l1.757-1.757a.75.75 0 1 1 1.06 1.06l-1.757 1.757a3.75 3.75 0 1 0 5.304 5.304l4.5-4.5a3.75 3.75 0 0 0-1.035-6.037.75.75 0 0 1-.354-1Z"
-          clip-rule="evenodd"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        IP
-      </p>
-      <h5 data-count-ip class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-lime-600"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-50 leading-none text-lg relative fill-white"
-      >
-        <path
-          d="M3.53 2.47a.75.75 0 0 0-1.06 1.06l18 18a.75.75 0 1 0 1.06-1.06l-18-18ZM20.25 5.507v11.561L5.853 2.671c.15-.043.306-.075.467-.094a49.255 49.255 0 0 1 11.36 0c1.497.174 2.57 1.46 2.57 2.93ZM3.75 21V6.932l14.063 14.063L12 18.088l-7.165 3.583A.75.75 0 0 1 3.75 21Z"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        RDNS
-      </p>
-      <h5 data-count-rdns class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-indigo-500"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-[0.6] leading-none text-lg relative fill-white"
-      >
-        <path
-          d="M11.625 16.5a1.875 1.875 0 1 0 0-3.75 1.875 1.875 0 0 0 0 3.75Z"
-        />
-        <path
-          fill-rule="evenodd"
-          d="M5.625 1.5H9a3.75 3.75 0 0 1 3.75 3.75v1.875c0 1.036.84 1.875 1.875 1.875H16.5a3.75 3.75 0 0 1 3.75 3.75v7.875c0 1.035-.84 1.875-1.875 1.875H5.625a1.875 1.875 0 0 1-1.875-1.875V3.375c0-1.036.84-1.875 1.875-1.875Zm6 16.5c.66 0 1.277-.19 1.797-.518l1.048 1.048a.75.75 0 0 0 1.06-1.06l-1.047-1.048A3.375 3.375 0 1 0 11.625 18Z"
-          clip-rule="evenodd"
-        />
-        <path
-          d="M14.25 5.25a5.23 5.23 0 0 0-1.279-3.434 9.768 9.768 0 0 1 6.963 6.963A5.23 5.23 0 0 0 16.5 7.5h-1.875a.375.375 0 0 1-.375-.375V5.25Z"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        ASN
-      </p>
-      <h5 data-count-asn class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-blue-700"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-[0.6] leading-none text-lg relative fill-white"
-      >
-        <path
-          d="M21.721 12.752a9.711 9.711 0 0 0-.945-5.003 12.754 12.754 0 0 1-4.339 2.708 18.991 18.991 0 0 1-.214 4.772 17.165 17.165 0 0 0 5.498-2.477ZM14.634 15.55a17.324 17.324 0 0 0 .332-4.647c-.952.227-1.945.347-2.966.347-1.021 0-2.014-.12-2.966-.347a17.515 17.515 0 0 0 .332 4.647 17.385 17.385 0 0 0 5.268 0ZM9.772 17.119a18.963 18.963 0 0 0 4.456 0A17.182 17.182 0 0 1 12 21.724a17.18 17.18 0 0 1-2.228-4.605ZM7.777 15.23a18.87 18.87 0 0 1-.214-4.774 12.753 12.753 0 0 1-4.34-2.708 9.711 9.711 0 0 0-.944 5.004 17.165 17.165 0 0 0 5.498 2.477ZM21.356 14.752a9.765 9.765 0 0 1-7.478 6.817 18.64 18.64 0 0 0 1.988-4.718 18.627 18.627 0 0 0 5.49-2.098ZM2.644 14.752c1.682.971 3.53 1.688 5.49 2.099a18.64 18.64 0 0 0 1.988 4.718 9.765 9.765 0 0 1-7.478-6.816ZM13.878 2.43a9.755 9.755 0 0 1 6.116 3.986 11.267 11.267 0 0 1-3.746 2.504 18.63 18.63 0 0 0-2.37-6.49ZM12 2.276a17.152 17.152 0 0 1 2.805 7.121c-.897.23-1.837.353-2.805.353-.968 0-1.908-.122-2.805-.353A17.151 17.151 0 0 1 12 2.276ZM10.122 2.43a18.629 18.629 0 0 0-2.37 6.49 11.266 11.266 0 0 1-3.746-2.504 9.754 9.754 0 0 1 6.116-3.985Z"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        User Agent
-      </p>
-      <h5 data-count-user-agent class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-amber-500"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-50 leading-none text-lg relative fill-white"
-      >
-        <path
-          fill-rule="evenodd"
-          d="M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z"
-          clip-rule="evenodd"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"
         />
       </svg>
     </div>
@@ -235,28 +74,8 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      count_url: {
-        el: document.querySelector("[data-count-url]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_ip: {
-        el: document.querySelector("[data-count-ip]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_rdns: {
-        el: document.querySelector("[data-count-rdns]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_asn: {
-        el: document.querySelector("[data-count-asn]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_user_agent: {
-        el: document.querySelector("[data-count-user-agent]"),
+      counter_failed_greylist: {
+        el: document.querySelector("[data-count]"),
         value: "unknown",
         type: "text",
       },
diff --git a/src/common/core/limit/ui/actions.py b/src/common/core/limit/ui/actions.py
index e61fd917f..04ab8a9c7 100644
--- a/src/common/core/limit/ui/actions.py
+++ b/src/common/core/limit/ui/actions.py
@@ -1,8 +1,13 @@
-def limit():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "items": [{"url": "http://www.example.com", "count": 24}, {"url": "http://www.example.com", "count": 24}],
-        },
-    }
+def limit(**kwargs):
+    try:
+        # Here we will have a list { 'limit_uri_url1': X, 'limit_uri_url2': Y ... }
+        data = kwargs["app"].config["INSTANCES"].get_metrics("limit")
+        format_data = []
+        # Format to fit [{url: "url1", count: X}, {url: "url2", count: Y} ...]
+        for key, value in data.items():
+            format_data[key] = {"url": key.replace("limit_uri_", ""), "count": value}
+
+        return {"items": format_data}
+
+    except:
+        return {"items": []}
diff --git a/src/common/core/misc/ui/actions.py b/src/common/core/misc/ui/actions.py
index e741e06d7..10598b407 100644
--- a/src/common/core/misc/ui/actions.py
+++ b/src/common/core/misc/ui/actions.py
@@ -1,9 +1,14 @@
-def misc():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "count_disabled_servers": 0,
-            "count_disallowed_methods": 0,
-        },
-    }
+def misc(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("misc")
+
+        if "counter_failed_default" not in data:
+            data["counter_failed_default"] = 0
+
+        if "counter_failed_method" not in data:
+            data["counter_failed_method"] = 0
+
+        return data
+
+    except:
+        return {"counter_failed_default": 0, "counter_failed_method": 0}
diff --git a/src/common/core/misc/ui/template.html b/src/common/core/misc/ui/template.html
index 9e0a86eb9..a22092192 100644
--- a/src/common/core/misc/ui/template.html
+++ b/src/common/core/misc/ui/template.html
@@ -120,12 +120,12 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      count_disabled_servers: {
+      counter_failed_default: {
         el: document.querySelector("[data-count-server-disabled]"),
         value: "unknown",
         type: "text",
       },
-      count_disallowed_methods: {
+      counter_failed_method: {
         el: document.querySelector("[data-count-disallowed-methods]"),
         value: "unknown",
         type: "text",
diff --git a/src/common/core/reversescan/ui/actions.py b/src/common/core/reversescan/ui/actions.py
index c91786f18..4243e8164 100644
--- a/src/common/core/reversescan/ui/actions.py
+++ b/src/common/core/reversescan/ui/actions.py
@@ -1,12 +1,13 @@
-def reversescan():
-    return {
-        "message": "ok",
-        "data": {
-            "info": "test",
-            "items": [
-                {"port": 4000, "count": 400},
-                {"port": 4400, "count": 780},
-                {"port": 5000, "count": 40},
-            ],
-        },
-    }
+def reversescan(**kwargs):
+    try:
+        # Here we will have a list { 'counter_403': X, 'counter_401': Y ... }
+        data = kwargs["app"].config["INSTANCES"].get_metrics("reversescan")
+        format_data = []
+        # Format to fit [{code: 403, count: X}, {code: 401, count: Y} ...]
+        for key, value in data.items():
+            format_data[key] = {"port": int(key.split("_")[1]), "count": value}
+
+        return {"items": format_data}
+
+    except:
+        return {"items": []}
diff --git a/src/common/core/whitelist/ui/actions.py b/src/common/core/whitelist/ui/actions.py
index f828be3ac..19aeeb591 100644
--- a/src/common/core/whitelist/ui/actions.py
+++ b/src/common/core/whitelist/ui/actions.py
@@ -1,11 +1,11 @@
-def whitelist():
-    return {
-        "message": "ok",
-        "data": {
-            "count_url": 4,
-            "count_ip": 2,
-            "count_rdns": 1,
-            "count_asn": 10,
-            "count_user_agent": 10,
-        },
-    }
+def whitelist(**kwargs):
+    try:
+        data = kwargs["app"].config["INSTANCES"].get_metrics("whitelist")
+
+        if "counter_passed_whitelist" not in data:
+            data["counter_passed_whitelist"] = 0
+
+        return data
+
+    except:
+        return {"counter_passed_whitelist": 0}
diff --git a/src/common/core/whitelist/ui/template.html b/src/common/core/whitelist/ui/template.html
index 687dfdcbe..8d450ecd3 100644
--- a/src/common/core/whitelist/ui/template.html
+++ b/src/common/core/whitelist/ui/template.html
@@ -24,7 +24,6 @@
     </div>
     <!-- end info -->
   </div>
-
   <div
     class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
   >
@@ -33,193 +32,32 @@
       <p
         class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
       >
-        URL
+        WHITELIST
       </p>
-      <h5 data-count-url class="mb-1 font-bold dark:text-white/90"></h5>
+      <h5 data-count class="mb-1 font-bold dark:text-white/90"></h5>
 
       <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
+        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5"
+          >request passed</span
+        >
       </p>
     </div>
     <!-- end text -->
     <!-- icon -->
+
     <div
       role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-red-600"
+      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-green-700"
     >
       <svg
         xmlns="http://www.w3.org/2000/svg"
         viewBox="0 0 24 24"
         fill="currentColor"
-        class="scale-[0.6] leading-none text-lg relative fill-white"
+        class="scale-75 leading-none text-lg relative fill-green-700 stroke-white"
       >
         <path
           fill-rule="evenodd"
-          d="M19.902 4.098a3.75 3.75 0 0 0-5.304 0l-4.5 4.5a3.75 3.75 0 0 0 1.035 6.037.75.75 0 0 1-.646 1.353 5.25 5.25 0 0 1-1.449-8.45l4.5-4.5a5.25 5.25 0 1 1 7.424 7.424l-1.757 1.757a.75.75 0 1 1-1.06-1.06l1.757-1.757a3.75 3.75 0 0 0 0-5.304Zm-7.389 4.267a.75.75 0 0 1 1-.353 5.25 5.25 0 0 1 1.449 8.45l-4.5 4.5a5.25 5.25 0 1 1-7.424-7.424l1.757-1.757a.75.75 0 1 1 1.06 1.06l-1.757 1.757a3.75 3.75 0 1 0 5.304 5.304l4.5-4.5a3.75 3.75 0 0 0-1.035-6.037.75.75 0 0 1-.354-1Z"
-          clip-rule="evenodd"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        IP
-      </p>
-      <h5 data-count-ip class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-lime-600"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-50 leading-none text-lg relative fill-white"
-      >
-        <path
-          d="M3.53 2.47a.75.75 0 0 0-1.06 1.06l18 18a.75.75 0 1 0 1.06-1.06l-18-18ZM20.25 5.507v11.561L5.853 2.671c.15-.043.306-.075.467-.094a49.255 49.255 0 0 1 11.36 0c1.497.174 2.57 1.46 2.57 2.93ZM3.75 21V6.932l14.063 14.063L12 18.088l-7.165 3.583A.75.75 0 0 1 3.75 21Z"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        RDNS
-      </p>
-      <h5 data-count-rdns class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-indigo-500"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-[0.6] leading-none text-lg relative fill-white"
-      >
-        <path
-          d="M11.625 16.5a1.875 1.875 0 1 0 0-3.75 1.875 1.875 0 0 0 0 3.75Z"
-        />
-        <path
-          fill-rule="evenodd"
-          d="M5.625 1.5H9a3.75 3.75 0 0 1 3.75 3.75v1.875c0 1.036.84 1.875 1.875 1.875H16.5a3.75 3.75 0 0 1 3.75 3.75v7.875c0 1.035-.84 1.875-1.875 1.875H5.625a1.875 1.875 0 0 1-1.875-1.875V3.375c0-1.036.84-1.875 1.875-1.875Zm6 16.5c.66 0 1.277-.19 1.797-.518l1.048 1.048a.75.75 0 0 0 1.06-1.06l-1.047-1.048A3.375 3.375 0 1 0 11.625 18Z"
-          clip-rule="evenodd"
-        />
-        <path
-          d="M14.25 5.25a5.23 5.23 0 0 0-1.279-3.434 9.768 9.768 0 0 1 6.963 6.963A5.23 5.23 0 0 0 16.5 7.5h-1.875a.375.375 0 0 1-.375-.375V5.25Z"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        ASN
-      </p>
-      <h5 data-count-asn class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-blue-700"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-[0.6] leading-none text-lg relative fill-white"
-      >
-        <path
-          d="M21.721 12.752a9.711 9.711 0 0 0-.945-5.003 12.754 12.754 0 0 1-4.339 2.708 18.991 18.991 0 0 1-.214 4.772 17.165 17.165 0 0 0 5.498-2.477ZM14.634 15.55a17.324 17.324 0 0 0 .332-4.647c-.952.227-1.945.347-2.966.347-1.021 0-2.014-.12-2.966-.347a17.515 17.515 0 0 0 .332 4.647 17.385 17.385 0 0 0 5.268 0ZM9.772 17.119a18.963 18.963 0 0 0 4.456 0A17.182 17.182 0 0 1 12 21.724a17.18 17.18 0 0 1-2.228-4.605ZM7.777 15.23a18.87 18.87 0 0 1-.214-4.774 12.753 12.753 0 0 1-4.34-2.708 9.711 9.711 0 0 0-.944 5.004 17.165 17.165 0 0 0 5.498 2.477ZM21.356 14.752a9.765 9.765 0 0 1-7.478 6.817 18.64 18.64 0 0 0 1.988-4.718 18.627 18.627 0 0 0 5.49-2.098ZM2.644 14.752c1.682.971 3.53 1.688 5.49 2.099a18.64 18.64 0 0 0 1.988 4.718 9.765 9.765 0 0 1-7.478-6.816ZM13.878 2.43a9.755 9.755 0 0 1 6.116 3.986 11.267 11.267 0 0 1-3.746 2.504 18.63 18.63 0 0 0-2.37-6.49ZM12 2.276a17.152 17.152 0 0 1 2.805 7.121c-.897.23-1.837.353-2.805.353-.968 0-1.908-.122-2.805-.353A17.151 17.151 0 0 1 12 2.276ZM10.122 2.43a18.629 18.629 0 0 0-2.37 6.49 11.266 11.266 0 0 1-3.746-2.504 9.754 9.754 0 0 1 6.116-3.985Z"
-        />
-      </svg>
-    </div>
-    <!-- end icon -->
-  </div>
-
-  <div
-    class="h-fit dark:brightness-110 max-h-none sm:max-h-28 hover:scale-102 transition col-span-12 md:col-span-6 2xl:col-span-4 flex p-4 justify-between w-full shadow-md break-words bg-white dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
-  >
-    <!-- text -->
-    <div>
-      <p
-        class="mb-2 font-sans text-sm font-semibold leading-normal uppercase dark:text-white dark:opacity-60"
-      >
-        User Agent
-      </p>
-      <h5 data-count-user-agent class="mb-1 font-bold dark:text-white/90"></h5>
-
-      <p class="mb-0 dark:text-white dark:opacity-60">
-        <span class="font-bold leading-normal text-sm text-red-500 mx-0.5">
-          denied
-        </span>
-      </p>
-    </div>
-    <!-- end text -->
-    <!-- icon -->
-    <div
-      role="img"
-      class="dark:brightness-90 inline-block w-12 h-12 text-center rounded-circle bg-amber-500"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="currentColor"
-        class="scale-50 leading-none text-lg relative fill-white"
-      >
-        <path
-          fill-rule="evenodd"
-          d="M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z"
+          d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm13.36-1.814a.75.75 0 1 0-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 0 0-1.06 1.06l2.25 2.25a.75.75 0 0 0 1.14-.094l3.75-5.25Z"
           clip-rule="evenodd"
         />
       </svg>
@@ -235,28 +73,8 @@
         value: "{{ plugin['description'] or ''}}",
         type: "text",
       },
-      count_url: {
-        el: document.querySelector("[data-count-url]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_ip: {
-        el: document.querySelector("[data-count-ip]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_rdns: {
-        el: document.querySelector("[data-count-rdns]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_asn: {
-        el: document.querySelector("[data-count-asn]"),
-        value: "unknown",
-        type: "text",
-      },
-      count_user_agent: {
-        el: document.querySelector("[data-count-user-agent]"),
+      counter_passed_whitelist: {
+        el: document.querySelector("[data-count]"),
         value: "unknown",
         type: "text",
       },
diff --git a/src/ui/main.py b/src/ui/main.py
index 641a6be65..5bef5ef59 100755
--- a/src/ui/main.py
+++ b/src/ui/main.py
@@ -1317,11 +1317,11 @@ def custom_plugin(plugin: str):
         # Try to get the custom plugin custom function and call it
         method = getattr(actions, plugin)
         if request.args:
-            res = method(**request.args.to_dict())
+            res = method(app=app, args=request.args.to_dict())
         elif request.is_json:
-            res = method(**request.json)
+            res = method(app=app, args=request.json)
         else:
-            res = method()
+            res = method(app=app)
     except AttributeError:
         message = f'The plugin "{plugin}" does not have a "{plugin}" method, see logs for more details'
         error = 404
diff --git a/src/ui/src/Instances.py b/src/ui/src/Instances.py
index 07db38cc0..0132b4b7d 100644
--- a/src/ui/src/Instances.py
+++ b/src/ui/src/Instances.py
@@ -375,7 +375,10 @@ class Instances:
         # Get metrics from all instances
         metrics = {}
         for instance in self.get_instances():
-            resp, instance_metrics = instance.metrics(plugin_id)
+            try:
+                resp, instance_metrics = instance.metrics(plugin_id)
+            except:
+                continue
 
             # filters
             if not resp:
@@ -419,5 +422,4 @@ class Instances:
                         if isinstance(v, str):
                             metrics[key][k] = v
                             continue
-
         return metrics