devlab/server-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: force LC_ALL=C for metric commands to avoid comma decimal separator' (#51) from feat/push-monitoring-agent-v2 into master

Browse Source 
Reviewed-on: #51
This commit was merged in pull request #51.
This commit is contained in:
rafaga21
2026-06-11 20:50:31 -04:00
parent 50f1574954 552e30751d
commit ab9e5d9cf3
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/agent-install.sh
View File

@@ -49,9 +49,9 @@ AGENT_KEY="$AGENT_KEY"
INTERVAL=$INTERVAL INTERVAL=$INTERVAL
collect_metrics() { collect_metrics() {
CPU=\$(top -bn1 2>/dev/null | grep 'Cpu(s)' | awk '{print \$2}' | cut -d'%' -f1 || true) CPU=\$(LC_ALL=C top -bn1 2>/dev/null | grep 'Cpu(s)' | awk '{print \$2}' | cut -d'%' -f1 || true)
[ -z "\$CPU" ] && CPU=0 [ -z "\$CPU" ] && CPU=0
RAM=\$(free 2>/dev/null | grep Mem | awk '{printf "%.1f", \$3/\$2 * 100}' || true) RAM=\$(LC_ALL=C free 2>/dev/null | grep Mem | awk '{printf "%.1f", \$3/\$2 * 100}' || true)
[ -z "\$RAM" ] && RAM=0 [ -z "\$RAM" ] && RAM=0
DISK=\$(df / 2>/dev/null | tail -1 | awk '{print \$5}' | sed 's/%//' || true) DISK=\$(df / 2>/dev/null | tail -1 | awk '{print \$5}' | sed 's/%//' || true)
[ -z "\$DISK" ] && DISK=0 [ -z "\$DISK" ] && DISK=0

8
src/Controllers/ApiController.php
View File

@@ -303,14 +303,6 @@ class ApiController
$rawBody = file_get_contents('php://input'); $rawBody = file_get_contents('php://input');
$input = json_decode($rawBody, true); $input = json_decode($rawBody, true);
$logger = \ServerManager\Core\Logger::getInstance();
$logger->warning('Push metrics received', [
'input_keys' => $input ? array_keys($input) : [],
'has_agent_key' => !empty($input['agent_key']),
'agent_key_prefix' => isset($input['agent_key']) ? substr((string)$input['agent_key'], 0, 8) . '...' : 'none',
'raw_body_prefix' => substr($rawBody, 0, 200),
]);
if (!$input || empty($input['agent_key'])) { if (!$input || empty($input['agent_key'])) {
$this->view->json(['error' => 'agent_key is required'], 401); $this->view->json(['error' => 'agent_key is required'], 401);
} }