Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: metrics parsing

Browse Source
This commit is contained in:
Andras Bacsai 2024-06-19 08:58:57 +02:00
parent c8155c8a32
commit a43de75b42
3 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Models/Server.php
View File

@ -5,8 +5,6 @@
use App\Actions\Server\InstallDocker;
use App\Enums\ProxyTypes;
use App\Jobs\PullSentinelImageJob;
use App\Notifications\Server\Revived;
use App\Notifications\Server\Unreachable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Support\Collection;
@ -503,9 +501,27 @@ public function getCpuMetrics(int $mins = 5)
return [(int) $time, (float) $value];
});
})->toArray();
});
if ($mins === 30 || $mins === 60) {
$parsedCollection = $parsedCollection->filter(function ($item, $key) {
return $key % 5 === 0;
});
$parsedCollection = $parsedCollection->values();
}
if ($mins === 720) {
$parsedCollection = $parsedCollection->filter(function ($item, $key) {
return $key % 10 === 0;
});
$parsedCollection = $parsedCollection->values();
}
if ($mins === 10080) {
$parsedCollection = $parsedCollection->filter(function ($item, $key) {
return $key % 20 === 0;
});
$parsedCollection = $parsedCollection->values();
}
return $parsedCollection;
return $parsedCollection->toArray();
}
}
@ -529,9 +545,27 @@ public function getMemoryMetrics(int $mins = 5)
return [(int) $time, (float) $usedPercent];
});
})->toArray();
});
if ($mins === 30 || $mins === 60) {
$parsedCollection = $parsedCollection->filter(function ($item, $key) {
return $key % 5 === 0;
});
$parsedCollection = $parsedCollection->values();
}
if ($mins === 720) {
$parsedCollection = $parsedCollection->filter(function ($item, $key) {
return $key % 10 === 0;
});
$parsedCollection = $parsedCollection->values();
}
if ($mins === 10080) {
$parsedCollection = $parsedCollection->filter(function ($item, $key) {
return $key % 20 === 0;
});
$parsedCollection = $parsedCollection->values();
}
return $parsedCollection;
return $parsedCollection->toArray();
}
}

7
resources/views/livewire/charts/server-cpu.blade.php
View File

@ -14,14 +14,13 @@
<script>
checkTheme();
const optionsServerCpu = {
stroke: {
curve: 'straight',
},
chart: {
height: '150px',
id: '{!! $chartId !!}',
type: 'area',
stroke: {
curve: 'straight',
},
toolbar: {
show: false,
tools: {

8
resources/views/livewire/charts/server-memory.blade.php
View File

@ -14,14 +14,13 @@
<script>
checkTheme();
const optionsServerMemory = {
stroke: {
curve: 'straight',
},
chart: {
height: '150px',
id: '{!! $chartId !!}',
type: 'area',
stroke: {
curve: 'straight',
},
toolbar: {
show: false,
tools: {
@ -122,7 +121,6 @@
});
});
});
</script>
</div>