From b132a294edfefdeb05519597fac124ec92a21813 Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@gmail.com>
Date: Sat, 14 Feb 2026 18:11:04 +0000
Subject: [PATCH] Hide proc metrics from charts, fix API time search interval

---
 src/Controllers/Api/MetricsController.php  | 4 ++--
 src/Controllers/ServerDetailController.php | 4 ++--
 templates/servers/detail.twig              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Controllers/Api/MetricsController.php b/src/Controllers/Api/MetricsController.php
index 4829d51..b7077d7 100755
--- a/src/Controllers/Api/MetricsController.php
+++ b/src/Controllers/Api/MetricsController.php
@@ -186,7 +186,7 @@ class MetricsController extends Model
             JOIN metric_names mn ON sm.metric_name_id = mn.id
             WHERE sm.server_id = :server_id
             AND mn.name = 'top_cpu_proc'
-            AND sm.created_at BETWEEN DATE_SUB(:time1, INTERVAL 5 SECOND) AND DATE_ADD(:time2, INTERVAL 5 SECOND)
+            AND sm.created_at BETWEEN DATE_SUB(:time1, INTERVAL 30 SECOND) AND DATE_ADD(:time2, INTERVAL 30 SECOND)
             ORDER BY ABS(TIMESTAMPDIFF(SECOND, sm.created_at, :time3))
             LIMIT 1
         ");
@@ -205,7 +205,7 @@ class MetricsController extends Model
             JOIN metric_names mn ON sm.metric_name_id = mn.id
             WHERE sm.server_id = :server_id
             AND mn.name = 'top_ram_proc'
-            AND sm.created_at BETWEEN DATE_SUB(:time1, INTERVAL 5 SECOND) AND DATE_ADD(:time2, INTERVAL 5 SECOND)
+            AND sm.created_at BETWEEN DATE_SUB(:time1, INTERVAL 30 SECOND) AND DATE_ADD(:time2, INTERVAL 30 SECOND)
             ORDER BY ABS(TIMESTAMPDIFF(SECOND, sm.created_at, :time3))
             LIMIT 1
         ");
diff --git a/src/Controllers/ServerDetailController.php b/src/Controllers/ServerDetailController.php
index a101b01..4c43241 100755
--- a/src/Controllers/ServerDetailController.php
+++ b/src/Controllers/ServerDetailController.php
@@ -86,7 +86,7 @@ class ServerDetailController extends Model
         }
 
         // Получаем все типы метрик
-        $stmt = $this->pdo->query("SELECT id, name, unit FROM metric_names ORDER BY name");
+        $stmt = $this->pdo->query("SELECT id, name, unit FROM metric_names WHERE name NOT LIKE '%_proc' ORDER BY name");
         $allMetricTypes = $stmt->fetchAll();
 
         // Получаем список сервисов
@@ -132,7 +132,7 @@ class ServerDetailController extends Model
         $params = $request->getParsedBody();
 
         // Получаем все типы метрик
-        $stmt = $this->pdo->query("SELECT id, name FROM metric_names ORDER BY name");
+        $stmt = $this->pdo->query("SELECT id, name FROM metric_names WHERE name NOT LIKE '%_proc' ORDER BY name");
         $metricTypes = $stmt->fetchAll();
 
         // Удаляем старые пороги для этого сервера
diff --git a/templates/servers/detail.twig b/templates/servers/detail.twig
index aee2f66..8862ff9 100755
--- a/templates/servers/detail.twig
+++ b/templates/servers/detail.twig
@@ -472,7 +472,7 @@ var data{{ metricName }} = [];
 
 {% for metric in metricData|slice(0, 20)|reverse %}
 labels{{ metricName }}.push('{{ metric.created_at|date('H:i') }}');
-data{{ metricName }}.push({{ metric.value }});
+data{{ metricName }}.push({{ metric.value|raw }});
 {% endfor %}
 
 new Chart(ctx{{ metricName|replace({'-': '_', '.': '_'}) }}, {