tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix code style

Browse Source
This commit is contained in:
Calvo 2023-03-03 11:50:21 +01:00
parent 2386b87c1d
commit 4b31bc340e
2 changed files with 76 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pandora_console/include/functions_servers.php
View File

@ -1021,22 +1021,22 @@ function servers_get_info($id_server=-1)
'SELECT COUNT(tam.id_agente_modulo) AS module_lag, 'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag" AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
FROM ( FROM (
SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
FROM tagente_estado FROM tagente_estado
WHERE tagente_estado.current_interval > 0 WHERE tagente_estado.current_interval > 0
AND tagente_estado.last_execution_try > 0 AND tagente_estado.last_execution_try > 0
AND tagente_estado.running_by = %d AND tagente_estado.running_by = %d
) tae ) tae
JOIN ( JOIN (
SELECT tagente_modulo.id_agente_modulo SELECT tagente_modulo.id_agente_modulo
FROM tagente_modulo LEFT JOIN tagente FROM tagente_modulo LEFT JOIN tagente
ON tagente_modulo.id_agente = tagente.id_agente ON tagente_modulo.id_agente = tagente.id_agente
WHERE tagente.disabled = 0 WHERE tagente.disabled = 0
AND tagente_modulo.disabled = 0 AND tagente_modulo.disabled = 0
) tam ) tam
ON tae.id_agente_modulo = tam.id_agente_modulo ON tae.id_agente_modulo = tam.id_agente_modulo
WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval) WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)', AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
$server['id_server'] $server['id_server']
); );
} else { } else {
@ -1044,25 +1044,25 @@ function servers_get_info($id_server=-1)
// MySQL 8.0 has function lag(). So, lag must be enclosed in quotations. // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
$sql = sprintf( $sql = sprintf(
'SELECT COUNT(tam.id_agente_modulo) AS module_lag, 'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag" AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
FROM ( FROM (
SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
FROM tagente_estado FROM tagente_estado
WHERE tagente_estado.current_interval > 0 WHERE tagente_estado.current_interval > 0
AND tagente_estado.last_execution_try > 0 AND tagente_estado.last_execution_try > 0
AND tagente_estado.running_by = %d AND tagente_estado.running_by = %d
) tae ) tae
JOIN ( JOIN (
SELECT tagente_modulo.id_agente_modulo SELECT tagente_modulo.id_agente_modulo
FROM tagente_modulo LEFT JOIN tagente FROM tagente_modulo LEFT JOIN tagente
ON tagente_modulo.id_agente = tagente.id_agente ON tagente_modulo.id_agente = tagente.id_agente
WHERE tagente.disabled = 0 WHERE tagente.disabled = 0
AND tagente_modulo.disabled = 0 AND tagente_modulo.disabled = 0
AND tagente_modulo.id_tipo_modulo < 5 AND tagente_modulo.id_tipo_modulo < 5
) tam ) tam
ON tae.id_agente_modulo = tam.id_agente_modulo ON tae.id_agente_modulo = tam.id_agente_modulo
WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1) WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)', AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
$server['id_server'] $server['id_server']
); );
} }

90
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -5627,50 +5627,56 @@ sub pandora_server_statistics ($$) {
# Non-dataserver LAG calculation: # Non-dataserver LAG calculation:
if ($server->{"server_type"} != DATASERVER){ if ($server->{"server_type"} != DATASERVER){
$lag_row = get_db_single_row (
$lag_row = get_db_single_row ($dbh, $dbh,
"SELECT COUNT(tam.id_agente_modulo) AS module_lag, "SELECT COUNT(tam.id_agente_modulo) AS module_lag,
AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag
FROM ( FROM (
SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
FROM tagente_estado FROM tagente_estado
WHERE tagente_estado.current_interval > 0 WHERE tagente_estado.current_interval > 0
AND tagente_estado.last_execution_try > 0 AND tagente_estado.last_execution_try > 0
AND tagente_estado.running_by = ? AND tagente_estado.running_by = ?
) tae ) tae
JOIN ( JOIN (
SELECT tagente_modulo.id_agente_modulo SELECT tagente_modulo.id_agente_modulo
FROM tagente_modulo LEFT JOIN tagente FROM tagente_modulo LEFT JOIN tagente
ON tagente_modulo.id_agente = tagente.id_agente ON tagente_modulo.id_agente = tagente.id_agente
WHERE tagente.disabled = 0 WHERE tagente.disabled = 0
AND tagente_modulo.disabled = 0 AND tagente_modulo.disabled = 0
) tam ) tam
ON tae.id_agente_modulo = tam.id_agente_modulo ON tae.id_agente_modulo = tam.id_agente_modulo
WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval) WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)", $server->{"id_server"}); AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)",
} $server->{"id_server"}
);
}
# Dataserver LAG calculation: # Dataserver LAG calculation:
else { else {
$lag_row = get_db_single_row ($dbh, "SELECT COUNT(tam.id_agente_modulo) AS module_lag, $lag_row = get_db_single_row (
AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag $dbh,
FROM ( "SELECT COUNT(tam.id_agente_modulo) AS module_lag,
SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag
FROM tagente_estado FROM (
WHERE tagente_estado.current_interval > 0 SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
AND tagente_estado.last_execution_try > 0 FROM tagente_estado
AND tagente_estado.running_by = ? WHERE tagente_estado.current_interval > 0
) tae AND tagente_estado.last_execution_try > 0
JOIN ( AND tagente_estado.running_by = ?
SELECT tagente_modulo.id_agente_modulo ) tae
FROM tagente_modulo LEFT JOIN tagente JOIN (
ON tagente_modulo.id_agente = tagente.id_agente SELECT tagente_modulo.id_agente_modulo
WHERE tagente.disabled = 0 FROM tagente_modulo LEFT JOIN tagente
AND tagente_modulo.disabled = 0 ON tagente_modulo.id_agente = tagente.id_agente
AND tagente_modulo.id_tipo_modulo < 5 WHERE tagente.disabled = 0
) tam AND tagente_modulo.disabled = 0
ON tae.id_agente_modulo = tam.id_agente_modulo AND tagente_modulo.id_tipo_modulo < 5
WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1) ) tam
AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)", $server->{"id_server"}); ON tae.id_agente_modulo = tam.id_agente_modulo
WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
AND (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)",
$server->{"id_server"}
);
} }
$server->{"module_lag"} = $lag_row->{'module_lag'}; $server->{"module_lag"} = $lag_row->{'module_lag'};