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

2013-03-05 Sergio Martin <sergio.martin@artica.es> 

* util/pandora_manage.pl: Add update counts when validate 
	all the alerts of a policy in CLI option. Bug 3606759



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7779 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-03-05 10:53:17 +00:00
parent e6674e84b1
commit 4a4fc60f21
2 changed files with 17 additions and 3 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-03-05 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Add update counts when validate
all the alerts of a policy in CLI option. Bug 3606759
2013-03-04 Sergio Martin <sergio.martin@artica.es> 2013-03-04 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm * lib/PandoraFMS/Core.pm

13
pandora_server/util/pandora_manage.pl
View File

@ -2686,10 +2686,14 @@ sub cli_validate_policy_alerts() {
if($#policy_alerts_id_array == -1) { if($#policy_alerts_id_array == -1) {
print_log "[INFO] No alerts found in the policy '$policy_name'\n\n"; print_log "[INFO] No alerts found in the policy '$policy_name'\n\n";
return;
} }
$policy_alerts_id = join(',',@policy_alerts_id_array); $policy_alerts_id = join(',',@policy_alerts_id_array);
#Get the fired alerts that match with the filter to update counts after validate it
my @fired_alerts = get_db_rows ($dbh, "SELECT id_agent_module, count(id) alerts FROM talert_template_modules WHERE id_policy_alerts IN (?) AND times_fired > 0 GROUP BY id_agent_module", $policy_alerts_id);
print_log "[INFO] Validating the alerts of the policy '$policy_name'\n\n"; print_log "[INFO] Validating the alerts of the policy '$policy_name'\n\n";
my $res = db_update ($dbh, "UPDATE talert_template_modules SET times_fired = 0, internal_counter = 0 WHERE id_policy_alerts IN (?)", $policy_alerts_id); my $res = db_update ($dbh, "UPDATE talert_template_modules SET times_fired = 0, internal_counter = 0 WHERE id_policy_alerts IN (?)", $policy_alerts_id);
@ -2698,8 +2702,13 @@ sub cli_validate_policy_alerts() {
print_log "[ERROR] Alerts cannot be validated\n\n"; print_log "[ERROR] Alerts cannot be validated\n\n";
} }
else { else {
# Update fired alerts count in agents # Update fired alerts count in agents if necessary
db_update ($dbh, "UPDATE tagente SET fired_count = 0"); if($#fired_alerts > -1) {
foreach my $fired_alert (@fired_alerts) {
my $id_agent = get_module_agent_id($dbh, $fired_alert->{'id_agent_module'});
db_update ($dbh, 'UPDATE tagente SET fired_count=fired_count-? WHERE id_agente=?', $fired_alert->{'alerts'}, $id_agent);
}
}
} }
} }