mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 00:13:12 +09:00
Add startedAtMs to all processes
This commit is contained in:
12 files changed
+118
-9
No files matched your search
@@ -8,7 +8,7 @@ import PluginExtra from "./PluginExtra";
|
||||
import LogConsole, { SelectMaxLogLevel } from "./LogConsole";
|
||||
import {
|
||||
MetricCpuRatio, MetricCpuUsed, MetricMemoryRatio, MetricMemoryUsed,
|
||||
MetricDiskUsed, MetricDiskRatio,
|
||||
MetricDiskUsed, MetricDiskRatio, MetricRelativeDate,
|
||||
} from "./system_metrics";
|
||||
import { useAccount } from "../model/account";
|
||||
import { useSystems } from "../model/system";
|
||||
@@ -101,6 +101,12 @@ export default function ControllerPage() {
|
||||
<Descriptions.Item label="Node.js">{system?.node}</Descriptions.Item>
|
||||
<Descriptions.Item label="OS Kernel">{system?.kernel}</Descriptions.Item>
|
||||
<Descriptions.Item label="Machine">{system?.machine}</Descriptions.Item>
|
||||
<Descriptions.Item label="System Uptime">
|
||||
<MetricRelativeDate timeMs={system?.systemStartedAtMs}/>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Process Uptime">
|
||||
<MetricRelativeDate timeMs={system?.processStartedAtMs}/>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Hostname" span={2}>{system?.hostname}</Descriptions.Item>
|
||||
<Descriptions.Item label="CPU Model" span={2}>{system?.cpuModel}</Descriptions.Item>
|
||||
<Descriptions.Item label="CPU Usage"><MetricCpuRatio system={system} /></Descriptions.Item>
|
||||
|
||||
@@ -17,7 +17,7 @@ import PageLayout from "./PageLayout";
|
||||
import PluginExtra from "./PluginExtra";
|
||||
import {
|
||||
MetricCpuRatio, MetricCpuUsed, MetricMemoryRatio, MetricMemoryUsed,
|
||||
MetricDiskUsed, MetricDiskRatio,
|
||||
MetricDiskUsed, MetricDiskRatio, MetricRelativeDate,
|
||||
} from "./system_metrics";
|
||||
import { formatTimestamp } from "../util/time_format";
|
||||
import { useSystems } from "../model/system";
|
||||
@@ -147,8 +147,14 @@ export default function HostViewPage() {
|
||||
<Descriptions.Item label="Node.js">{system?.node}</Descriptions.Item>
|
||||
<Descriptions.Item label="OS Kernel">{system?.kernel}</Descriptions.Item>
|
||||
<Descriptions.Item label="Machine">{system?.machine}</Descriptions.Item>
|
||||
<Descriptions.Item label="Hostname" span={2}>{system?.hostname}</Descriptions.Item>
|
||||
<Descriptions.Item label="Connected From" span={2}>{host.remoteAddress}</Descriptions.Item>
|
||||
<Descriptions.Item label="System Uptime">
|
||||
<MetricRelativeDate timeMs={system?.systemStartedAtMs}/>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Process Uptime">
|
||||
<MetricRelativeDate timeMs={system?.processStartedAtMs}/>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Hostname">{system?.hostname}</Descriptions.Item>
|
||||
<Descriptions.Item label="Connected From">{host.remoteAddress}</Descriptions.Item>
|
||||
<Descriptions.Item label="CPU Model" span={2}>{system?.cpuModel}</Descriptions.Item>
|
||||
<Descriptions.Item label="CPU Usage"><MetricCpuRatio system={system} /></Descriptions.Item>
|
||||
<Descriptions.Item label="Cores"><MetricCpuUsed system={system} /></Descriptions.Item>
|
||||
|
||||
@@ -25,6 +25,7 @@ import { useHost } from "../model/host";
|
||||
import InstanceStatusTag from "./InstanceStatusTag";
|
||||
import Link from "./Link";
|
||||
import { instancePublicAddress } from "../util/instance";
|
||||
import { MetricRelativeDate } from "./system_metrics";
|
||||
|
||||
type MenuItem = Required<MenuProps>["items"][number];
|
||||
const { Title } = Typography;
|
||||
@@ -41,6 +42,7 @@ function InstanceDescription(props: InstanceDescriptionProps) {
|
||||
return <Descriptions
|
||||
bordered
|
||||
size="small"
|
||||
column={{ xs: 1, md: 2, lg: 2, xl: 2, xxl: 2 }}
|
||||
>
|
||||
<Descriptions.Item label="Host">
|
||||
{!assigned
|
||||
@@ -64,7 +66,12 @@ function InstanceDescription(props: InstanceDescriptionProps) {
|
||||
<Descriptions.Item label="Version">
|
||||
{instance.factorioVersion ?? "unknown"}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Status"><InstanceStatusTag status={instance.status!} /></Descriptions.Item>
|
||||
<Descriptions.Item label="Status">
|
||||
<InstanceStatusTag status={instance.status!} />
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Start Time">
|
||||
<MetricRelativeDate timeMs={instance.startedAtMs}/>
|
||||
</Descriptions.Item>
|
||||
</Descriptions>;
|
||||
}
|
||||
|
||||
|
||||
@@ -63,3 +63,52 @@ export function RestartRequired(props: { system?: lib.SystemInfo }) {
|
||||
<ReloadOutlined style={{ color: "yellow" }}/>
|
||||
</Tooltip>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a human-readable duration between two dates.
|
||||
*
|
||||
* The output includes up to two most significant time units and omits
|
||||
* leading zero units. Supported units are weeks, days, hours, minutes,
|
||||
* and seconds.
|
||||
*
|
||||
* Examples: "1w 2d", "2d 3h", "1h 2m", "45s"
|
||||
*
|
||||
* @param date1 - The starting date.
|
||||
* @param date2 - The ending date.
|
||||
* @returns A duration string (e.g. "2d 3h").
|
||||
*/
|
||||
function humanAbsTimeDiff(date1: number, date2 = 0) {
|
||||
let diffMs = Math.abs(date2 - date1);
|
||||
const totalSeconds = Math.floor(diffMs / 1000);
|
||||
|
||||
const weeks = Math.floor(totalSeconds / 604800); // 7 * 24 * 60 * 60
|
||||
const days = Math.floor((totalSeconds % 604800) / 86400);
|
||||
const hours = Math.floor((totalSeconds % 86400) / 3600);
|
||||
const minutes = Math.floor((totalSeconds % 3600) / 60);
|
||||
const seconds = totalSeconds % 60;
|
||||
|
||||
if (weeks > 0) {
|
||||
return days > 0 ? `${weeks}w ${days}d` : `${weeks}w`;
|
||||
}
|
||||
|
||||
if (days > 0) {
|
||||
return hours > 0 ? `${days}d ${hours}h` : `${days}d`;
|
||||
}
|
||||
|
||||
if (hours > 0) {
|
||||
return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`;
|
||||
}
|
||||
|
||||
if (minutes > 0) {
|
||||
return seconds > 0 ? `${minutes}m ${seconds}s` : `${minutes}m`;
|
||||
}
|
||||
|
||||
return `${seconds}s`;
|
||||
}
|
||||
|
||||
export function MetricRelativeDate(props: { timeMs?: number }) {
|
||||
if (!props.timeMs || props.timeMs === 0) {
|
||||
return "N/A";
|
||||
}
|
||||
return `${new Date(props.timeMs).toLocaleString()} (${humanAbsTimeDiff(props.timeMs, Date.now())})`;
|
||||
}
|
||||
Reference in new issue
Block a user