- | {formatTime(t)} |
+ {formatSampleTime(t)} |
{data.series.map((s, j) => {
const v = s.values[i]
return {v === null ? "–" : format(v)} |
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.test.tsx
index 13cbe933d..bb76edb5a 100644
--- a/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.test.tsx
+++ b/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.test.tsx
@@ -13,11 +13,11 @@ vi.mock("uplot", () => ({
created.push({ opts, data, destroy: this.destroy })
}
setSize() {}
- static fmtDate = () => (d: Date) => d.toISOString()
},
}))
const { TimeSeriesChart } = await import("./TimeSeriesChart.tsx")
+const { formatSampleTime } = await import("../../lib/observability/metrics.ts")
beforeEach(() => {
created.length = 0
@@ -56,7 +56,7 @@ describe("TimeSeriesChart", () => {
const time = created[0].opts.series[0].value!
expect(time(null, null, 0, null)).toBe("latest")
- expect(time(null, 2, 0, 1)).toBe(new Date(2000).toISOString())
+ expect(time(null, 2, 0, 1)).toBe(formatSampleTime(2))
})
it("destroys the chart on unmount", () => {
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.tsx b/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.tsx
index 063b42b12..607d44593 100644
--- a/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.tsx
+++ b/packages/system/dashboard/images/console/apps/console/src/components/observability/TimeSeriesChart.tsx
@@ -1,7 +1,7 @@
import { useEffect, useRef } from "react"
import uPlot from "uplot"
import "uplot/dist/uPlot.min.css"
-import type { ChartData } from "../../lib/observability/metrics.ts"
+import { formatSampleTime, type ChartData } from "../../lib/observability/metrics.ts"
const COLORS = ["#2563eb", "#16a34a", "#d97706", "#9333ea", "#dc2626", "#0891b2", "#4b5563", "#db2777"]
const HEIGHT = 200
@@ -19,7 +19,6 @@ export function TimeSeriesChart({ data, format }: TimeSeriesChartProps) {
if (!el) return
const fmt = (v: number | null) => (v === null ? "–" : format(v))
const latest = data.series.map((s) => s.values.findLast((v) => v !== null) ?? null)
- const stamp = uPlot.fmtDate("{M}/{D}/{YY} {h}:{mm}:{ss} {AA}")
const chart = new uPlot(
{
width: el.clientWidth || 600,
@@ -27,7 +26,7 @@ export function TimeSeriesChart({ data, format }: TimeSeriesChartProps) {
scales: { x: { time: true } },
legend: { live: true },
series: [
- { value: (_: uPlot, v: number | null, _sidx: number, idx: number | null) => (idx === null || v === null ? "latest" : stamp(new Date(v * 1000))) },
+ { value: (_: uPlot, v: number | null, _sidx: number, idx: number | null) => (idx === null || v === null ? "latest" : formatSampleTime(v)) },
...data.series.map((s, i) => ({
label: s.label,
stroke: COLORS[i % COLORS.length],
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/observability/metrics.ts b/packages/system/dashboard/images/console/apps/console/src/lib/observability/metrics.ts
index d7182b8d6..2f77e251f 100644
--- a/packages/system/dashboard/images/console/apps/console/src/lib/observability/metrics.ts
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/observability/metrics.ts
@@ -93,6 +93,10 @@ export const METRIC_PANELS: MetricPanel[] = [
},
]
+export function formatSampleTime(seconds: number): string {
+ return new Date(seconds * 1000).toLocaleString([], { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", second: "2-digit" })
+}
+
export interface ChartSeries {
label: string
values: (number | null)[]