Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ [task#135735] add monitor setting.

Browse Source
This commit is contained in:
zhangxiquan
2025-01-06 16:14:10 +08:00
committed by 翟晓剑
parent 3ba682ef51
commit d6bdcb7a18
10 changed files with 302 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/system/control.php
+5 -4
View File
@@ -34,11 +34,12 @@ class system extends control
$instances = $this->loadModel('instance')->getList($pager, '', '', 'running');
$instancesMetrics = $this->cne->instancesMetrics($instances);
foreach($instances as $instance)
foreach($instances as &$instance)
{
$metrics = zget($instancesMetrics, $instance->id);
$instance->cpu = is_object($metrics) ? $this->instance->printCpuUsage($instance, $metrics->cpu) : new stdClass();
$instance->mem = is_object($metrics) ? $this->instance->printStorageUsage($instance, $metrics->memory) : new stdClass();
$metrics = zget($instancesMetrics, $instance->id);
$instance->cpu = is_object($metrics) ? $this->instance->printCpuUsage($instance, $metrics->cpu) : new stdClass();
$instance->mem = is_object($metrics) ? $this->instance->printStorageUsage($instance, $metrics->memory) : new stdClass();
$instance->monitor = empty($instance->monitor || !$this->config->inQuickon) ? array() : $this->loadModel('space')->formatMonitor(json_decode($instance->monitor, true));
}
$actions = $this->loadModel('action')->getDynamic('all', 'today');