Show who is using the cluster and what they are running
The dashboard could say what the cluster was made of and not who was spending it. Usage was per key, which is the right unit for revoking something and the wrong one for the question actually being asked: one person holds a laptop key, a CI key and a notebook key, and adding three rows up by eye is a chore that gets skipped. Per person now, joined through the keys they own, and per model — counted by the model that answered rather than the one requested, since those differ whenever a fallback serves and what actually ran is the question. Headline figures are stat tiles with a sparkline: a single current value is a number, and plotting one is how a chart ends up with a single bar in it. The sparkline says only rising, falling or flat, which is the one thing the number cannot. Ranked horizontal bars, because the labels are email addresses and model names and the label is the point — the question is which person, not what shape the distribution has. Rotated or truncated axis labels say the chart matters more than reading it. Trimmed where drawn and complete on hover, so the plot keeps its geometry and a reader can still find out whose row it is. The palette is validated rather than chosen: every adjacent pair clears the colour-vision separation threshold, and the dark values are the same hues re-stepped for the dark surface instead of an automatic flip. Run through a validator, because that is the only way anyone can honestly claim a palette is colourblind-safe. Which turned up a bug in the existing chart code. cssVar is an allowlist of four names that silently returns --accent for anything else, and callers wrap it in var() themselves — so every new series would have rendered in one colour with accent-coloured text. Caught by a test written from the rule that chart text wears text tokens, never the series colour. A key with no owner is labelled "operator-issued keys" rather than unknown: it predates accounts and is doing its job, and "unknown" would imply something is wrong. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
28967edab3
commit
eb9e9b348c
9 files changed
+667
-1
No files matched your search
@@ -2,6 +2,7 @@ package web
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
@@ -20,6 +21,21 @@ type DashboardData struct {
|
||||
Usage []store.KeyUsage
|
||||
Summary adminapi.Summary
|
||||
|
||||
Users []store.UserUsage
|
||||
Models2 []store.ModelUsage
|
||||
|
||||
// Tiles are the headline figures, which are numbers rather than charts.
|
||||
Requests24h int64
|
||||
Tokens24h int64
|
||||
Errors24h int64
|
||||
Spend24h int64
|
||||
RequestSpark template.HTML
|
||||
TokenSpark template.HTML
|
||||
|
||||
UserChart template.HTML
|
||||
ModelChart template.HTML
|
||||
HasPeople bool
|
||||
|
||||
// Charts are pre-rendered rather than assembled in the template: building
|
||||
// SVG out of template fragments is how a chart ends up unescaped.
|
||||
RequestChart template.HTML
|
||||
@@ -68,6 +84,12 @@ type Source interface {
|
||||
type UsageSource interface {
|
||||
UsageSince(ctx context.Context, since time.Time) ([]store.KeyUsage, error)
|
||||
UsageBuckets(ctx context.Context, since time.Time, width time.Duration) ([]store.Bucket, error)
|
||||
// UsageByUser and UsageByModel answer the two questions a key-by-key table
|
||||
// answers badly: who is using this cluster, and what are they running. One
|
||||
// person holds a laptop key, a CI key and a notebook key, and adding three
|
||||
// rows up by eye is a chore that gets skipped.
|
||||
UsageByUser(ctx context.Context, since time.Time) ([]store.UserUsage, error)
|
||||
UsageByModel(ctx context.Context, since time.Time) ([]store.ModelUsage, error)
|
||||
}
|
||||
|
||||
// Dashboard serves the read-only cluster view.
|
||||
@@ -123,11 +145,87 @@ func Dashboard(src Source, usage UsageSource, version string, refresh time.Durat
|
||||
}
|
||||
d.Usage = rows
|
||||
d.addCharts(r.Context(), usage, log)
|
||||
d.addPeopleAndModels(r.Context(), usage, log)
|
||||
}
|
||||
render(w, "dashboard", d)
|
||||
}
|
||||
}
|
||||
|
||||
// addPeopleAndModels answers who is using the cluster and what they are running.
|
||||
//
|
||||
// Both are ranked rather than plotted over time: the question is which person
|
||||
// and which model, and a reader comparing names wants them beside each other
|
||||
// rather than threaded through a time axis they then have to untangle.
|
||||
//
|
||||
// A reporting query failing leaves the section out rather than the page: the
|
||||
// cluster state above it is what someone is most likely here for.
|
||||
func (d *DashboardData) addPeopleAndModels(ctx context.Context, usage UsageSource, log *slog.Logger) {
|
||||
since := time.Now().Add(-24 * time.Hour)
|
||||
|
||||
users, err := usage.UsageByUser(ctx, since)
|
||||
if err != nil {
|
||||
log.Warn("could not read per-user usage", "err", err)
|
||||
} else {
|
||||
d.Users = users
|
||||
rows := make([]Row, 0, len(users))
|
||||
for _, u := range topUsers(users, 8) {
|
||||
rows = append(rows, Row{
|
||||
Label: userLabel(u),
|
||||
Value: float64(u.Tokens()),
|
||||
Note: fmt.Sprintf("%d req", u.Requests),
|
||||
})
|
||||
}
|
||||
d.UserChart = HBarChart(rows, "--viz-1", "tok")
|
||||
d.HasPeople = len(rows) > 0
|
||||
}
|
||||
|
||||
models, err := usage.UsageByModel(ctx, since)
|
||||
if err != nil {
|
||||
log.Warn("could not read per-model usage", "err", err)
|
||||
return
|
||||
}
|
||||
d.Models2 = models
|
||||
rows := make([]Row, 0, len(models))
|
||||
for i, m := range models {
|
||||
if i >= 8 {
|
||||
break
|
||||
}
|
||||
rows = append(rows, Row{
|
||||
Label: m.Model,
|
||||
Value: float64(m.Requests),
|
||||
Note: fmt.Sprintf("%.0f ms", m.AvgLatency),
|
||||
})
|
||||
}
|
||||
d.ModelChart = HBarChart(rows, "--viz-3", "req")
|
||||
}
|
||||
|
||||
// userLabel names a person the way they would recognise themselves.
|
||||
//
|
||||
// A key with no owner predates accounts, and calling it "unknown" would imply
|
||||
// something is wrong; it is an operator-issued key doing its job.
|
||||
func userLabel(u store.UserUsage) string {
|
||||
switch {
|
||||
case u.Email != "":
|
||||
return u.Email
|
||||
case u.Name != "":
|
||||
return u.Name
|
||||
default:
|
||||
return "operator-issued keys"
|
||||
}
|
||||
}
|
||||
|
||||
// topUsers keeps the chart readable.
|
||||
//
|
||||
// Eight, because a ranked bar chart stops being a comparison somewhere around
|
||||
// there and becomes a table drawn slowly. The full list is in the table below
|
||||
// it, which is the right form for twenty rows.
|
||||
func topUsers(users []store.UserUsage, n int) []store.UserUsage {
|
||||
if len(users) > n {
|
||||
return users[:n]
|
||||
}
|
||||
return users
|
||||
}
|
||||
|
||||
// addCharts draws the last day of traffic.
|
||||
//
|
||||
// Hourly, over 24 hours: fine enough to show a working day and coarse enough
|
||||
@@ -160,6 +258,19 @@ func (d *DashboardData) addCharts(ctx context.Context, usage UsageSource, log *s
|
||||
d.TokenChart = BarChart(tokens, "tokens/h")
|
||||
d.LatencyChart = BarChart(latency, "ms")
|
||||
d.HasCharts = true
|
||||
|
||||
// The headline figures. Numbers rather than charts, because a single
|
||||
// current value is a number — plotting one is how a chart ends up with one
|
||||
// bar in it. The sparkline beside each says only whether it is rising,
|
||||
// falling or flat, which is the one thing the number cannot say.
|
||||
for _, b := range buckets {
|
||||
d.Requests24h += b.Requests
|
||||
d.Tokens24h += b.Prompt + b.Completion
|
||||
d.Errors24h += b.Errors
|
||||
d.Spend24h += b.CostMicros
|
||||
}
|
||||
d.RequestSpark = Sparkline(requests.Values, "--viz-1")
|
||||
d.TokenSpark = Sparkline(tokens.Values, "--viz-3")
|
||||
}
|
||||
|
||||
// unplaced collects the placement explanations for models short of replicas.
|
||||
|
||||
Reference in new issue
Block a user