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

Fixed performance errors related with the planned downtimes functions

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2014-10-15 14:52:00 +02:00
parent 47bba4d676
commit 38054cc265
1 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
pandora_console/include/functions_reporting.php
View File

@ -879,15 +879,24 @@ function reporting_get_planned_downtimes_intervals ($id_agent_module, $start_dat
if (empty($malformed_planned_downtimes)) if (empty($malformed_planned_downtimes))
$malformed_planned_downtimes = array(); $malformed_planned_downtimes = array();
$sql_downtime = "SELECT DISTINCT(tpd.id), tpd.* $sql_downtime = "SELECT DISTINCT(tpdr.id), tpdr.*
FROM tplanned_downtime_agents tpda, tagente_modulo tam, tplanned_downtime tpd FROM (
LEFT OUTER JOIN tplanned_downtime_modules tpdm ON tpd.id = tpdm.id_downtime SELECT tpd.*
WHERE (tpd.id = tpda.id_downtime FROM tplanned_downtime tpd, tplanned_downtime_agents tpda, tagente_modulo tam
AND tpda.all_modules = 1 WHERE tpd.id = tpda.id_downtime
AND tpda.id_agent = tam.id_agente AND tpda.all_modules = 1
AND tam.id_agente_modulo = $id_agent_module) AND tpda.id_agent = tam.id_agente
OR (tpdm.id_agent_module = $id_agent_module)"; AND tam.id_agente_modulo = $id_agent_module
UNION
SELECT tpd.*
FROM tplanned_downtime tpd, tplanned_downtime_modules tpdm
WHERE tpd.id = tpdm.id_downtime
AND tpdm.id_agent_module = $id_agent_module
) tpdr
ORDER BY tpdr.id";
$downtimes = db_get_all_rows_sql($sql_downtime); $downtimes = db_get_all_rows_sql($sql_downtime);
if ($downtimes == false) { if ($downtimes == false) {
$downtimes = array(); $downtimes = array();
} }
@ -1179,32 +1188,54 @@ function reporting_get_planned_downtimes ($start_date, $end_date, $id_agent_modu
$periodically_condition = "($periodically_monthly_w)"; $periodically_condition = "($periodically_monthly_w)";
} }
if (!empty($id_agent_modules)) { if ($id_agent_modules !== false) {
if (empty($id_agent_modules))
return array();
$id_agent_modules_str = implode(",", $id_agent_modules); $id_agent_modules_str = implode(",", $id_agent_modules);
$agent_modules_condition_tpda = "AND tam.id_agente_modulo IN ($id_agent_modules_str)";
$agent_modules_condition_tpdm = "tpdm.id_agent_module IN ($id_agent_modules_str)"; $sql_downtime = "SELECT DISTINCT(tpdr.id), tpdr.*
FROM (
SELECT tpd.*
FROM tplanned_downtime tpd, tplanned_downtime_agents tpda, tagente_modulo tam
WHERE (tpd.id = tpda.id_downtime
AND tpda.all_modules = 1
AND tpda.id_agent = tam.id_agente
AND tam.id_agente_modulo IN ($id_agent_modules_str))
AND ((type_execution = 'periodically'
AND $periodically_condition)
OR (type_execution = 'once'
AND ((date_from >= '$start_date' AND date_to <= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$start_date')
OR (date_from <= '$end_date' AND date_to >= '$end_date'))))
UNION
SELECT tpd.*
FROM tplanned_downtime tpd, tplanned_downtime_modules tpdm
WHERE (tpd.id = tpdm.id_downtime
AND tpdm.id_agent_module IN ($id_agent_modules_str))
AND ((type_execution = 'periodically'
AND $periodically_condition)
OR (type_execution = 'once'
AND ((date_from >= '$start_date' AND date_to <= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$start_date')
OR (date_from <= '$end_date' AND date_to >= '$end_date'))))
) tpdr
ORDER BY tpdr.id";
} }
else { else {
$agent_modules_condition_tpda = ""; $sql_downtime = "SELECT *
$agent_modules_condition_tpdm = "1=1"; FROM tplanned_downtime tpd, tplanned_downtime_modules tpdm
WHERE (type_execution = 'periodically'
AND $periodically_condition)
OR (type_execution = 'once'
AND ((date_from >= '$start_date' AND date_to <= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$start_date')
OR (date_from <= '$end_date' AND date_to >= '$end_date')))";
} }
$sql_downtime = "SELECT DISTINCT(tpd.id), tpd.*
FROM tplanned_downtime_agents tpda, tagente_modulo tam, tplanned_downtime tpd
LEFT OUTER JOIN tplanned_downtime_modules tpdm ON tpd.id = tpdm.id_downtime
WHERE ((tpd.id = tpda.id_downtime
AND tpda.all_modules = 1
AND tpda.id_agent = tam.id_agente
$agent_modules_condition_tpda)
OR ($agent_modules_condition_tpdm))
AND ((type_execution = 'periodically'
AND $periodically_condition)
OR (type_execution = 'once'
AND ((date_from >= '$start_date' AND date_to <= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$end_date')
OR (date_from <= '$start_date' AND date_to >= '$start_date')
OR (date_from <= '$end_date' AND date_to >= '$end_date'))))";
$downtimes = db_get_all_rows_sql($sql_downtime); $downtimes = db_get_all_rows_sql($sql_downtime);
if ($downtimes == false) { if ($downtimes == false) {
$downtimes = array(); $downtimes = array();