Skip to content
Snippets Groups Projects
Commit d9054ee0 authored by Tibo's avatar Tibo
Browse files

show more server info on organization view

parent fc284917
No related branches found
No related tags found
No related merge requests found
Pipeline #12867 passed
...@@ -84,10 +84,15 @@ class ServerInfo ...@@ -84,10 +84,15 @@ class ServerInfo
{ {
return $this->cpuinfo; return $this->cpuinfo;
} }
public function vCores() : int
{
return $this->cpuinfo()["threads"];
}
public function memoryTotalForHumans() public function memoryTotalForHumans()
{ {
return round($this->memoryTotal() / 1024 / 1024) . " GB"; return round($this->memoryTotal() / 1024 / 1024) . "GB";
} }
/** /**
......
...@@ -39,7 +39,9 @@ ...@@ -39,7 +39,9 @@
</td> </td>
<td>{!! $server->status()->badge() !!}</td> <td>{!! $server->status()->badge() !!}</td>
<td>{{ $server->info()->lastRecordTime()->diffForHumans() }}</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> </tr>
@endforeach @endforeach
</table> </table>
......
...@@ -28,8 +28,10 @@ window.monitorServerToken = "{{ $server->read_token }}"; ...@@ -28,8 +28,10 @@ window.monitorServerToken = "{{ $server->read_token }}";
<p>{{ $server->info()->manufacturer() }} {{ $server->info()->productName() }}</p> <p>{{ $server->info()->manufacturer() }} {{ $server->info()->productName() }}</p>
<p><small>{{ $server->info()->uuid() }}</small></p> <p><small>{{ $server->info()->uuid() }}</small></p>
<p>{{ $server->info()->cpuinfo()["cpu"] }} <p>
({{ $server->info()->cpuinfo()["threads"] }} threads)</p> {{ $server->info()->cpuinfo()["cpu"] }}<br>
{{ $server->info()->vCores() }} vCores
</p>
<p>Memory: {{ $server->info()->memoryTotalForHumans() }}</p> <p>Memory: {{ $server->info()->memoryTotalForHumans() }}</p>
<p>{{ $server->info()->lsb() }}</p> <p>{{ $server->info()->lsb() }}</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment