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-8622-alert-server-solo-el-master-dispara-alertas' into 'develop' 

RR alertserver

See merge request artica/pandorafms!4761
This commit is contained in:
Daniel Rodriguez 2022-03-18 11:05:36 +00:00
parent 4c418f5979 97a48ab714
commit a4947d5449
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_server/lib/PandoraFMS/AlertServer.pm
View File

@ -66,8 +66,8 @@ sub new ($$$) {
# Call the constructor of the parent class # Call the constructor of the parent class
my $self = $class->SUPER::new($config, ALERTSERVER, \&PandoraFMS::AlertServer::data_producer, \&PandoraFMS::AlertServer::data_consumer, $dbh); my $self = $class->SUPER::new($config, ALERTSERVER, \&PandoraFMS::AlertServer::data_producer, \&PandoraFMS::AlertServer::data_consumer, $dbh);
bless $self, $class; bless $self, $class;
return $self; return $self;
} }
################################################################################ ################################################################################
@ -91,6 +91,24 @@ sub data_producer ($) {
my @tasks; my @tasks;
my @rows; my @rows;
my $n_servers = get_db_value($dbh,
'SELECT COUNT(*) FROM `tserver` WHERE `server_type` = ? AND `status` = 1',
ALERTSERVER
);
my $i = 0;
my %servers = map { $_->{'name'} => $i++; } get_db_rows($dbh,
'SELECT `name` FROM `tserver` WHERE `server_type` = ? AND `status` = 1 ORDER BY `name` ASC',
ALERTSERVER
);
if ($n_servers eq 0) {
$n_servers = 1;
}
# Retrieve alerts to be evaluated.
my $server_type_id = $servers{$pa_config->{'servername'}};
# Make a local copy of locked alerts. # Make a local copy of locked alerts.
$AlertSem->down (); $AlertSem->down ();
@ -98,9 +116,14 @@ sub data_producer ($) {
$AlertSem->up (); $AlertSem->up ();
# Check the execution queue. # Check the execution queue.
if (pandora_is_master($pa_config) == 1) { my $sql = sprintf(
@rows = get_db_rows ($dbh, 'SELECT id, utimestamp FROM talert_execution_queue ORDER BY utimestamp ASC'); 'SELECT id, utimestamp FROM talert_execution_queue
} WHERE `id` %% %d = %d ORDER BY utimestamp ASC',
$n_servers,
$server_type_id
);
@rows = get_db_rows($dbh, $sql);
# Queue alerts. # Queue alerts.
foreach my $row (@rows) { foreach my $row (@rows) {