Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: empty getstats #57

Merged
merged 5 commits into from
Nov 21, 2024
Merged

fix: empty getstats #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b575f5f
fix: empty getstats
loks0n Nov 19, 2024
6912bea
chore: remove import
loks0n Nov 19, 2024
2de11fb
chore: fmt
loks0n Nov 19, 2024
7267748
chore: bump composer
loks0n Nov 19, 2024
218cae3
Fix tests
Meldiron Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

108 changes: 56 additions & 52 deletions src/Orchestration/Adapter/DockerAPI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,68 +311,72 @@ public function getStats(?string $container = null, array $filters = []): array
$list = [];

foreach ($containerIds as $containerId) {
$result = $this->call('http://localhost/containers/'.$containerId.'/stats?stream=false', 'GET');
try {
$result = $this->call('http://localhost/containers/'.$containerId.'/stats?stream=false', 'GET');

if ($result['code'] !== 200 || empty($result['response'])) {
throw new Orchestration($result['response']);
}
if ($result['code'] !== 200 || empty($result['response'])) {
continue; // Skip to the next container
}

$stats = \json_decode($result['response'], true);
$stats = \json_decode($result['response'], true);

if (! isset($stats['id']) || ! isset($stats['precpu_stats']) || ! isset($stats['cpu_stats']) || ! isset($stats['memory_stats']) || ! isset($stats['networks'])) {
throw new Orchestration('Failed to get stats for container: '.$containerId);
}
if (! isset($stats['id']) || ! isset($stats['precpu_stats']) || ! isset($stats['cpu_stats']) || ! isset($stats['memory_stats']) || ! isset($stats['networks'])) {
continue; // Skip to the next container
}

// Calculate CPU usage
$cpuDelta = $stats['cpu_stats']['cpu_usage']['total_usage'] - $stats['precpu_stats']['cpu_usage']['total_usage'];
$systemCpuDelta = $stats['cpu_stats']['system_cpu_usage'] - $stats['precpu_stats']['system_cpu_usage'];
$numberCpus = $stats['cpu_stats']['online_cpus'];
if ($systemCpuDelta > 0 && $cpuDelta > 0) {
$cpuUsage = ($cpuDelta / $systemCpuDelta) * $numberCpus;
} else {
$cpuUsage = 0.0;
}
// Calculate CPU usage
$cpuDelta = $stats['cpu_stats']['cpu_usage']['total_usage'] - $stats['precpu_stats']['cpu_usage']['total_usage'];
$systemCpuDelta = $stats['cpu_stats']['system_cpu_usage'] - $stats['precpu_stats']['system_cpu_usage'];
$numberCpus = $stats['cpu_stats']['online_cpus'];
if ($systemCpuDelta > 0 && $cpuDelta > 0) {
$cpuUsage = ($cpuDelta / $systemCpuDelta) * $numberCpus;
} else {
$cpuUsage = 0.0;
}

// Calculate memory usage (unsafe div /0)
$memoryUsage = 0.0;
if ($stats['memory_stats']['limit'] > 0 && $stats['memory_stats']['usage'] > 0) {
$memoryUsage = ($stats['memory_stats']['usage'] / $stats['memory_stats']['limit']) * 100.0;
}
// Calculate memory usage (unsafe div /0)
$memoryUsage = 0.0;
if ($stats['memory_stats']['limit'] > 0 && $stats['memory_stats']['usage'] > 0) {
$memoryUsage = ($stats['memory_stats']['usage'] / $stats['memory_stats']['limit']) * 100.0;
}

// Calculate network I/O
$networkIn = 0;
$networkOut = 0;
foreach ($stats['networks'] as $network) {
$networkIn += $network['rx_bytes'];
$networkOut += $network['tx_bytes'];
}
// Calculate network I/O
$networkIn = 0;
$networkOut = 0;
foreach ($stats['networks'] as $network) {
$networkIn += $network['rx_bytes'];
$networkOut += $network['tx_bytes'];
}

// Calculate disk I/O
$diskRead = 0;
$diskWrite = 0;
if (isset($stats['blkio_stats']['io_service_bytes_recursive'])) {
foreach ($stats['blkio_stats']['io_service_bytes_recursive'] as $entry) {
if ($entry['op'] === 'Read') {
$diskRead += $entry['value'];
} elseif ($entry['op'] === 'Write') {
$diskWrite += $entry['value'];
// Calculate disk I/O
$diskRead = 0;
$diskWrite = 0;
if (isset($stats['blkio_stats']['io_service_bytes_recursive'])) {
foreach ($stats['blkio_stats']['io_service_bytes_recursive'] as $entry) {
if ($entry['op'] === 'Read') {
$diskRead += $entry['value'];
} elseif ($entry['op'] === 'Write') {
$diskWrite += $entry['value'];
}
}
}
}

// Calculate memory I/O (approximated)
$memoryIn = $stats['memory_stats']['usage'] ?? 0;
$memoryOut = $stats['memory_stats']['max_usage'] ?? 0;

$list[] = new Stats(
containerId: $stats['id'],
containerName: \ltrim($stats['name'], '/'), // Remove '/' prefix
cpuUsage: $cpuUsage,
memoryUsage: $memoryUsage,
diskIO: ['in' => $diskRead, 'out' => $diskWrite],
memoryIO: ['in' => $memoryIn, 'out' => $memoryOut],
networkIO: ['in' => $networkIn, 'out' => $networkOut],
);
// Calculate memory I/O (approximated)
$memoryIn = $stats['memory_stats']['usage'] ?? 0;
$memoryOut = $stats['memory_stats']['max_usage'] ?? 0;

$list[] = new Stats(
containerId: $stats['id'],
containerName: \ltrim($stats['name'], '/'), // Remove '/' prefix
cpuUsage: $cpuUsage,
memoryUsage: $memoryUsage,
diskIO: ['in' => $diskRead, 'out' => $diskWrite],
memoryIO: ['in' => $memoryIn, 'out' => $memoryOut],
networkIO: ['in' => $networkIn, 'out' => $networkOut],
);
} catch (\Throwable $e) {
continue;
}
}

return $list;
Expand Down
2 changes: 1 addition & 1 deletion src/Orchestration/Adapter/DockerCLI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function getStats(?string $container = null, array $filters = []): array
$result = Console::execute('docker stats --no-trunc --format "id={{.ID}}&name={{.Name}}&cpu={{.CPUPerc}}&memory={{.MemPerc}}&diskIO={{.BlockIO}}&memoryIO={{.MemUsage}}&networkIO={{.NetIO}}" --no-stream'.$containersString, '', $output);

if ($result !== 0) {
throw new Orchestration("Docker Error: {$output}");
return [];
}

$lines = \explode("\n", $output);
Expand Down
3 changes: 1 addition & 2 deletions tests/Orchestration/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,8 @@ public function testUsageStats(): void
/**
* Test for Failure
*/
$this->expectException(\Exception::class);

$stats = static::getOrchestration()->getStats('IDontExist');
$this->assertCount(0, $stats);
}

public function testNetworkExists(): void
Expand Down
Loading