tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added support for multiple master servers.

Browse Source
This commit is contained in:
Ramon Novoa 2015-01-13 10:54:19 +01:00
parent 77d54785c8
commit b88c52ccba
7 changed files with 136 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_server/bin/pandora_server
View File

@ -264,6 +264,8 @@ sub pandora_server_tasks ($) {
my $counter = 0;
while ($RUN == 1) {
eval{
if (pandora_is_master($pa_config) == 1) {
# TASKS EXECUTED EVERY 5 SECONDS (Low latency tasks)
# --------------------------------------------------
if (($counter % 5) == 0) {
@ -347,6 +349,11 @@ sub pandora_server_tasks ($) {
else {
$counter++;
}
}
else {
# Do an additional sleep if we are not the master server
sleep ($pa_config->{'server_threshold'});
}
};
sleep (1);
@ -518,7 +525,7 @@ sub main() {
pandora_startup ();
# Start thread to execute server tasks on the master server
threads->create('pandora_server_tasks', (\%Config))->detach() if ($Config{"pandora_master"} == 1);
threads->create('pandora_server_tasks', (\%Config))->detach();
# Generate 'going up' events
foreach my $server (@Servers) {
@ -568,9 +575,11 @@ sub main() {
$server->update();
}
# Not needed. The console assumes a server is down if it has not updated its status in the last 15 minutes.
## Update fallen servers
#db_do ($DBH, "UPDATE tserver SET status = 0 WHERE keepalive < ?", strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - $Config{'keepalive'})));
# Update fallen servers
db_do ($DBH, "UPDATE tserver SET status = 0 WHERE keepalive < ?", strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - $Config{'keepalive'})));
# Set the master server
pandora_set_master(\%Config, $DBH);
};
# Restart on error or auto restart

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -850,8 +850,8 @@ sub pandora_load_config {
if ($pa_config->{"pandora_check"} == 1) {
print " [*] MD5 Security enabled.\n";
}
if ($pa_config->{"pandora_master"} == 1) {
print " [*] This server is running in MASTER mode.\n";
if ($pa_config->{"pandora_master"} != 0) {
print " [*] This server is running with MASTER priority " . $pa_config->{"pandora_master"} . "\n";
}
}

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

@ -165,6 +165,7 @@ our @EXPORT = qw(
pandora_get_module_phone_tags
pandora_get_module_email_tags
pandora_get_os
pandora_is_master
pandora_mark_agent_for_alert_update
pandora_mark_agent_for_module_update
pandora_module_keep_alive
@ -189,6 +190,7 @@ our @EXPORT = qw(
pandora_reset_server
pandora_server_keep_alive
pandora_set_event_storm_protection
pandora_set_master
pandora_update_agent
pandora_update_agent_address
pandora_update_agent_alert_count
@ -225,6 +227,9 @@ our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not exe
# Event storm protection (no alerts or events)
our $EventStormProtection :shared = 0;
# Current master server
my $Master :shared = 0;
##########################################################################
# Return the agent given the IP address.
##########################################################################
@ -4221,6 +4226,43 @@ sub pandora_self_monitoring ($$) {
close (XMLFILE);
}
##########################################################################
=head2 C<< set_master (I<$pa_config>, I<$dbh>) >>
Set the current master server.
=cut
##########################################################################
sub pandora_set_master ($$) {
my ($pa_config, $dbh) = @_;
my $current_master = get_db_value ($dbh, 'SELECT name FROM tserver
WHERE master <> 0 AND status = 1
ORDER BY master DESC LIMIT 1');
return unless defined($current_master) and ($current_master ne $Master);
logger($pa_config, "Server $current_master is the current master.", 1);
$Master = $current_master;
}
##########################################################################
=head2 C<< is_master (I<$pa_config>) >>
Returns 1 if this server is the current master, 0 otherwise.
=cut
##########################################################################
sub pandora_is_master ($) {
my ($pa_config) = @_;
if ($Master eq $pa_config->{'servername'}) {
return 1;
}
return 0;
}
##########################################################################
=head2 C<< pandora_module_unknown (I<$pa_config>, I<$dbh>) >>

2
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -96,7 +96,7 @@ sub data_producer ($) {
my @rows;
my $network_filter = enterprise_hook ('get_network_filter', [$pa_config]);
if ($pa_config->{'pandora_master'} == 0) {
if (pandora_is_master($pa_config) == 0) {
@rows = get_db_rows ($dbh, 'SELECT tagente_modulo.id_agente_modulo, tagente_modulo.flag, tagente_estado.current_interval + tagente_estado.last_execution_try AS time_left, last_execution_try
FROM tagente, tagente_modulo, tagente_estado
WHERE server_name = ?

2
pandora_server/lib/PandoraFMS/PluginServer.pm
View File

@ -96,7 +96,7 @@ sub data_producer ($) {
my @tasks;
my @rows;
if ($pa_config->{'pandora_master'} != 1) {
if (pandora_is_master($pa_config) == 0) {
@rows = get_db_rows ($dbh, 'SELECT tagente_modulo.id_agente_modulo, tagente_modulo.flag, tagente_estado.current_interval + tagente_estado.last_execution_try AS time_left, last_execution_try
FROM tagente, tagente_modulo, tagente_estado
WHERE server_name = ?

2
pandora_server/lib/PandoraFMS/PredictionServer.pm
View File

@ -92,7 +92,7 @@ sub data_producer ($) {
my @tasks;
my @rows;
if ($pa_config->{'pandora_master'} != 1) {
if (pandora_is_master($pa_config) == 0) {
@rows = get_db_rows ($dbh, 'SELECT tagente_modulo.id_agente_modulo,
tagente_modulo.flag, last_execution_try
FROM tagente, tagente_modulo, tagente_estado

2
pandora_server/lib/PandoraFMS/WMIServer.pm
View File

@ -94,7 +94,7 @@ sub data_producer ($) {
my @tasks;
my @rows;
if ($pa_config->{'pandora_master'} != 1) {
if (pandora_is_master($pa_config) == 0) {
@rows = get_db_rows ($dbh, 'SELECT tagente_modulo.id_agente_modulo, tagente_modulo.flag, tagente_estado.current_interval + tagente_estado.last_execution_try AS time_left, last_execution_try
FROM tagente, tagente_modulo, tagente_estado
WHERE server_name = ?