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

Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 

Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
This commit is contained in:
Daniel Rodriguez 2022-06-23 07:53:11 +00:00
parent 7854206ede 59ea9a716e
commit d6ab78ba68
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/extras/mr/55.sql
View File

@ -41,6 +41,15 @@ ALTER TABLE `tservice` ADD COLUMN `rca` TEXT;
ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT '';
ALTER TABLE `tevent_alert` ADD COLUMN `field1_recovery` TEXT AFTER `recovery_notify`;
ALTER TABLE `tevent_alert` ADD COLUMN `field4_recovery` TEXT AFTER `field3_recovery`;
ALTER TABLE `tevent_alert` ADD COLUMN `field5_recovery` TEXT AFTER `field4_recovery`;
ALTER TABLE `tevent_alert` ADD COLUMN `field6_recovery` TEXT AFTER `field5_recovery`;
ALTER TABLE `tevent_alert` ADD COLUMN `field7_recovery` TEXT AFTER `field6_recovery`;
ALTER TABLE `tevent_alert` ADD COLUMN `field8_recovery` TEXT AFTER `field7_recovery`;
ALTER TABLE `tevent_alert` ADD COLUMN `field9_recovery` TEXT AFTER `field8_recovery`;
ALTER TABLE `tevent_alert` ADD COLUMN `field10_recovery` TEXT AFTER `field9_recovery`;
ALTER TABLE `tagente` ADD COLUMN `satellite_server` INT NOT NULL default 0;
ALTER TABLE `tmetaconsole_agent` ADD COLUMN `satellite_server` INT NOT NULL default 0;
SET @st_oum763 = (SELECT IF(

1
pandora_console/include/styles/alert.css
View File

@ -94,6 +94,7 @@ form#advanced_filters_alert textarea {
flex: 1 1 auto;
height: 5em;
min-height: 5em;
width: 2em;
}
form#advanced_filters_alert ul li label img {

10
pandora_console/pandoradb.sql
View File

@ -3019,8 +3019,16 @@ CREATE TABLE IF NOT EXISTS `tevent_alert` (
`saturday` TINYINT DEFAULT 1,
`sunday` TINYINT DEFAULT 1,
`recovery_notify` TINYINT DEFAULT 0,
`field2_recovery` TEXT ,
`field1_recovery` TEXT,
`field2_recovery` TEXT,
`field3_recovery` TEXT,
`field4_recovery` TEXT,
`field5_recovery` TEXT,
`field6_recovery` TEXT,
`field7_recovery` TEXT,
`field8_recovery` TEXT,
`field9_recovery` TEXT,
`field10_recovery` TEXT,
`id_group` MEDIUMINT UNSIGNED NULL DEFAULT 0,
`internal_counter` INT DEFAULT 0,
`last_fired` BIGINT NOT NULL DEFAULT 0,

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

@ -506,7 +506,7 @@ B<Returns>:
##########################################################################
sub pandora_evaluate_alert ($$$$$$$;$$$$) {
my ($pa_config, $agent, $data, $last_status, $alert, $utimestamp, $dbh,
$last_data_value, $correlatedItems, $event, $log) = @_;
$last_data_value, $correlated_items, $event, $log) = @_;
if (defined ($agent)) {
logger ($pa_config, "Evaluating alert '" . safe_output($alert->{'name'}) . "' for agent '" . safe_output ($agent->{'nombre'}) . "'.", 10);
@ -604,13 +604,16 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
# Cease on valid data
$status = 3;
# Unlike module alerts, correlated alerts recover when they cease!
$status = 4 if ($alert->{'recovery_notify'} == 1 && !defined($alert->{'id_template_module'}));
# Always reset
($alert->{'internal_counter'}, $alert->{'times_fired'}) = (0, 0);
}
# Recover takes precedence over cease
$status = 4 if ($alert->{'recovery_notify'} == 1);
$status = 4 if ($alert->{'recovery_notify'} == 1 && defined ($alert->{'id_template_module'}));
}
elsif ($utimestamp > $limit_utimestamp && $alert->{'internal_counter'} > 0) {
@ -691,7 +694,7 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
$pa_config,
$dbh,
$alert,
$correlatedItems,
$correlated_items,
$event,
$log
]