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

Merge branch '1064-Acumulación-de-XMLs-al-finalizar-paradas-planificadas-dev' into 'develop' 

Changed to disabled agents in planned downtime

See merge request !630
This commit is contained in:
nramon 2017-06-29 12:21:54 +02:00
parent 031ff3f6d2 4244e23737
commit 204681dbc0
1 changed files with 43 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1624,40 +1624,34 @@ Start the planned downtime, the once type.
sub pandora_planned_downtime_set_disabled_elements($$$) { sub pandora_planned_downtime_set_disabled_elements($$$) {
my ($pa_config, $dbh, $downtime) = @_; my ($pa_config, $dbh, $downtime) = @_;
my @downtime_agents = get_db_rows($dbh, 'SELECT * my $only_alerts = 0;
FROM tplanned_downtime_agents
WHERE id_downtime = ' . $downtime->{'id'});
foreach my $downtime_agent (@downtime_agents) {
my $only_alerts = 0;
if ($downtime->{'only_alerts'} == 0) { if ($downtime->{'only_alerts'} == 0) {
if ($downtime->{'type_downtime'} eq 'disable_agents_alerts') { if ($downtime->{'type_downtime'} eq 'disable_agents_alerts') {
$only_alerts = 1; $only_alerts = 1;
}
} }
}
if ($only_alerts == 0) { if ($only_alerts == 0) {
db_do($dbh,'UPDATE tplanned_downtime_agents tp, tagente ta
if($pa_config->{'include_agents'} == 0){ SET tp.manually_disabled = ta.disabled
db_do($dbh, 'UPDATE tplanned_downtime_agents WHERE tp.id_agent = ta.id_agente AND tp.id_downtime = ?',$downtime->{'id'});
SET manually_disabled = 1 WHERE id_agent IN (SELECT id_agente FROM tagente WHERE disabled = 1 AND id_agente = ?)
AND id_downtime = ' . $downtime->{'id'}, $downtime_agent->{'id_agent'}); db_do($dbh,'UPDATE tagente ta, tplanned_downtime_agents tpa
} SET ta.disabled = 1 WHERE tpa.id_agent = ta.id_agente AND
tpa.id_downtime = ?',$downtime->{'id'});
db_do ($dbh, 'UPDATE tagente
SET disabled = 1 } else {
WHERE id_agente = ?', $downtime_agent->{'id_agent'}); my @downtime_agents = get_db_rows($dbh, 'SELECT *
FROM tplanned_downtime_agents
WHERE id_downtime = ' . $downtime->{'id'});
foreach my $downtime_agent (@downtime_agents) {
db_do ($dbh, 'UPDATE talert_template_modules tat, tagente_modulo tam
SET tat.disabled = 1
WHERE tat.id_agent_module = tam.id_agente_modulo
AND tam.id_agente = ?', $downtime_agent->{'id_agent'});
} }
else {
db_do ($dbh, 'UPDATE talert_template_modules
SET disabled = 1
WHERE id_agent_module IN (
SELECT id_agente_modulo
FROM tagente_modulo
WHERE id_agente = ?)', $downtime_agent->{'id_agent'});
}
} }
} }
@ -1671,39 +1665,29 @@ Start the planned downtime, the once type.
sub pandora_planned_downtime_unset_disabled_elements($$$) { sub pandora_planned_downtime_unset_disabled_elements($$$) {
my ($pa_config, $dbh, $downtime) = @_; my ($pa_config, $dbh, $downtime) = @_;
my @downtime_agents = get_db_rows($dbh, 'SELECT * my $only_alerts = 0;
FROM tplanned_downtime_agents
WHERE id_downtime = ' . $downtime->{'id'});
foreach my $downtime_agent (@downtime_agents) {
my $only_alerts = 0;
if ($downtime->{'only_alerts'} == 0) { if ($downtime->{'only_alerts'} == 0) {
if ($downtime->{'type_downtime'} eq 'disable_agents_alerts') { if ($downtime->{'type_downtime'} eq 'disable_agents_alerts') {
$only_alerts = 1; $only_alerts = 1;
}
} }
}
if ($only_alerts == 0) { if ($only_alerts == 0) {
db_do ($dbh, 'UPDATE tagente db_do($dbh,'UPDATE tagente ta, tplanned_downtime_agents tpa
SET disabled = 0 set ta.disabled = 0 WHERE tpa.id_agent = ta.id_agente AND
WHERE id_agente = ?', $downtime_agent->{'id_agent'}); tpa.manually_disabled = 0 AND tpa.id_downtime = ?',$downtime->{'id'});
} else {
if($pa_config->{'include_agents'} == 0){ my @downtime_agents = get_db_rows($dbh, 'SELECT *
db_do ($dbh, 'UPDATE tagente FROM tplanned_downtime_agents
SET disabled = 1 WHERE id_downtime = ' . $downtime->{'id'});
WHERE id_agente IN (SELECT id_agent FROM tplanned_downtime_agents WHERE manually_disabled = 1 and id_downtime = ?)',$downtime_agent->{'id_downtime'});
} foreach my $downtime_agent (@downtime_agents) {
db_do ($dbh, 'UPDATE talert_template_modules tat, tagente_modulo tam
SET tat.disabled = 0
WHERE tat.id_agent_module = tam.id_agente_modulo
AND tam.id_agente = ?', $downtime_agent->{'id_agent'});
} }
else {
db_do ($dbh, 'UPDATE talert_template_modules
SET disabled = 0
WHERE id_agent_module IN (
SELECT id_agente_modulo
FROM tagente_modulo
WHERE id_agente = ?)', $downtime_agent->{'id_agent'});
}
} }
} }