From 1801f46c89d3bbca54e2830fec193724135c167b Mon Sep 17 00:00:00 2001 From: Hyoseong Jo Date: Sun, 28 Dec 2025 16:17:39 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/api/anomaly/baseline.get.ts | 24 ++++++++++++------------ backend/api/anomaly/short-term.get.ts | 10 +++++----- backend/routes/_ws.ts | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/backend/api/anomaly/baseline.get.ts b/backend/api/anomaly/baseline.get.ts index 4bcb649..923e149 100644 --- a/backend/api/anomaly/baseline.get.ts +++ b/backend/api/anomaly/baseline.get.ts @@ -4,10 +4,10 @@ export default defineEventHandler(async (event) => { const DEVIATION_THRESHOLD = 2.0 const servers = await query(` - SELECT target_id, name as server_name + SELECT target_id, server_name FROM server_targets WHERE is_active = 1 - ORDER BY name + ORDER BY server_name `) const now = new Date() @@ -22,25 +22,25 @@ export default defineEventHandler(async (event) => { for (const server of servers) { // 최근 14일 동일 시간대 데이터 const historicalData = await query(` - SELECT cpu_usage as cpu_percent, memory_usage as memory_percent, checked_at as collected_at - FROM server_logs + SELECT cpu_percent, memory_percent, collected_at + FROM server_snapshots WHERE target_id = $1 - AND checked_at >= NOW() - INTERVAL '14 days' - AND EXTRACT(HOUR FROM checked_at) = $2 + AND collected_at::timestamp >= NOW() - INTERVAL '14 days' + AND EXTRACT(HOUR FROM collected_at::timestamp) = $2 AND ( - ($3 = 'weekend' AND EXTRACT(DOW FROM checked_at) IN (0, 6)) + ($3 = 'weekend' AND EXTRACT(DOW FROM collected_at::timestamp) IN (0, 6)) OR - ($3 = 'weekday' AND EXTRACT(DOW FROM checked_at) NOT IN (0, 6)) + ($3 = 'weekday' AND EXTRACT(DOW FROM collected_at::timestamp) NOT IN (0, 6)) ) - ORDER BY checked_at DESC + ORDER BY collected_at DESC `, [server.target_id, currentHour, dayType]) // 현재 값 const currentRows = await query(` - SELECT cpu_usage as cpu_percent, memory_usage as memory_percent - FROM server_logs + SELECT cpu_percent, memory_percent + FROM server_snapshots WHERE target_id = $1 - ORDER BY checked_at DESC + ORDER BY collected_at DESC LIMIT 1 `, [server.target_id]) diff --git a/backend/api/anomaly/short-term.get.ts b/backend/api/anomaly/short-term.get.ts index 180658c..d314907 100644 --- a/backend/api/anomaly/short-term.get.ts +++ b/backend/api/anomaly/short-term.get.ts @@ -5,10 +5,10 @@ export default defineEventHandler(async (event) => { // 활성 서버 목록 const servers = await query(` - SELECT target_id, name as server_name + SELECT target_id, server_name FROM server_targets WHERE is_active = 1 - ORDER BY name + ORDER BY server_name `) const anomalies: any[] = [] @@ -16,10 +16,10 @@ export default defineEventHandler(async (event) => { for (const server of servers) { const snapshots = await query(` - SELECT cpu_usage as cpu_percent, memory_usage as memory_percent, checked_at as collected_at - FROM server_logs + SELECT cpu_percent, memory_percent, collected_at + FROM server_snapshots WHERE target_id = $1 - ORDER BY checked_at DESC + ORDER BY collected_at DESC LIMIT 20 `, [server.target_id]) diff --git a/backend/routes/_ws.ts b/backend/routes/_ws.ts index ce1bf4e..1a7710f 100644 --- a/backend/routes/_ws.ts +++ b/backend/routes/_ws.ts @@ -175,10 +175,10 @@ async function getServerDashboard() { for (const server of servers) { // 최신 로그 const snapshot = await queryOne(` - SELECT cpu_usage as cpu_percent, memory_usage as memory_percent, disk_usage as disk_percent, checked_at as collected_at - FROM server_logs - WHERE target_id = $1 AND is_success = 1 - ORDER BY checked_at DESC + SELECT cpu_percent, memory_percent, collected_at + FROM server_snapshots + WHERE target_id = $1 AND is_online = 1 + ORDER BY collected_at DESC LIMIT 1 `, [server.target_id])