删除无用的统计数据，需要删除data文件夹

Author: tianxiu2b2t

bmclapi_dashboard/static/js/index.min.js

@@ -2787,8 +2787,8 @@ app.$Menu.add("dashboard", new class {
         this._be_qps = app.createEcharts().style("min-height: 162px;")
         this._pe_qps = app.createEcharts().style("min-height: 162px;")
         this._e_geo = app.createEcharts().style("min-height: 416px;")
-        this._e_cpu = app.createEcharts().style("min-height: 162px;")
-        this._e_memory = app.createEcharts().style("min-height: 162px;")
+        this._e_cpu = app.createEcharts().style("min-height: 162px;").setFormatter((n) => n + "%")
+        this._e_memory = app.createEcharts().style("min-height: 162px;").setFormatter((n) => this._format_bytes(n))
         this._e_connection = app.createEcharts().style("min-height: 162px;")
         this._e_ua = app.createEcharts().setType(EchartType.LABEL).style("min-height: 140px")
         this._e_status = app.createEcharts().setType(EchartType.LABEL).style("min-height: 140px")
@@ -3049,6 +3049,9 @@ app.$Menu.add("dashboard", new class {
                 this._e_status.resize()
                 this._e_geo.resize()
                 this.pgeorank.update(false)
+                this._e_cpu.resize()
+                this._e_memory.resize()
+                this._e_connection.resize()
             })
         ];
         this.initGlobals()
@@ -3278,7 +3281,7 @@ app.$Menu.add("dashboard", new class {
                             global: false,
                             colorStops: [{ offset: 0, color: app.getThemeVar("echarts-main-line-color") }, { offset: 1, color: app.getThemeVar("echarts-dark-color") }]
                         },
-                        type: " solid"
+                        type: "solid"
                     },
                     itemStyle: { borderRadius: [2, 2, 0, 0] },
                     z: 3,
@@ -3382,6 +3385,72 @@ app.$Menu.add("dashboard", new class {
                 data: []
             }]
         })
+        for (let val of [
+            ["cpu", this._e_cpu, ],
+            ["memory", this._e_memory],
+            ["connection", this._e_connection]
+        ]) {
+            val[1].setOption({
+                color: app.getThemeVar("main-color"),
+                yAxis: [
+                    {
+                        type: "value",
+                        show: true,
+                        max: val[0] == "cpu" ? 100 : 1
+                    }
+                ],
+                tooltip: {
+                    trigger: "axis",
+                },
+                xAxis: [
+                    {
+                        type: "category",
+                        show: false,
+                    }
+                ],
+                stateAnimation: {
+                    duration: 300,
+                    easing: "cubicOut"
+                },
+                grid: [
+                    {
+                        top: 15,
+                        bottom: 10,
+                        right: 0,
+                        show: false,
+                        z: 0,
+                        containLabel: false,
+                        backgroundColor: "rgba(0,0,0,0)",
+                        borderWidth: 1,
+                        borderColor: "#ccc"
+                    }
+                ],
+                series: [
+                    {
+                        name: $I18N.t("dashboard.distincts"),
+                        type: "line",
+                        symbol: "none",
+                        data: [],
+                        smooth: true,
+                        lineStyle: {
+                            width: 3,
+                            color: {
+                                type: "linear",
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                global: false,
+                                colorStops: [{ offset: 0, color: app.getThemeVar("echarts-main-line-color") }, { offset: 1, color: app.getThemeVar("echarts-dark-color") }]
+                            },
+                            type: "solid"
+                        },
+                        itemStyle: { borderRadius: [2, 2, 0, 0] },
+                        z: 3,
+                    }
+                ]
+            })
+        }
         this.setRank_UA();
         this.setRank_Status();
         this.globalTimer = app.runTaskRepeat(() => {
@@ -3391,9 +3460,16 @@ app.$Menu.add("dashboard", new class {
                 this.drawGEO()
             })
         }, 0, 360000)
