diff --git a/app/ServerInfo.php b/app/ServerInfo.php index 2d060a81f5c31a44a1c8187d1dd7aea933a7fb4d..831c67f82227a98b8630c5cb0052226aa37bf65c 100644 --- a/app/ServerInfo.php +++ b/app/ServerInfo.php @@ -84,10 +84,15 @@ class ServerInfo { return $this->cpuinfo; } + + public function vCores() : int + { + return $this->cpuinfo()["threads"]; + } public function memoryTotalForHumans() { - return round($this->memoryTotal() / 1024 / 1024) . " GB"; + return round($this->memoryTotal() / 1024 / 1024) . "GB"; } /** diff --git a/resources/views/organization/show.blade.php b/resources/views/organization/show.blade.php index 8c8858cac1e027730a33bdd78d5c77f1af205ab9..bcb5585b8283f3cf6055f75248b222b4a93c617a 100644 --- a/resources/views/organization/show.blade.php +++ b/resources/views/organization/show.blade.php @@ -39,7 +39,9 @@ </td> <td>{!! $server->status()->badge() !!}</td> <td>{{ $server->info()->lastRecordTime()->diffForHumans() }}</td> - <td>{{ $server->info()->lsb() }}</td> + <td>{{ $server->info()->memoryTotalForHumans() }}</td> + <td>{{ $server->info()->vCores() }} vCores</td> + <td class="text-right">{{ $server->info()->lsb() }}</td> </tr> @endforeach </table> diff --git a/resources/views/server/show.blade.php b/resources/views/server/show.blade.php index 8b9421858a2d4efa52bfa3f6158859b5ebf1fe52..5384d66f6799a9de08b70bf4b8c018200d6d54fe 100644 --- a/resources/views/server/show.blade.php +++ b/resources/views/server/show.blade.php @@ -28,8 +28,10 @@ window.monitorServerToken = "{{ $server->read_token }}"; <p>{{ $server->info()->manufacturer() }} {{ $server->info()->productName() }}</p> <p><small>{{ $server->info()->uuid() }}</small></p> - <p>{{ $server->info()->cpuinfo()["cpu"] }} - ({{ $server->info()->cpuinfo()["threads"] }} threads)</p> + <p> + {{ $server->info()->cpuinfo()["cpu"] }}<br> + {{ $server->info()->vCores() }} vCores + </p> <p>Memory: {{ $server->info()->memoryTotalForHumans() }}</p> <p>{{ $server->info()->lsb() }}</p>