Merge pull request #67 from coderbuzz/feat/stats-refinement-avg-max

feat: refine app list stats with 15m CPU moving average and 1h Peak RAM

Author: coderbuzz

internal/app/repository.go

@@ -627,19 +627,65 @@ func (r *Repository) LatestAggregatedStats(appID int64) (*ContainerStats, error)
 	return s, nil
 }
 
-// LatestStatsByApp returns the latest aggregated container stats per app
-// (summed across all of an app's containers at the most recent collection tick),
-// keyed by app ID. Apps with no collected stats are absent. Two queries total.
+// LatestStatsByApp returns refined per-app resource metrics for the app list view:
+// - CPU: 15-minute moving average (AVG of total container CPU per tick)
+// - Memory: 1-hour peak usage (MAX of total container RAM per tick)
+// - Network / Block IO: Latest snapshot
+// Falls back to latest available tick if no data exists within the time window.
 func (r *Repository) LatestStatsByApp() (map[int64]*ContainerStats, error) {
 	rows, err := r.db.Query(`
-		SELECT cs.app_id,
-		       SUM(cs.cpu_percent), SUM(cs.mem_usage_bytes), SUM(cs.mem_limit_bytes), SUM(cs.mem_percent),
-		       SUM(cs.net_io_rx_bytes), SUM(cs.net_io_tx_bytes), SUM(cs.block_io_read), SUM(cs.block_io_write)
-		FROM container_stats cs
-		JOIN (
-			SELECT app_id, MAX(created_at) AS max_ts FROM container_stats GROUP BY app_id
-		) m ON m.app_id = cs.app_id AND m.max_ts = cs.created_at
-		GROUP BY cs.app_id
+		WITH cs_15m AS (
+			SELECT app_id, AVG(tick_cpu) AS avg_cpu
+			FROM (
+				SELECT app_id, created_at, SUM(cpu_percent) AS tick_cpu
+				FROM container_stats
+				WHERE created_at >= DATETIME('now', '-15 minutes')
+				GROUP BY app_id, created_at
+			)
+			GROUP BY app_id
+		),
+		cs_60m AS (
+			SELECT app_id,
+			       MAX(tick_mem_bytes) AS max_mem_bytes,
+			       MAX(tick_mem_limit) AS max_mem_limit,
+			       MAX(tick_mem_pct) AS max_mem_pct
+			FROM (
+				SELECT app_id, created_at,
+				       SUM(mem_usage_bytes) AS tick_mem_bytes,
+				       SUM(mem_limit_bytes) AS tick_mem_limit,
+				       SUM(mem_percent) AS tick_mem_pct
+				FROM container_stats
+				WHERE created_at >= DATETIME('now', '-1 hour')
+				GROUP BY app_id, created_at
+			)
+			GROUP BY app_id
+		),
+		cs_latest AS (
+			SELECT cs.app_id,
+			       SUM(cs.cpu_percent) AS fallback_cpu,
+			       SUM(cs.mem_usage_bytes) AS fallback_mem_bytes,
+			       SUM(cs.mem_limit_bytes) AS fallback_mem_limit,
+			       SUM(cs.mem_percent) AS fallback_mem_pct,
+			       SUM(cs.net_io_rx_bytes) AS latest_rx,
+			       SUM(cs.net_io_tx_bytes) AS latest_tx,
+			       SUM(cs.block_io_read) AS latest_blk_r,
+			       SUM(cs.block_io_write) AS latest_blk_w
+			FROM container_stats cs
+			JOIN (
+				SELECT app_id, MAX(created_at) AS max_ts FROM container_stats GROUP BY app_id
+			) m ON m.app_id = cs.app_id AND m.max_ts = cs.created_at
+			GROUP BY cs.app_id
+		)
+		SELECT 
+			l.app_id,
+			COALESCE(c15.avg_cpu, l.fallback_cpu) AS cpu_percent,
+			COALESCE(c60.max_mem_bytes, l.fallback_mem_bytes) AS mem_usage_bytes,
+			COALESCE(c60.max_mem_limit, l.fallback_mem_limit) AS mem_limit_bytes,
+			COALESCE(c60.max_mem_pct, l.fallback_mem_pct) AS mem_percent,
+			l.latest_rx, l.latest_tx, l.latest_blk_r, l.latest_blk_w
+		FROM cs_latest l
+		LEFT JOIN cs_15m c15 ON c15.app_id = l.app_id
+		LEFT JOIN cs_60m c60 ON c60.app_id = l.app_id
 	`)
 	if err != nil {
 		return nil, err

internal/app/repository_test.go

@@ -224,3 +224,43 @@ func TestRepo_LatestBatchedStats(t *testing.T) {
 		t.Errorf("expected no disk entry for a2")
 	}
 }
+
+func TestRepo_LatestBatchedStats_RefinementAvgAndMax(t *testing.T) {
+	repo, srvRepo := setupRepo(t)
+	srvID := createTestServer(t, srvRepo)
+
+	a := &App{Name: "avg-max-app", Domain: "avgmax.com", Port: 80, ServerID: srvID, Compose: "x"}
+	repo.Create(a)
+
+	// Tick 1 (5 minutes ago): CPU 10%, Mem 100MB
+	repo.InsertContainerStats(&ContainerStats{
+		AppID: a.ID, ServerID: srvID, ContainerName: "web",
+		CPUPercent: 10.0, MemUsageBytes: 100, MemLimitBytes: 1000, MemPercent: 10.0,
+	})
+	repo.db.Exec(`UPDATE container_stats SET created_at = DATETIME('now', '-5 minutes') WHERE app_id = ?`, a.ID)
+
+	// Tick 2 (now): CPU 30%, Mem 500MB
+	repo.InsertContainerStats(&ContainerStats{
+		AppID: a.ID, ServerID: srvID, ContainerName: "web",
+		CPUPercent: 30.0, MemUsageBytes: 500, MemLimitBytes: 1000, MemPercent: 50.0,
+	})
+
+	statsMap, err := repo.LatestStatsByApp()
+	if err != nil {
+		t.Fatalf("LatestStatsByApp failed: %v", err)
+	}
+	st, ok := statsMap[a.ID]
+	if !ok {
+		t.Fatalf("expected stats for app %d", a.ID)
+	}
+
+	// 15m CPU moving average: (10 + 30) / 2 = 20.0%
+	if st.CPUPercent != 20.0 {
+		t.Errorf("expected 15m CPU AVG 20.0, got %f", st.CPUPercent)
+	}
+
+	// 1h Peak Memory: MAX(100, 500) = 500
+	if st.MemUsageBytes != 500 {
+		t.Errorf("expected 1h Peak Memory 500, got %d", st.MemUsageBytes)
+	}
+}