+        /*this.detailSystemTimer = app.runTaskRepeat(() => {
+            $MainSocket.send("system_details").then((data) => {
+                this.detail_system = data
+                this.drawDetailSystem()
+            })
+        }, 0, 1000)*/
     }
     clearPro() {
         this.globalTimer?.block()
+        this.detailSystemTimer?.block()
         this._e_visits.clear()
         this._e_ua.clear()
         this.pgeorank.setData()
@@ -3761,7 +3837,65 @@ app.$Menu.add("dashboard", new class {
         this.basic[0].getChildren()[0].getChildren()[1].getChildren()[0].getChildren()[3].getChildren()[1].setText(this.system.cpu.toFixed(2) + "%")
     }
     drawDetailSystem() {
-
+        this._e_cpu.setOption({
+            color: app.getThemeVar("main-color"),
+            yAxis: {
+                max: Math.max(...Object.values(this.detail_system.cpu), 100)
+            },
+            xAxis: {
+                data: Object.keys(this.detail_system.cpu)
+            },
+            series: [
+                {
+                    name: $I18N.t("dashboard.cpu"),
+                    data: Object.values(this.detail_system.cpu),
+                    type: 'line',
+                    smooth: true,
+                }
+            ]
+        })
+        let memories = Object.values(this.detail_system.memory).filter(v => v != 0)
+        let max = memories.reduce((sum, i) => sum + i, 0)
+        let avg = max / memories.length
+        this._e_memory.setOption({
+            color: app.getThemeVar("main-color"),
+            yAxis: {
+                max: Math.max((avg >= max / 2 ? max : avg * 2) / 1024, 1) * 1024,
+                axisLabel: {
+                    formatter: (value) => {
+                        return this._format_bytes(value)
+                    }
+                }
+            },
+            xAxis: {
+                data: Object.keys(this.detail_system.memory)
+            },
+            series: [
+                {
+                    name: $I18N.t("dashboard.memory"),
+                    data: Object.values(this.detail_system.memory),
+                    type: 'line',
+                    smooth: true,
+                }
+            ]
+        })
+        this._e_connection.setOption({
+            color: app.getThemeVar("main-color"),
+            yAxis: {
+                max: Math.max(...Object.values(this.detail_system.connections).map(v => parseInt(v / 100)), 1) * 100
+            },
+            xAxis: {
+                data: Object.keys(this.detail_system.connections)
+            },
+            series: [
+                {
+                    name: $I18N.t("dashboard.connections"),
+                    data: Object.values(this.detail_system.connections),
+                    type: 'line',
+                    smooth: true,
+                }
+            ]
+        })
     }
     drawGlobals() {
         var visits = (this.data_day_option <= 1 ? fillDateTimes(this.pro_stats.distinct_ip, this.data_day_option == 1 ? 7 : 1) : fillDates(this.pro_stats.distinct_ip))

core/dashboard.py

@@ -123,7 +123,7 @@ async def process(type: str, data: Any):
             k: v for k, v in web.statistics.get_all_qps().items() if k > c - 300
         }
         return {
-            utils.format_time(i): (sum((raw_data.get(i + j, 0) for j in range(5))))
+            utils.format_time(i + -time.timezone): (sum((raw_data.get(i + j, 0) for j in range(5))))
             for i in range(c - 300, c, 5)
         }
     if type == "status":

core/statistics.py

@@ -120,7 +120,6 @@ def init():
         *(status.value for status in Status)
     ):
         addColumns("access_storage", field, "unsigned bigint not null default 0")
-    addColumns("access_storage", "status", "blob not null")
 
     execute("create table if not exists access_globals(hour unsigned bigint not null, addresses blob not null, useragents bigint not null)")
     for q in queryAllData(f"select hour, name, type, hit, bytes, cache_hit, cache_bytes, sync_hit, sync_bytes FROM access_storage"):
@@ -168,7 +167,7 @@ def hit(storage: Storage, file: File, length: int, ip: str, ua: str, status: Sta
     if (storage.get_name() not in storages or storages[storage.get_name()] != hour) and not exists("select hour from access_storage where hour = ? and name = ? and type = ?", 
         hour, storage.get_name(), storage.get_type()
     ):
-        add_execute("insert into access_storage(hour, name, type, status) values (?,?,?,?)", hour, storage.get_name(), storage.get_type(), b'')
+        add_execute("insert into access_storage(hour, name, type) values (?,?,?)", hour, storage.get_name(), storage.get_type())
     storages[storage.get_name()] = hour
     cur_storage = None
     data_storages = get_data_storage()

core/system.py

@@ -1,9 +1,11 @@
 import os
+import time
 
 import psutil
 
 from core import logger, scheduler
-from core.utils import get_uptime
+from core.utils import get_uptime, format_time
+from core.env import env
 
 process: psutil.Process = psutil.Process(os.getpid())
 cpus: dict[float, float] = {}
@@ -42,14 +44,34 @@ def get_cpus():
 
 def get_loads_detail():
     global cpus, memories, connections
-    offset: float = float(os.getenv("STARTUP") or 0)
+    startup: float = env["STARTUP"] + -time.timezone
     return {
-        "cpu": {t + offset: v for t, v in cpus.items()},
-        "memory": {t + offset: v for t, v in memories.items()},
-        "connections": {t + offset: len(v) for t, v in connections.items()},
+        "cpu": {format_time(t + startup): v for t, v in get_filled(cpus.copy()).items()},
+        "memory": {format_time(t + startup): v for t, v in get_filled(memories.copy()).items()},
+        "connections": {format_time(t + startup): len(v) for t, v in get_filled_list(connections).items()},
     }
 
 
+def get_filled(data: dict[float, float]):
+    key = min(list(data.keys()) or [0])
+    for _ in range(60 - len(data)):
+        key -= 1
+        data[key] = 0
+    data = dict(sorted(data.items()))
+    for _ in list(data.keys())[60:]:
+        data.pop(_)
+    return data
+
+def get_filled_list(data: dict[float, list]):
+    key = min(list(data.keys()) or [0])
+    for _ in range(60 - len(data)):
+        key -= 1
+        data[key] = []
+    data = dict(sorted(data.items()))
+    for _ in list(data.keys())[60:]:
+        data.pop(_)
+    return data
+
 def get_used_memory() -> int:
     info = process.memory_full_info()
     return info.uss