diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/public/chartjs-plugin-crosshair.min.js b/public/chartjs-plugin-crosshair.min.js old mode 100644 new mode 100755 diff --git a/public/chartjs-plugin-zoom.min.js b/public/chartjs-plugin-zoom.min.js old mode 100644 new mode 100755 diff --git a/src/Controllers/ServerDetailController.php b/src/Controllers/ServerDetailController.php index 4ea2f44..075d739 100755 --- a/src/Controllers/ServerDetailController.php +++ b/src/Controllers/ServerDetailController.php @@ -201,7 +201,7 @@ class ServerDetailController extends Model } // Типы метрик - $stmt = $this->pdo->query("SELECT id, name, unit FROM metric_names WHERE name NOT LIKE '%\_proc' ORDER BY name"); + $stmt = $this->pdo->query("SELECT id, name, unit FROM metric_names WHERE name NOT LIKE '%\_proc' AND name NOT LIKE 'disk_total_gb_%' AND name != 'disk_used' AND name != 'ram_total_gb' AND name NOT IN ('net_in', 'net_out') AND name NOT LIKE 'network_%' ORDER BY name"); $allMetricTypes = $stmt->fetchAll(); // Сервисы @@ -286,7 +286,7 @@ class ServerDetailController extends Model $id = $args['id']; $params = $request->getParsedBody(); - $stmt = $this->pdo->query("SELECT id, name FROM metric_names WHERE name NOT LIKE '%\_proc' ORDER BY name"); + $stmt = $this->pdo->query("SELECT id, name FROM metric_names WHERE name NOT LIKE '%\_proc' AND name NOT LIKE 'disk_total_gb_%' AND name != 'disk_used' AND name != 'ram_total_gb' AND name NOT IN ('net_in', 'net_out') AND name NOT LIKE 'network_%' ORDER BY name"); $metricTypes = $stmt->fetchAll(); $stmt = $this->pdo->prepare("DELETE FROM metric_thresholds WHERE server_id = :server_id"); diff --git a/templates/servers/detail.twig b/templates/servers/detail.twig index d78f2b4..a102c07 100755 --- a/templates/servers/detail.twig +++ b/templates/servers/detail.twig @@ -160,8 +160,6 @@ {% endif %} - - {% set net_interfaces = [] %} {% for metricName in metrics|keys %} @@ -173,8 +171,8 @@ {% for iface in net_interfaces %} {% if metrics['net_in_' ~ iface] is defined and metrics['net_out_' ~ iface] is defined %} -