zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-07-22 10:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Server health resource usage is now more logical

Browse source
This commit is contained in:
Pinga 2025-02-28 13:03:45 +02:00
parent 35ff83ce3e
commit 3ebf8e9bec
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cp/resources/views/admin/reports/serverHealth.twig
View file

@ -47,16 +47,14 @@
<div class="d-flex align-items-center mb-3"> <div class="d-flex align-items-center mb-3">
<div> <div>
<h4 class="m-0">{{ __('CPU Cores') }}</h4> <h4 class="m-0">{{ __('CPU Cores') }}</h4>
<div class="text-muted">{{ serverHealth.getCPUCores }}</div> <div class="text-muted">{{ serverHealth.getCPUUsage|round(1) }}% {{ __('load across') }} {{ serverHealth.getCPUCores }} {{ __('cores') }}</div>
</div> </div>
<div class="ms-auto"> <div class="ms-auto">
<span class="badge bg-primary text-primary-fg">{{ serverHealth.getCPUUsage }}%</span> <span class="badge bg-primary text-primary-fg">{{ serverHealth.getCPUUsage|round(1) }}%</span>
</div> </div>
</div> </div>
<div class="progress progress-xl"> <div class="progress progress-xl">
<div class="progress-bar bg-primary" style="width: {{ serverHealth.getCPUUsage }}%;" role="progressbar" aria-valuenow="{{ serverHealth.getCPUUsage }}" aria-valuemin="0" aria-valuemax="100"> <div class="progress-bar bg-primary progress-bar-striped progress-bar-animated" style="width: {{ serverHealth.getCPUUsage }}%;" role="progressbar" aria-valuenow="{{ serverHealth.getCPUUsage }}" aria-valuemin="0" aria-valuemax="100"></div>
{{ serverHealth.getCPUUsage }}%
</div>
</div> </div>
</div> </div>
</div> </div>
@ -72,16 +70,16 @@
<div class="d-flex align-items-center mb-3"> <div class="d-flex align-items-center mb-3">
<div> <div>
<h4 class="m-0">{{ __('Memory') }}</h4> <h4 class="m-0">{{ __('Memory') }}</h4>
<div class="text-muted">{{ serverHealth.getMemoryFree }} MB {{ __('free of') }} {{ serverHealth.getMemoryTotal }} MB</div> {% set used_memory = serverHealth.getMemoryTotal - serverHealth.getMemoryFree %}
{% set memory_usage_percentage = (used_memory / serverHealth.getMemoryTotal * 100)|round(1) %}
<div class="text-muted">{{ used_memory }} MB {{ __('used of') }} {{ serverHealth.getMemoryTotal }} MB</div>
</div> </div>
<div class="ms-auto"> <div class="ms-auto">
<span class="badge bg-green text-green-fg">{{ (serverHealth.getMemoryFree / serverHealth.getMemoryTotal * 100)|round(1) }}%</span> <span class="badge bg-green text-green-fg">{{ memory_usage_percentage }}%</span>
</div> </div>
</div> </div>
<div class="progress progress-xl"> <div class="progress progress-xl">
<div class="progress-bar bg-success" style="width: {{ (serverHealth.getMemoryFree / serverHealth.getMemoryTotal * 100)|round(1) }}%;" role="progressbar" aria-valuenow="{{ (serverHealth.getMemoryFree / serverHealth.getMemoryTotal * 100)|round(1) }}" aria-valuemin="0" aria-valuemax="100"> <div class="progress-bar bg-success progress-bar-striped progress-bar-animated" style="width: {{ memory_usage_percentage }}%;" role="progressbar" aria-valuenow="{{ memory_usage_percentage }}" aria-valuemin="0" aria-valuemax="100"></div>
{{ (serverHealth.getMemoryFree / serverHealth.getMemoryTotal * 100)|round(1) }}%
</div>
</div> </div>
</div> </div>
</div> </div>
@ -97,16 +95,16 @@
<div class="d-flex align-items-center mb-3"> <div class="d-flex align-items-center mb-3">
<div> <div>
<h4 class="m-0">{{ __('Disk') }}</h4> <h4 class="m-0">{{ __('Disk') }}</h4>
<div class="text-muted">{{ serverHealth.getDiskFree }} GB {{ __('free of') }} {{ serverHealth.getDiskTotal }} GB</div> {% set used_disk = serverHealth.getDiskTotal - serverHealth.getDiskFree %}
{% set disk_usage_percentage = (used_disk / serverHealth.getDiskTotal * 100)|round(1) %}
<div class="text-muted">{{ used_disk }} GB {{ __('used of') }} {{ serverHealth.getDiskTotal }} GB</div>
</div> </div>
<div class="ms-auto"> <div class="ms-auto">
<span class="badge bg-warning text-warning-fg">{{ (serverHealth.getDiskFree / serverHealth.getDiskTotal * 100)|round(1) }}%</span> <span class="badge bg-warning text-warning-fg">{{ disk_usage_percentage }}%</span>
</div> </div>
</div> </div>
<div class="progress progress-xl"> <div class="progress progress-xl">
<div class="progress-bar bg-warning" style="width: {{ (serverHealth.getDiskFree / serverHealth.getDiskTotal * 100)|round(1) }}%;" role="progressbar" aria-valuenow="{{ (serverHealth.getDiskFree / serverHealth.getDiskTotal * 100)|round(1) }}" aria-valuemin="0" aria-valuemax="100"> <div class="progress-bar bg-warning progress-bar-striped progress-bar-animated" style="width: {{ disk_usage_percentage }}%;" role="progressbar" aria-valuenow="{{ disk_usage_percentage }}" aria-valuemin="0" aria-valuemax="100"></div>
{{ (serverHealth.getDiskFree / serverHealth.getDiskTotal * 100)|round(1) }}%
</div>
</div> </div>
</div> </div>
</div> </div>