From c05ccc4f378de0e9f5bf71b4d945df5880ab8506 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Wed, 20 May 2026 10:37:04 +0200 Subject: [PATCH 1/3] =?UTF-8?q?fix(ogcore):=20corregir=20sistema=20journal?= =?UTF-8?q?-pull=20para=20m=C3=A1quinas=20con=20journal=20activo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - journal-pull@.service: cambio a --split-mode=host con salida a directorio por IP para evitar "header out-of-date" en máquinas con journal muy activo; añadido boot=0 para descargar solo el boot actual y evitar descargar gigabytes de histórico; Restart=always para reconectar tras cierre limpio - DiskLogsAction: adaptado a directorio (--directory) en lugar de fichero (.journal); usa is_dir() en lugar de file_exists() --- etc/systemd/system/journal-pull@.service | 6 +++--- src/Controller/System/DiskLogsAction.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/systemd/system/journal-pull@.service b/etc/systemd/system/journal-pull@.service index b15e956..56de325 100644 --- a/etc/systemd/system/journal-pull@.service +++ b/etc/systemd/system/journal-pull@.service @@ -6,10 +6,10 @@ Wants=network-online.target [Service] User=systemd-journal-remote Group=systemd-journal-remote -ExecStartPre=/bin/sh -c 'f=/var/log/journal/remote/%i.journal; [ -f "$f" ] && journalctl --file="$f" -n 1 --no-pager 2>/dev/null | grep -q "." || rm -f "$f"' -ExecStart=/usr/lib/systemd/systemd-journal-remote --url=http://%i:19531/entries?SYSLOG_IDENTIFIER=ogcore&SYSLOG_IDENTIFIER=oggui&SYSLOG_IDENTIFIER=ogdhcp&SYSLOG_IDENTIFIER=ogboot&SYSLOG_IDENTIFIER=ogrepo-api&SYSLOG_IDENTIFIER=ogrepo-api_DEBUG&SYSLOG_IDENTIFIER=kea-dhcp4&SYSLOG_IDENTIFIER=kea-ctrl-agent&SYSLOG_IDENTIFIER=DhcpLFC&SYSLOG_IDENTIFIER=kea-dhcp6&SYSLOG_IDENTIFIER=tftpd-hpa&SYSLOG_IDENTIFIER=%%28smbd%%29&SYSLOG_IDENTIFIER=%%28nmbd%%29 --split-mode=none --output=/var/log/journal/remote/%i.journal +ExecStartPre=/bin/mkdir -p /var/log/journal/remote/%i +ExecStart=/usr/lib/systemd/systemd-journal-remote --url=http://%i:19531/entries?boot=0&SYSLOG_IDENTIFIER=ogcore&SYSLOG_IDENTIFIER=oggui&SYSLOG_IDENTIFIER=ogdhcp&SYSLOG_IDENTIFIER=ogboot&SYSLOG_IDENTIFIER=ogrepo-api&SYSLOG_IDENTIFIER=ogrepo-api_DEBUG&SYSLOG_IDENTIFIER=kea-dhcp4&SYSLOG_IDENTIFIER=kea-ctrl-agent&SYSLOG_IDENTIFIER=DhcpLFC&SYSLOG_IDENTIFIER=kea-dhcp6&SYSLOG_IDENTIFIER=tftpd-hpa&SYSLOG_IDENTIFIER=%%28smbd%%29&SYSLOG_IDENTIFIER=%%28nmbd%%29 --split-mode=host --output=/var/log/journal/remote/%i/ Restart=always -RestartSec=10 +RestartSec=30 [Install] WantedBy=multi-user.target diff --git a/src/Controller/System/DiskLogsAction.php b/src/Controller/System/DiskLogsAction.php index a9b1078..76e01da 100644 --- a/src/Controller/System/DiskLogsAction.php +++ b/src/Controller/System/DiskLogsAction.php @@ -39,15 +39,15 @@ class DiskLogsAction extends AbstractController $args = ['--no-pager', '--output=json', sprintf('-n %d', $lines)]; if ($host) { - // Host remoto: leer del fichero journal nombrado por IP - $journalFile = sprintf('%s/%s.journal', self::REMOTE_JOURNAL_DIR, $host); - if (!file_exists($journalFile)) { + // Host remoto: leer del directorio journal nombrado por IP + $journalDir = sprintf('%s/%s', self::REMOTE_JOURNAL_DIR, $host); + if (!is_dir($journalDir)) { return new JsonResponse( ['error' => sprintf('No se encontró el journal para el host %s', $host)], Response::HTTP_NOT_FOUND ); } - $args[] = sprintf('--file=%s', escapeshellarg($journalFile)); + $args[] = sprintf('--directory=%s', escapeshellarg($journalDir)); } // Múltiples SYSLOG_IDENTIFIER se pasan como matches separados → journalctl los aplica con OR -- 2.40.1 From e5a8a43a4b1dcfc39ccb9252c083b0189c328ea1 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Fri, 22 May 2026 12:59:52 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Modificada=20accion=20WolAction,=20calcula?= =?UTF-8?q?=20la=20ip=20de=20broadcast=20para=20el=20comando=20wakeonlan,?= =?UTF-8?q?=20para=20ello,=20detecta=20la=20mascara=20de=20red=20usando=20?= =?UTF-8?q?la=20subred=20configurada=20en=20el=20dhcp,=20si=20no=20se=20us?= =?UTF-8?q?a=20ogdhcp,=20busca=20la=20m=C3=A1scara=20de=20red=20en=20la=20?= =?UTF-8?q?configuraci=C3=B3n=20de=20la=20OU,=20en=20caso=20de=20tampoco?= =?UTF-8?q?=20encontrala,=20usa=20la=20ip=20de=20broadcast=20por=20defecto?= =?UTF-8?q?=20del=20comando=20wakeonlan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ src/Controller/OgRepository/WoLAction.php | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f866ca7..0018572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.8.3] - 2026-05-22 + +### Improved +- Modificada accion WolAction, calcula la ip de broadcast para el comando wakeonlan, para ello, detecta la mascara de red usando la subred configurada en el dhcp, si no se usa ogdhcp, busca la máscara de red en la configuración de la OU, en caso de tampoco encontrala, usa la ip de broadcast por defecto del comando wakeonlan + ## [1.8.2] - 2026-05-18 ### Improved diff --git a/src/Controller/OgRepository/WoLAction.php b/src/Controller/OgRepository/WoLAction.php index c712ac0..a5b9562 100644 --- a/src/Controller/OgRepository/WoLAction.php +++ b/src/Controller/OgRepository/WoLAction.php @@ -48,19 +48,33 @@ class WoLAction extends AbstractOgRepositoryController throw new BadRequestHttpException('IP is required'); } + // 1. Buscamos la máscara. Si no hay por ningún lado, devolverá null. + $netmask = $client->getSubnet()?->getNetmask()?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getNetmask(); + + // 2. Broadcast por defecto (global) + $broadcastIp = "255.255.255.255"; + + // 3. Si encontramos una máscara válida, calculamos el broadcast específico + if ($netmask) { + $ipLong = ip2long($client->getIp()); + $netmaskLong = ip2long($netmask); + $broadcastIp = long2ip($ipLong | (~$netmaskLong)); + } + $params = [ 'json' => [ - 'broadcast_ip' => '255.255.255.255', + 'broadcast_ip' => $broadcastIp, 'mac' => $client->getMac() ] ]; - $this->logger->info('Sending WoL to client', ['mac' => $client->getMac()]); + + $this->logger->info('Sending WoL to client', ['mac' => $client->getMac(), 'broadcast_ip' => $broadcastIp]); $content = $this->createRequest('POST', 'http://'.$repository->getIp(). ':8006/ogrepository/v1/wol', $params); if (isset($content['error']) && $content['code'] === Response::HTTP_INTERNAL_SERVER_ERROR ) { - $this->logger->error('Error sending WoL to client', ['mac' => $client->getMac()]); + $this->logger->error('Error sending WoL to client', ['mac' => $client->getMac(), 'broadcast_ip' => $broadcastIp]); continue; } -- 2.40.1 From cb182d98e9081feeb3f03dcbc603476e90008ecf Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Fri, 22 May 2026 19:39:55 +0200 Subject: [PATCH 3/3] =?UTF-8?q?feat(ogcore):=20ordenar=20aulas=20y=20centr?= =?UTF-8?q?os=20alfab=C3=A9ticamente=20por=20defecto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Añade orden ascendente por nombre en el recurso OrganizationalUnit para que el listado de aulas y centros se devuelva siempre en orden alfabético sin necesidad de parámetros adicionales en la petición. --- config/api_platform/OrganizationalUnit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/api_platform/OrganizationalUnit.yaml b/config/api_platform/OrganizationalUnit.yaml index 2853aa1..b383a20 100644 --- a/config/api_platform/OrganizationalUnit.yaml +++ b/config/api_platform/OrganizationalUnit.yaml @@ -1,5 +1,6 @@ resources: App\Entity\OrganizationalUnit: + order: { name: 'ASC' } processor: App\State\Processor\OrganizationalUnitProcessor output: App\Dto\Output\OrganizationalUnitOutput input: App\Dto\Input\OrganizationalUnitInput -- 2.40.1