tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-07-10 Ramon Novoa <rnovoa@artica.es> 

* util/pandora_db.pl: Ignore reports if the metaconsole is enabled, since
	  agents are never local.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8504 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-07-10 09:27:21 +00:00
parent f1a3a453ca
commit 5dd055457b
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-07-10 Ramon Novoa <rnovoa@artica.es>
* util/pandora_db.pl: Ignore reports if the metaconsole is enabled, since
agents are never local.
2013-07-09 Miguel de Dios <miguel.dedios@artica.es> 2013-07-09 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/PredictionServer.pm, util/pandora_xml_stress.pl: * lib/PandoraFMS/PredictionServer.pm, util/pandora_xml_stress.pl:

23
pandora_server/util/pandora_db.pl
View File

@ -263,17 +263,22 @@ sub pandora_purgedb ($$) {
} }
# Purge the reports # Purge the reports
log_message ('PURGE', "Delete contents in report that have some deleted modules."); if (defined($conf->{'_enterprise_installed'}) && $conf->{'_enterprise_installed'} eq '1' &&
db_do ($dbh, "DELETE FROM treport_content WHERE id_agent_module NOT IN (SELECT id_agente_modulo FROM tagente_modulo) AND id_agent_module != 0;"); defined($conf->{'_metaconsole'}) && $conf->{'_metaconsole'} eq '1'){
db_do ($dbh, "DELETE FROM treport_content_item WHERE id_agent_module NOT IN (SELECT id_agente_modulo FROM tagente_modulo) AND id_agent_module != 0;"); log_message ('PURGE', "Metaconsole enabled, ignoring reports.");
db_do ($dbh, "DELETE FROM treport_content_sla_combined WHERE id_agent_module NOT IN (SELECT id_agente_modulo FROM tagente_modulo) AND id_agent_module != 0;"); } else {
log_message ('PURGE', "Delete contents in report that have some deleted modules.");
db_do ($dbh, "DELETE FROM treport_content WHERE id_agent_module NOT IN (SELECT id_agente_modulo FROM tagente_modulo) AND id_agent_module != 0;");
db_do ($dbh, "DELETE FROM treport_content_item WHERE id_agent_module NOT IN (SELECT id_agente_modulo FROM tagente_modulo) AND id_agent_module != 0;");
db_do ($dbh, "DELETE FROM treport_content_sla_combined WHERE id_agent_module NOT IN (SELECT id_agente_modulo FROM tagente_modulo) AND id_agent_module != 0;");
log_message ('PURGE', "Delete contents in report that have some deleted agents."); log_message ('PURGE', "Delete contents in report that have some deleted agents.");
db_do ($dbh, "DELETE FROM treport_content WHERE id_agent NOT IN (SELECT id_agente FROM tagente) AND id_agent != 0;"); db_do ($dbh, "DELETE FROM treport_content WHERE id_agent NOT IN (SELECT id_agente FROM tagente) AND id_agent != 0;");
log_message ('PURGE', "Delete empty contents in report (like SLA or Exception)."); log_message ('PURGE', "Delete empty contents in report (like SLA or Exception).");
db_do ($dbh, "DELETE FROM treport_content WHERE type LIKE 'exception' AND id_rc NOT IN (SELECT id_report_content FROM treport_content_item);"); db_do ($dbh, "DELETE FROM treport_content WHERE type LIKE 'exception' AND id_rc NOT IN (SELECT id_report_content FROM treport_content_item);");
db_do ($dbh, "DELETE FROM treport_content WHERE type LIKE 'sla' AND id_rc NOT IN (SELECT id_report_content FROM treport_content_sla_combined);"); db_do ($dbh, "DELETE FROM treport_content WHERE type LIKE 'sla' AND id_rc NOT IN (SELECT id_report_content FROM treport_content_sla_combined);");
}
# Delete old netflow data # Delete old netflow data
log_message ('PURGE', "Deleting old netflow data."); log_message ('PURGE', "Deleting old netflow data.");