Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 05:45:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

show n8n version

Browse Source
This commit is contained in:
usmannasir
2025-04-12 23:24:03 +05:00
parent 8694cea94f
commit 35ce39d5d2
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plogical/DockerSites.py
View File

@@ -7,6 +7,7 @@ from random import randint
import socket
import shutil
import docker
import math
sys.path.append('/usr/local/CyberCP')
@@ -740,22 +741,31 @@ services:
# Calculate CPU percentage properly with safeguards
try:
cpu_count = len(stats["cpu_stats"]["cpu_usage"]["percpu_usage"])
cpu_delta = float(stats["cpu_stats"]["cpu_usage"]["total_usage"]) - float(stats["precpu_stats"]["cpu_usage"]["total_usage"])
system_delta = float(stats["cpu_stats"]["system_cpu_usage"]) - float(stats["precpu_stats"]["system_cpu_usage"])
# Get the total CPU usage
cpu_total = float(stats["cpu_stats"]["cpu_usage"]["total_usage"])
precpu_total = float(stats["precpu_stats"]["cpu_usage"]["total_usage"])
# Get the system CPU usage
sys_total = float(stats["cpu_stats"]["system_cpu_usage"])
presys_total = float(stats["precpu_stats"]["system_cpu_usage"])
# Calculate the change in CPU usage
cpu_delta = cpu_total - precpu_total
system_delta = sys_total - presys_total
cpu_usage = 0.0
if system_delta > 0.0 and cpu_delta >= 0:
# Calculate percentage per core
cpu_percent = (cpu_delta / system_delta) * 100.0
if system_delta > 0 and cpu_delta >= 0:
# Calculate the percentage of CPU time used
cpu_percent = (cpu_delta / system_delta) * 100.0 * cpu_count
# Ensure it's not over 100% per core
cpu_percent = min(cpu_percent, 100.0)
# Ensure it's a reasonable value (max 100% per core)
cpu_usage = min(cpu_percent, 100.0 * cpu_count)
# Multiply by number of cores
cpu_usage = cpu_percent * cpu_count
# Ensure we return a valid number
if cpu_usage < 0 or math.isnan(cpu_usage):
cpu_usage = 0.0
# Cap at total available CPU percentage (100% * number of cores)
cpu_usage = min(cpu_usage, 100.0 * cpu_count)
except Exception as e:
logging.writeToFile(f"CPU calculation error: {str(e)}")
cpu_usage = 0.0

10
websiteFunctions/static/websiteFunctions/DockerContainers.js
View File

@@ -98,7 +98,15 @@ app.controller('ListDockersitecontainer', function ($scope, $http) {
var memoryBytes = containerInfo.memory_usage;
$scope.ContainerList[i].memoryUsage = formatBytes(memoryBytes);
$scope.ContainerList[i].memoryUsagePercent = (memoryBytes / (1024 * 1024 * 1024)) * 100;
$scope.ContainerList[i].cpuUsagePercent = containerInfo.cpu_usage;
// Ensure CPU usage is a valid number and cap it at 800% (8 cores at 100% each)
var cpuUsage = parseFloat(containerInfo.cpu_usage);
if (isNaN(cpuUsage) || cpuUsage < 0) {
cpuUsage = 0;
} else if (cpuUsage > 800) {
cpuUsage = 800;
}
$scope.ContainerList[i].cpuUsagePercent = cpuUsage;
// Network & Ports
$scope.ContainerList[i].ports = containerInfo.ports;