mirivlad
/
mirvmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide proc metrics from charts, fix API time search interval

This commit is contained in:
mirivlad 2026-02-14 18:11:04 +00:00
parent e823165a32
commit b132a294ed
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controllers/Api/MetricsController.php
View File

@ -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
");

4
src/Controllers/ServerDetailController.php
View File

@ -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();
// Удаляем старые пороги для этого сервера

2
templates/servers/detail.twig
View File

@ -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({'-': '_', '.': '_'}) }}, {