-
Notifications
You must be signed in to change notification settings - Fork 2
feat(ui): Build the dashboard view over container and serving metrics #87
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| import { describe, it, expect, vi, beforeEach } from "vitest"; | ||
| import { mount, flushPromises } from "@vue/test-utils"; | ||
| import PanelCard from "./PanelCard.vue"; | ||
| import { servingApi } from "@/services/api"; | ||
| import { observabilityApi } from "@/services/observability"; | ||
|
|
||
| vi.mock("@/services/api", () => ({ | ||
| servingApi: { series: vi.fn() }, | ||
| })); | ||
| vi.mock("@/services/observability", () => ({ | ||
| observabilityApi: { timeseries: vi.fn() }, | ||
| })); | ||
|
|
||
| // Stub the canvas chart; the test only checks the data handed to it. | ||
| const TimeSeriesChartStub = { | ||
| name: "TimeSeriesChart", | ||
| props: ["containers", "timestamps", "values", "unit", "area"], | ||
| template: "<div class='chart-stub' />", | ||
| }; | ||
|
|
||
| const mountPanel = (panel: any) => | ||
| mount(PanelCard, { | ||
| props: { panel, since: "1h" }, | ||
| global: { stubs: { TimeSeriesChart: TimeSeriesChartStub, Icon: true } }, | ||
| }); | ||
|
|
||
| describe("PanelCard", () => { | ||
| beforeEach(() => vi.clearAllMocks()); | ||
|
|
||
| it("adapts serving RED points into the chart's series shape", async () => { | ||
| vi.mocked(servingApi.series).mockResolvedValue({ | ||
| data: { | ||
| deployment: "shop", | ||
| since: "1h", | ||
| points: [ | ||
| { time: "2026-07-17T10:00:00Z", requests: 10, errors: 1, avg_time_ms: 40, p95_time_ms: 80 }, | ||
| { time: "2026-07-17T10:01:00Z", requests: 20, errors: 0, avg_time_ms: 55, p95_time_ms: 90 }, | ||
| ], | ||
| }, | ||
| } as any); | ||
|
|
||
| const wrapper = mountPanel({ | ||
| title: "Requests", | ||
| source: "serving", | ||
| series: "requests", | ||
| deployment: "shop", | ||
| type: "line", | ||
| width: 6, | ||
| }); | ||
| await flushPromises(); | ||
|
|
||
| expect(servingApi.series).toHaveBeenCalledWith("shop", "1h"); | ||
| const chart = wrapper.findComponent(TimeSeriesChartStub); | ||
| expect(chart.exists()).toBe(true); | ||
| expect(chart.props("containers")).toEqual(["shop"]); | ||
| expect(chart.props("timestamps")).toEqual([ | ||
| Date.parse("2026-07-17T10:00:00Z") / 1000, | ||
| Date.parse("2026-07-17T10:01:00Z") / 1000, | ||
| ]); | ||
| expect(chart.props("values")).toEqual([[10, 20]]); | ||
| expect(chart.props("unit")).toBe("count"); | ||
| }); | ||
|
|
||
| it("selects the latency field and ms unit for a latency panel", async () => { | ||
| vi.mocked(servingApi.series).mockResolvedValue({ | ||
| data: { points: [{ time: "2026-07-17T10:00:00Z", requests: 5, errors: 0, avg_time_ms: 42, p95_time_ms: 90 }] }, | ||
| } as any); | ||
|
|
||
| const wrapper = mountPanel({ | ||
| title: "Latency", | ||
| source: "serving", | ||
| series: "latency", | ||
| deployment: "shop", | ||
| type: "line", | ||
| width: 6, | ||
| }); | ||
| await flushPromises(); | ||
|
|
||
| const chart = wrapper.findComponent(TimeSeriesChartStub); | ||
| expect(chart.props("values")).toEqual([[42]]); | ||
| expect(chart.props("unit")).toBe("ms"); | ||
| }); | ||
|
|
||
| it("pulls the named metric series out of a container timeseries response", async () => { | ||
| vi.mocked(observabilityApi.timeseries).mockResolvedValue({ | ||
| data: { | ||
| metrics: { | ||
| "container.cpu.usage": { containers: ["shop-web"], timestamps: [1, 2], values: [[3.5, 4.0]] }, | ||
| }, | ||
| }, | ||
| } as any); | ||
|
|
||
| const wrapper = mountPanel({ | ||
| title: "CPU", | ||
| source: "container", | ||
| series: "container.cpu.usage", | ||
| deployment: "shop", | ||
| type: "line", | ||
| width: 6, | ||
| }); | ||
| await flushPromises(); | ||
|
|
||
| expect(observabilityApi.timeseries).toHaveBeenCalledWith("shop", "1h"); | ||
| const chart = wrapper.findComponent(TimeSeriesChartStub); | ||
| expect(chart.props("values")).toEqual([[3.5, 4.0]]); | ||
| expect(chart.props("unit")).toBe("percent"); | ||
| }); | ||
|
|
||
| it("shows the latest value as a stat", async () => { | ||
| vi.mocked(observabilityApi.timeseries).mockResolvedValue({ | ||
| data: { | ||
| metrics: { | ||
| "container.cpu.usage": { containers: ["shop-web"], timestamps: [1, 2], values: [[3.5, 7.25]] }, | ||
| }, | ||
| }, | ||
| } as any); | ||
|
|
||
| const wrapper = mountPanel({ | ||
| title: "CPU now", | ||
| source: "container", | ||
| series: "container.cpu.usage", | ||
| deployment: "shop", | ||
| type: "stat", | ||
| width: 3, | ||
| }); | ||
| await flushPromises(); | ||
|
|
||
| expect(wrapper.find(".stat-value").text()).toBe("7.3%"); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| <template> | ||
| <div class="panel-card" :style="{ gridColumn: `span ${clampWidth(panel.width)}` }"> | ||
| <div class="panel-head"> | ||
| <span class="panel-title">{{ panel.title }}</span> | ||
| <span class="panel-scope">{{ panel.deployment || "all deployments" }}</span> | ||
| <div v-if="editable" class="panel-actions"> | ||
| <button class="icon-btn" title="Edit panel" @click="emit('edit')"><Icon name="pencil" :size="14" /></button> | ||
| <button class="icon-btn" title="Remove panel" @click="emit('remove')"> | ||
| <Icon name="trash-2" :size="14" /> | ||
| </button> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="panel-body"> | ||
| <div v-if="loading" class="panel-msg">Loading</div> | ||
| <div v-else-if="error" class="panel-msg error">{{ error }}</div> | ||
| <template v-else-if="panel.type === 'stat'"> | ||
| <div class="stat-value">{{ statDisplay }}</div> | ||
| <div class="stat-sub">{{ seriesLabel }}</div> | ||
| </template> | ||
| <TimeSeriesChart | ||
| v-else-if="series && series.timestamps.length" | ||
| :containers="series.containers" | ||
| :timestamps="series.timestamps" | ||
| :values="series.values" | ||
| :unit="unit" | ||
| area | ||
| /> | ||
| <div v-else class="panel-msg">No data in this range</div> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { ref, computed, watch } from "vue"; | ||
| import Icon from "@/components/base/Icon.vue"; | ||
| import TimeSeriesChart from "@/components/charts/TimeSeriesChart.vue"; | ||
| import { observabilityApi, type MetricSeries } from "@/services/observability"; | ||
| import { servingApi, type DashboardPanel } from "@/services/api"; | ||
|
|
||
| const props = defineProps<{ | ||
| panel: DashboardPanel; | ||
| since: string; | ||
| editable?: boolean; | ||
| }>(); | ||
|
|
||
| const emit = defineEmits<{ edit: []; remove: [] }>(); | ||
|
|
||
| const loading = ref(false); | ||
| const error = ref(""); | ||
| const series = ref<MetricSeries | null>(null); | ||
|
|
||
| const unit = computed<"percent" | "bytes" | "ms" | "count">(() => { | ||
| if (props.panel.source === "serving") return props.panel.series === "latency" ? "ms" : "count"; | ||
| if (props.panel.series.startsWith("container.cpu")) return "percent"; | ||
| if (props.panel.series.startsWith("container.memory")) return "bytes"; | ||
| if (props.panel.series.startsWith("container.network")) return "bytes"; | ||
| return "count"; | ||
| }); | ||
|
|
||
| const seriesLabel = computed(() => { | ||
| if (props.panel.source === "serving") return `serving · ${props.panel.series}`; | ||
| return props.panel.series.replace("container.", ""); | ||
| }); | ||
|
|
||
| // The stat panel shows the most recent value across containers. | ||
| const statDisplay = computed(() => { | ||
| if (!series.value) return "-"; | ||
| let latest: number | null = null; | ||
| for (const row of series.value.values) { | ||
| for (let i = row.length - 1; i >= 0; i--) { | ||
| if (row[i] != null) { | ||
| latest = (latest ?? 0) + (row[i] as number); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| if (latest == null) return "-"; | ||
| return formatStat(latest, unit.value); | ||
| }); | ||
|
|
||
| function formatStat(v: number, u: string): string { | ||
| if (u === "percent") return `${v.toFixed(1)}%`; | ||
| if (u === "ms") return v >= 1000 ? `${(v / 1000).toFixed(2)}s` : `${v.toFixed(0)}ms`; | ||
| if (u === "bytes") { | ||
| if (v >= 1 << 30) return `${(v / (1 << 30)).toFixed(1)}G`; | ||
| if (v >= 1 << 20) return `${(v / (1 << 20)).toFixed(0)}M`; | ||
| if (v >= 1 << 10) return `${(v / (1 << 10)).toFixed(0)}K`; | ||
| return `${v}B`; | ||
| } | ||
| return v >= 1000 ? `${(v / 1000).toFixed(1)}k` : `${Math.round(v)}`; | ||
| } | ||
|
|
||
| function clampWidth(w: number): number { | ||
| if (!w || w < 1) return 6; | ||
| return Math.min(12, w); | ||
| } | ||
|
|
||
| async function load() { | ||
| loading.value = true; | ||
| error.value = ""; | ||
| try { | ||
| if (props.panel.source === "serving") { | ||
| if (!props.panel.deployment) { | ||
| error.value = "No deployment set"; | ||
| return; | ||
| } | ||
| const { data } = await servingApi.series(props.panel.deployment, props.since); | ||
| const points = data.points || []; | ||
| const field = props.panel.series; | ||
| series.value = { | ||
| containers: [props.panel.deployment], | ||
| timestamps: points.map((p) => Math.floor(Date.parse(p.time) / 1000)), | ||
| values: [points.map((p) => (field === "errors" ? p.errors : field === "latency" ? p.avg_time_ms : p.requests))], | ||
| }; | ||
| } else { | ||
| const { data } = await observabilityApi.timeseries(props.panel.deployment || "", props.since); | ||
| series.value = data.metrics?.[props.panel.series] ?? { containers: [], timestamps: [], values: [] }; | ||
| } | ||
| } catch (e: any) { | ||
| error.value = e.response?.data?.error || e.message || "Failed to load"; | ||
| } finally { | ||
| loading.value = false; | ||
| } | ||
| } | ||
|
|
||
| watch(() => [props.panel.source, props.panel.series, props.panel.deployment, props.since], load, { immediate: true }); | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| .panel-card { | ||
| display: flex; | ||
| flex-direction: column; | ||
| background: var(--surface-raised); | ||
| border: 1px solid var(--border); | ||
| border-radius: var(--radius-lg); | ||
| min-height: 200px; | ||
| overflow: hidden; | ||
| } | ||
| .panel-head { | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 0.5rem; | ||
| padding: 0.75rem 1rem; | ||
| border-bottom: 1px solid var(--border-subtle); | ||
| } | ||
| .panel-title { | ||
| font-weight: 600; | ||
| font-size: 0.9rem; | ||
| } | ||
| .panel-scope { | ||
| font-size: 0.75rem; | ||
| color: var(--text-muted); | ||
| margin-left: auto; | ||
| } | ||
| .panel-actions { | ||
| display: flex; | ||
| gap: 0.25rem; | ||
| } | ||
| .icon-btn { | ||
| display: inline-flex; | ||
| padding: 0.25rem; | ||
| border: none; | ||
| background: transparent; | ||
| color: var(--text-muted); | ||
| cursor: pointer; | ||
| border-radius: var(--radius-sm); | ||
| } | ||
| .icon-btn:hover { | ||
| color: var(--text); | ||
| background: var(--surface-inset); | ||
| } | ||
| .panel-body { | ||
| flex: 1; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| padding: 1rem; | ||
| min-height: 140px; | ||
| } | ||
| .panel-msg { | ||
| color: var(--text-muted); | ||
| font-size: 0.85rem; | ||
| text-align: center; | ||
| } | ||
| .panel-msg.error { | ||
| color: var(--danger, #ef4444); | ||
| } | ||
| .stat-value { | ||
| font-size: 2.25rem; | ||
| font-weight: 700; | ||
| line-height: 1.1; | ||
| } | ||
| .stat-sub { | ||
| margin-top: 0.25rem; | ||
| font-size: 0.8rem; | ||
| color: var(--text-muted); | ||
| } | ||
| </style> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using bitwise operators like
1 << 30in JavaScript is limited to 32-bit signed integers. While this works for values up to ~2GB, memory metrics for large containers or node-level aggregates can exceed this range. It's safer to use numerical literals. Additionally, adding 'B' to the unit suffixes (e.g., 'GB' instead of 'G') would make the units more explicit and consistent with the base 'B' case.