05440a5f92
Build / build (push) Successful in 10m50s
Background collector samples CPU/memory/network/block I/O for every
instance and site on a configurable interval (default 15s, range
5-300s), persists samples to SQLite with a configurable retention
window (default 2h, range 0-24h), and skips ticks gracefully when
the Docker daemon is unreachable. Settings are reloadable without
a restart — each tick re-reads them.
New API endpoints:
- GET /api/system/stats (host snapshot: info + df)
- GET /api/system/stats/history
- GET /api/system/stats/top?by=cpu|memory
- GET /api/projects/{id}/stages/{s}/instances/{iid}/stats/history
- GET /api/sites/{id}/stats[/history]
- GET /api/sites/{id}/logs (SSE + JSON, reuses instance log streamer)
Frontend:
- ECharts added with tree-shaken imports (~180KB gzip) for
future-proof time-series/gantt/graph visualizations
- CollapsibleSection wraps all dashboard sections (system health,
daemons, system resources, static sites, projects) with
localStorage-persisted open state
- SystemResourcesCard shows capacity tiles, workload utilization
chart with 30m/2h/6h/24h window picker, disk breakdown with
reclaimable callouts, and top 5 consumers
- ContainerStats and ContainerLogs take a source discriminated union
so sites reuse the same components as instances; sites detail page
embeds both for Deno backend debugging
- Settings › Maintenance exposes collection interval + retention
- Docker-unavailable state returns 503 and renders an amber banner
instead of a generic 500
Full i18n coverage (en + ru) for all new strings.
158 lines
5.0 KiB
Go
158 lines
5.0 KiB
Go
package store
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// InsertContainerStatsSample appends a single container sample row.
|
|
func (s *Store) InsertContainerStatsSample(sample ContainerStatsSample) error {
|
|
_, err := s.db.Exec(
|
|
`INSERT INTO container_stats_samples (
|
|
container_id, owner_type, owner_id, ts,
|
|
cpu_percent, memory_usage, memory_limit,
|
|
network_rx, network_tx, block_read, block_write
|
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
sample.ContainerID, sample.OwnerType, sample.OwnerID, sample.TS,
|
|
sample.CPUPercent, sample.MemoryUsage, sample.MemoryLimit,
|
|
sample.NetworkRxBytes, sample.NetworkTxBytes,
|
|
sample.BlockReadBytes, sample.BlockWriteBytes,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert container stats sample: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// InsertSystemStatsSample appends a single host-level sample row.
|
|
func (s *Store) InsertSystemStatsSample(sample SystemStatsSample) error {
|
|
_, err := s.db.Exec(
|
|
`INSERT INTO system_stats_samples (
|
|
ts, ncpu, memory_total,
|
|
workload_cpu_percent, workload_mem_usage,
|
|
containers_running, disk_total_bytes
|
|
) VALUES (?, ?, ?, ?, ?, ?, ?)`,
|
|
sample.TS, sample.NCPU, sample.MemoryTotal,
|
|
sample.WorkloadCPUPercent, sample.WorkloadMemUsage,
|
|
sample.ContainersRunning, sample.DiskTotalBytes,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert system stats sample: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ListContainerStatsSamples returns samples for the given owner since the
|
|
// given unix timestamp (inclusive), ordered by ts ascending.
|
|
func (s *Store) ListContainerStatsSamples(ownerType, ownerID string, sinceTS int64) ([]ContainerStatsSample, error) {
|
|
rows, err := s.db.Query(
|
|
`SELECT container_id, owner_type, owner_id, ts,
|
|
cpu_percent, memory_usage, memory_limit,
|
|
network_rx, network_tx, block_read, block_write
|
|
FROM container_stats_samples
|
|
WHERE owner_type = ? AND owner_id = ? AND ts >= ?
|
|
ORDER BY ts ASC`,
|
|
ownerType, ownerID, sinceTS,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list container stats samples: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []ContainerStatsSample
|
|
for rows.Next() {
|
|
var s ContainerStatsSample
|
|
if err := rows.Scan(
|
|
&s.ContainerID, &s.OwnerType, &s.OwnerID, &s.TS,
|
|
&s.CPUPercent, &s.MemoryUsage, &s.MemoryLimit,
|
|
&s.NetworkRxBytes, &s.NetworkTxBytes,
|
|
&s.BlockReadBytes, &s.BlockWriteBytes,
|
|
); err != nil {
|
|
return nil, fmt.Errorf("scan container stats sample: %w", err)
|
|
}
|
|
out = append(out, s)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// ListAllRecentContainerStatsSamples returns samples across every owner since
|
|
// the given unix timestamp, ordered by ts ascending. Used by the system
|
|
// dashboard "top containers" widget where the UI wants a mixed pool.
|
|
func (s *Store) ListAllRecentContainerStatsSamples(sinceTS int64) ([]ContainerStatsSample, error) {
|
|
rows, err := s.db.Query(
|
|
`SELECT container_id, owner_type, owner_id, ts,
|
|
cpu_percent, memory_usage, memory_limit,
|
|
network_rx, network_tx, block_read, block_write
|
|
FROM container_stats_samples
|
|
WHERE ts >= ?
|
|
ORDER BY ts ASC`,
|
|
sinceTS,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list all recent container stats samples: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []ContainerStatsSample
|
|
for rows.Next() {
|
|
var s ContainerStatsSample
|
|
if err := rows.Scan(
|
|
&s.ContainerID, &s.OwnerType, &s.OwnerID, &s.TS,
|
|
&s.CPUPercent, &s.MemoryUsage, &s.MemoryLimit,
|
|
&s.NetworkRxBytes, &s.NetworkTxBytes,
|
|
&s.BlockReadBytes, &s.BlockWriteBytes,
|
|
); err != nil {
|
|
return nil, fmt.Errorf("scan container stats sample: %w", err)
|
|
}
|
|
out = append(out, s)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// ListSystemStatsSamples returns host samples since the given unix timestamp.
|
|
func (s *Store) ListSystemStatsSamples(sinceTS int64) ([]SystemStatsSample, error) {
|
|
rows, err := s.db.Query(
|
|
`SELECT ts, ncpu, memory_total,
|
|
workload_cpu_percent, workload_mem_usage,
|
|
containers_running, disk_total_bytes
|
|
FROM system_stats_samples
|
|
WHERE ts >= ?
|
|
ORDER BY ts ASC`,
|
|
sinceTS,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list system stats samples: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []SystemStatsSample
|
|
for rows.Next() {
|
|
var s SystemStatsSample
|
|
if err := rows.Scan(
|
|
&s.TS, &s.NCPU, &s.MemoryTotal,
|
|
&s.WorkloadCPUPercent, &s.WorkloadMemUsage,
|
|
&s.ContainersRunning, &s.DiskTotalBytes,
|
|
); err != nil {
|
|
return nil, fmt.Errorf("scan system stats sample: %w", err)
|
|
}
|
|
out = append(out, s)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// PruneStatsSamplesBefore deletes all samples older than the given unix timestamp
|
|
// from both the container and system stats tables. Returns rows deleted across
|
|
// both tables.
|
|
func (s *Store) PruneStatsSamplesBefore(ts int64) (int64, error) {
|
|
r1, err := s.db.Exec(`DELETE FROM container_stats_samples WHERE ts < ?`, ts)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("prune container stats samples: %w", err)
|
|
}
|
|
r2, err := s.db.Exec(`DELETE FROM system_stats_samples WHERE ts < ?`, ts)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("prune system stats samples: %w", err)
|
|
}
|
|
n1, _ := r1.RowsAffected()
|
|
n2, _ := r2.RowsAffected()
|
|
return n1 + n2, nil
|
|
}
|