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

Rollback to working version before proc metrics fix

This commit is contained in:
mirivlad 2026-02-15 04:01:39 +00:00
parent 0e6d8ebcd6
commit 94bad84c0b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
templates/servers/detail.twig
View File

@ -107,7 +107,8 @@
</div> </div>
<div class="row"> <div class="row">
{% for metricName, metricData in metrics %}{% if metricName != 'top_cpu_proc' and metricName != 'top_ram_proc' %} {% for metricName, metricData in metrics %}
{% if metricName != 'top_cpu_proc' and metricName != 'top_ram_proc' %}
<div class="col-12 mb-4"> <div class="col-12 mb-4">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
@ -134,7 +135,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endfor %}
{% if metrics|length == 0 %} {% if metrics|length == 0 %}
<div class="col-12"> <div class="col-12">
@ -219,7 +220,8 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endif %}
{% for service in stoppedServices %} {% for service in stoppedServices %}
<div class="col-md-4 col-lg-3 mb-2"> <div class="col-md-4 col-lg-3 mb-2">
@ -250,7 +252,8 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endif %}
{% for service in unknownServices %} {% for service in unknownServices %}
<div class="col-md-4 col-lg-3 mb-2"> <div class="col-md-4 col-lg-3 mb-2">
@ -281,7 +284,8 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endif %}
{% else %} {% else %}
<div class="col-12"> <div class="col-12">
<div class="alert alert-warning text-center"> <div class="alert alert-warning text-center">
@ -365,7 +369,8 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endif %}
<div class="d-grid gap-2 d-md-flex justify-content-md-end"> <div class="d-grid gap-2 d-md-flex justify-content-md-end">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
@ -465,6 +470,8 @@ document.addEventListener('DOMContentLoaded', function() {
// Графики метрик // Графики метрик
{% for metricName, metricData in metrics %} {% for metricName, metricData in metrics %}
{% if metricName != 'top_cpu_proc' and metricName != 'top_ram_proc' %}
{% if metricName != 'top_cpu_proc' and metricName != 'top_ram_proc' %}
const ctx{{ metricName|replace({'-': '_', '.': '_'}) }} = document.getElementById('chart-{{ metricName }}').getContext('2d'); const ctx{{ metricName|replace({'-': '_', '.': '_'}) }} = document.getElementById('chart-{{ metricName }}').getContext('2d');
// Подготовка данных для графика // Подготовка данных для графика
@ -474,7 +481,8 @@ var data{{ metricName }} = [];
{% for metric in metricData|slice(0, 20)|reverse %} {% for metric in metricData|slice(0, 20)|reverse %}
labels{{ metricName }}.push('{{ metric.created_at|date('H:i') }}'); labels{{ metricName }}.push('{{ metric.created_at|date('H:i') }}');
data{{ metricName }}.push({{ metric.value|raw }}); data{{ metricName }}.push({{ metric.value|raw }});
{% endfor %} {% endif %}
new Chart(ctx{{ metricName|replace({'-': '_', '.': '_'}) }}, { new Chart(ctx{{ metricName|replace({'-': '_', '.': '_'}) }}, {
type: 'line', type: 'line',
@ -555,7 +563,6 @@ new Chart(ctx{{ metricName|replace({'-': '_', '.': '_'}) }}, {
lines.push(' ' + proc.name + ': ' + proc.value + '%'); lines.push(' ' + proc.name + ': ' + proc.value + '%');
}); });
} }
{% endif %}
// Show tooltip // Show tooltip
var position = context.chart.canvas.getBoundingClientRect(); var position = context.chart.canvas.getBoundingClientRect();
@ -574,6 +581,7 @@ new Chart(ctx{{ metricName|replace({'-': '_', '.': '_'}) }}, {
} }
} }
}); });
{% endfor %} {% endif %}
</script> </script>
{% endblock %} {% endblock %}