修复:保留监控缺测语义、采样日期与磁盘字段名称
This commit is contained in:
1 parent
520c0894c2
commit
6a07904ca0
7 files changed
+726
-71
No files matched your search
@@ -43,6 +43,7 @@ import FlowPacketPanel from "~/components/instance/FlowPacketPanel.vue";
|
||||
import InstanceStatusTag from "~/components/instance/InstanceStatusTag.vue";
|
||||
import InstanceTraffic from "~/components/instance/InstanceTraffic.vue";
|
||||
import { n as finance_resource_chart_n } from "~/lib/finance-resource-chart.js";
|
||||
import { t as finance_resource_chart_t } from "~/lib/finance-resource-chart.js";
|
||||
var le = defineAsyncComponent(() =>
|
||||
loadModule(
|
||||
() => import("~/components/ChartBox.vue").then((e) => e.default || e),
|
||||
@@ -293,13 +294,8 @@ var le = defineAsyncComponent(() =>
|
||||
),
|
||||
K = 0,
|
||||
q = !1;
|
||||
function J(e) {
|
||||
if (typeof e != `number` && (typeof e != `string` || !e.trim()))
|
||||
return null;
|
||||
let t = Number(e);
|
||||
return Number.isFinite(t) ? t : null;
|
||||
}
|
||||
let xt = (e) => (e.status === `fulfilled` ? e.value : null),
|
||||
let J = finance_resource_chart_t,
|
||||
xt = (e) => (e.status === `fulfilled` ? e.value : null),
|
||||
St = (e) => (e instanceof Error ? e.message : `网络监控加载失败`);
|
||||
async function Y() {
|
||||
// 不同模块的监控时间单位和返回结构不同,分支完成协议转换;实例切换后拒绝旧响应。
|
||||
@@ -374,7 +370,7 @@ var le = defineAsyncComponent(() =>
|
||||
(e) => {
|
||||
H.value = {
|
||||
labels: (e?.list?.[0] ?? []).map((e) =>
|
||||
String(e.time ?? ``).slice(11, 16),
|
||||
String(e.time ?? ``),
|
||||
),
|
||||
unit: e?.unit?.trim() || ``,
|
||||
series: (e?.list ?? []).map((t, n) => ({
|
||||
@@ -474,8 +470,11 @@ var le = defineAsyncComponent(() =>
|
||||
: 0;
|
||||
H.value = {
|
||||
labels: t.map((e) => {
|
||||
let t = new Date(e.time * 1e3);
|
||||
return `${String(t.getHours()).padStart(2, `0`)}:${String(t.getMinutes()).padStart(2, `0`)}`;
|
||||
let t = J(e.time);
|
||||
return t !== null &&
|
||||
Number.isFinite(new Date(t * 1e3).getTime())
|
||||
? dict_r(t)
|
||||
: ``;
|
||||
}),
|
||||
unit: [`bps`, `Kbps`, `Mbps`, `Gbps`, `Tbps`][i],
|
||||
series: n.map((e, t) => ({
|
||||
@@ -498,32 +497,34 @@ var le = defineAsyncComponent(() =>
|
||||
]);
|
||||
if (!r()) return;
|
||||
let n = xt(e);
|
||||
z.value = n?.cpu?.[0]?.value ?? [];
|
||||
z.value = (n?.cpu?.[0]?.value ?? []).map(J);
|
||||
let i = n?.memory?.find((e) => !/free/i.test(e.name)),
|
||||
a = n?.memory?.find((e) => /free/i.test(e.name));
|
||||
((B.value =
|
||||
i && a
|
||||
? i.value.map((e, t) => {
|
||||
let n = Number(a.value?.[t] ?? 0);
|
||||
return e > 0
|
||||
? Math.max(0, Math.min(100, ((e - n) / e) * 100))
|
||||
: 0;
|
||||
let n = J(a.value?.[t]),
|
||||
r = J(e);
|
||||
return r !== null && r > 0 && n !== null
|
||||
? Math.max(0, Math.min(100, ((r - n) / r) * 100))
|
||||
: null;
|
||||
})
|
||||
: []),
|
||||
e.status === `rejected`
|
||||
? (W.value = St(e.reason))
|
||||
: (H.value = {
|
||||
labels: (n?.sample_info ?? []).map((e) =>
|
||||
String(e.timestamp ?? ``).slice(11, 16),
|
||||
String(e.timestamp ?? ``),
|
||||
),
|
||||
unit: `Mbps`,
|
||||
series: (n?.bandwidth ?? []).map((e, t) => ({
|
||||
name: e.title || e.name || `带宽系列 ${t + 1}`,
|
||||
data: (e.value ?? []).map((e) =>
|
||||
typeof e == `number` && Number.isFinite(e)
|
||||
? Number((e / 1e3).toFixed(2))
|
||||
: null,
|
||||
),
|
||||
data: (e.value ?? []).map((e) => {
|
||||
let t = J(e);
|
||||
return t === null
|
||||
? null
|
||||
: Number((t / 1e3).toFixed(2));
|
||||
}),
|
||||
})),
|
||||
}));
|
||||
}
|
||||
@@ -546,23 +547,19 @@ var le = defineAsyncComponent(() =>
|
||||
x.module === `jy_cloud` || x.module === `jy_dcim`
|
||||
? (J(R.value?.cpu_usage) ?? z.value.at(-1) ?? null)
|
||||
: x.module === `mf_cloud` || x.module === `remf_cloud`
|
||||
? X(R.value?.cpu_usage)
|
||||
? J(R.value?.cpu_usage)
|
||||
: z.value.length
|
||||
? z.value[z.value.length - 1]
|
||||
: x.module === `remf_finance`
|
||||
? null
|
||||
: 0,
|
||||
: null,
|
||||
),
|
||||
wt = computed(() =>
|
||||
x.module === `jy_cloud` || x.module === `jy_dcim`
|
||||
? (J(R.value?.memory_usage) ?? B.value.at(-1) ?? null)
|
||||
: x.module === `mf_cloud` || x.module === `remf_cloud`
|
||||
? X(R.value?.memory_usage)
|
||||
? J(R.value?.memory_usage)
|
||||
: B.value.length
|
||||
? B.value[B.value.length - 1]
|
||||
: x.module === `remf_finance`
|
||||
? null
|
||||
: 0,
|
||||
: null,
|
||||
);
|
||||
function Tt(e) {
|
||||
// CPU/内存趋势以百分比绘制;null 表示缺测,禁止连接缺失点伪造连续数据。
|
||||
|
||||
Reference in new issue
Block a user