From ff439bb83153f11573ee9f7e20a9ff447c07a313 Mon Sep 17 00:00:00 2001
From: CN-JS-HuiBai <huyang@littlediary.cn>
Date: Mon, 6 Apr 2026 15:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8DBUSY=20SYSTEM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/app.js             | 1 +
 server/prometheus-service.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/public/js/app.js b/public/js/app.js
index 1c2fbdc..aa45588 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -1340,6 +1340,7 @@
     const cpuValueHtml = `
         <div style="display: flex; align-items: baseline; gap: 8px;">
             <span style="font-weight: 700; font-size: 1.1rem;">${formatPercent(data.cpuBusy)}</span>
+            <span style="font-size: 0.7rem; color: var(--text-secondary); font-weight: normal;">(IO Wait: ${data.cpuIowait.toFixed(1)}%, Busy Others: ${data.cpuOther.toFixed(1)}%)</span>
         </div>
     `;
     // Define metrics to show
diff --git a/server/prometheus-service.js b/server/prometheus-service.js
index 3ff45e3..49f12fe 100644
--- a/server/prometheus-service.js
+++ b/server/prometheus-service.js
@@ -549,6 +549,8 @@ async function getServerDetails(baseUrl, instance, job) {
   
   // Queries based on the requested dashboard structure
   const queries = {
+    cpuIowait: `avg(rate(node_cpu_seconds_total{mode="iowait", instance="${node}"}[1m])) * 100`,
+    cpuOther: `avg(rate(node_cpu_seconds_total{mode=~"nice|steal|guest|guest_nice", instance="${node}"}[1m])) * 100`,
     cpuBusy: `100 * (1 - avg(rate(node_cpu_seconds_total{mode="idle", instance="${node}"}[1m])))`,
     sysLoad: `node_load1{instance="${node}",job="${job}"} * 100 / count(count(node_cpu_seconds_total{instance="${node}",job="${job}"}) by (cpu))`,
     memUsedPct: `(1 - (node_memory_MemAvailable_bytes{instance="${node}", job="${job}"} / node_memory_MemTotal_bytes{instance="${node}", job="${job}"})) * 100`,