|
@@ -50,23 +50,15 @@ class ServerMemoryStatistic extends ApexChartWidget
|
|
$serverStatistic = new \App\Statistics\ServerStatistic();
|
|
$serverStatistic = new \App\Statistics\ServerStatistic();
|
|
$serverStats = $serverStatistic->getCurrentStats();
|
|
$serverStats = $serverStatistic->getCurrentStats();
|
|
|
|
|
|
-// try {
|
|
|
|
-// $memoryUsedPercentage = $serverStats['memory']['usedGb'] / $serverStats['memory']['totalGb'] * 100;
|
|
|
|
-// } catch (\Exception $e) {
|
|
|
|
-// $memoryUsedPercentage = 0;
|
|
|
|
-// }
|
|
|
|
-// $memoryUsedPercentage = round($memoryUsedPercentage, 0);
|
|
|
|
-
|
|
|
|
$memoryUsedPercentage = 0;
|
|
$memoryUsedPercentage = 0;
|
|
$memoryFreePercentage = 0;
|
|
$memoryFreePercentage = 0;
|
|
|
|
|
|
- try {
|
|
|
|
- if ($serverStats['memory']['totalGb'] > 0) {
|
|
|
|
- $memoryUsedPercentage = $serverStats['memory']['usedGb'] / $serverStats['memory']['totalGb'] * 100;
|
|
|
|
- $memoryFreePercentage = 100 - $memoryUsedPercentage;
|
|
|
|
- }
|
|
|
|
- } catch (\Exception $e) {
|
|
|
|
- // do nothing
|
|
|
|
|
|
+ $totalMemory = $serverStats['memory']['totalGb'];
|
|
|
|
+ $availableMemory = $serverStats['memory']['availableGb'];
|
|
|
|
+
|
|
|
|
+ if ($totalMemory > 0) {
|
|
|
|
+ $memoryUsedPercentage = ($totalMemory - $availableMemory) / $totalMemory * 100;
|
|
|
|
+ $memoryFreePercentage = 100 - $memoryUsedPercentage;
|
|
}
|
|
}
|
|
|
|
|
|
$memoryUsedPercentage = round($memoryUsedPercentage, 0);
|
|
$memoryUsedPercentage = round($memoryUsedPercentage, 0);
|
|
@@ -80,7 +72,7 @@ class ServerMemoryStatistic extends ApexChartWidget
|
|
'show' => false,
|
|
'show' => false,
|
|
],
|
|
],
|
|
],
|
|
],
|
|
- 'series' => [$memoryFreePercentage],
|
|
|
|
|
|
+ 'series' => [$memoryUsedPercentage],
|
|
'plotOptions' => [
|
|
'plotOptions' => [
|
|
'radialBar' => [
|
|
'radialBar' => [
|
|
'startAngle' => 0,
|
|
'startAngle' => 0,
|