From d9054ee09f38c90af12b7d0105dca72a2f229021 Mon Sep 17 00:00:00 2001
From: Thibault Debatty <thibault.debatty@gmail.com>
Date: Sun, 7 Jan 2024 21:41:58 +0100
Subject: [PATCH] show more server info on organization view
---
app/ServerInfo.php | 7 ++++++-
resources/views/organization/show.blade.php | 4 +++-
resources/views/server/show.blade.php | 6 ++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/app/ServerInfo.php b/app/ServerInfo.php
index 2d060a8..831c67f 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 8c8858c..bcb5585 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 8b94218..5384d66 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>
--
GitLab