From 500c0f9f7d9c9627618fae7a7e1f4424af10a39b Mon Sep 17 00:00:00 2001
From: makotocc0107 <1424018999@qq.com>
Date: Fri, 30 Aug 2024 09:44:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=A2=9E=E6=B7=BB]=E6=B7=BB=E5=8A=A0=E4=BA=86?=
=?UTF-8?q?CPU=E6=A0=B8=E5=BF=83=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BAstat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 45 ++++++++++++-------
.../app/Filament/Widgets/CPUStatus.php | 4 +-
.../app/Filament/Widgets/SystemStats.php | 22 +++++++--
3 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e9a40ca..daf617f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,9 @@
-
+
+
@@ -195,20 +196,20 @@
- {
+ "keyToString": {
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "master",
+ "last_opened_file_path": "E:/data-collection-terminal",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "php.override.implement.member.chooser.php.doc": "NONE",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -259,7 +260,8 @@
-
+
+
@@ -405,7 +407,15 @@
1724899660126
-
+
+
+ 1724913340798
+
+
+
+ 1724913340798
+
+
@@ -469,6 +479,7 @@
-
+
+
\ No newline at end of file
diff --git a/management-panel/app/Filament/Widgets/CPUStatus.php b/management-panel/app/Filament/Widgets/CPUStatus.php
index c7b5d90..1fbac44 100644
--- a/management-panel/app/Filament/Widgets/CPUStatus.php
+++ b/management-panel/app/Filament/Widgets/CPUStatus.php
@@ -39,8 +39,8 @@ class CPUStatus extends ChartWidget
[
'label' => 'CPU 占用情况',
'data' => $data,
- 'backgroundColor' => ['#FBD1B7', '#E0F5B9'], // 柔和颜色
- 'borderColor' => ['#FBD1B7', '#E0F5B9'], // 边框颜色
+ 'backgroundColor' => ['#FF8080', '#E0F5B9'], // 柔和颜色
+ 'borderColor' => ['#FF8080', '#E0F5B9'], // 边框颜色
'borderWidth' => 1, // 边框宽度
],
],
diff --git a/management-panel/app/Filament/Widgets/SystemStats.php b/management-panel/app/Filament/Widgets/SystemStats.php
index 36eca7d..453889c 100644
--- a/management-panel/app/Filament/Widgets/SystemStats.php
+++ b/management-panel/app/Filament/Widgets/SystemStats.php
@@ -43,6 +43,8 @@ class SystemStats extends BaseWidget
$diskUsed = $diskTotal - $diskFree;
$diskDisplay = round($diskUsed / (1024 * 1024 * 1024), 2) . ' GB / ' . round($diskTotal / (1024 * 1024 * 1024), 2) . ' GB';
+ // 注释掉网络流量部分
+ /*
// 获取网络上下行流量
$networkTransmitQuery = 'rate(node_network_transmit_bytes_total[1m])';
$networkTransmitResult = $prometheus->query($networkTransmitQuery);
@@ -57,14 +59,28 @@ class SystemStats extends BaseWidget
}, $networkReceiveResult['data']['result'])) / (1024 * 1024), 2);
$networkDisplay = "上传: {$networkTransmit} MB/s\n下载: {$networkReceive} MB/s";
+ */
+
+ // 获取系统启动时间
+ $uptimeQuery = 'node_boot_time_seconds';
+ $uptimeResult = $prometheus->query($uptimeQuery);
+ $bootTime = $uptimeResult['data']['result'][0]['value'][1] ?? 0;
+ $uptime = now()->timestamp - $bootTime;
+ $uptimeDisplay = gmdate('H:i:s', $uptime);
+
+ // 获取CPU核心数量
+ $cpuCoresQuery = 'count(node_cpu_seconds_total{mode="system"})';
+ $cpuCoresResult = $prometheus->query($cpuCoresQuery);
+ $cpuCores = $cpuCoresResult['data']['result'][0]['value'][1] ?? 0;
+
+
return [
BaseWidget\Stat::make('内存占用', $memoryDisplay),
BaseWidget\Stat::make('硬盘占用', $diskDisplay),
- BaseWidget\Stat::make('网络流量', $networkDisplay),
+ BaseWidget\Stat::make('系统运行时间', $uptimeDisplay),
+ BaseWidget\Stat::make('CPU核心数量', $cpuCores)
];
-
-
}
protected function getPollingInterval(): ?string