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

Added the async_recovery configuration token.

This commit is contained in:
Ramon Novoa 2014-10-01 11:58:45 +02:00
parent 6fa2cab7c6
commit f94629a61a
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_server/conf/pandora_server.conf.new
View File

@ -462,4 +462,7 @@ event_expiry_time 0
# the SNMP Enterprise Server when pandora_db is run. # the SNMP Enterprise Server when pandora_db is run.
claim_back_snmp_modules 1 claim_back_snmp_modules 1
# If set to 1 asynchronous modules that do not receive data for twice their
# interval will become normal. Set to 0 to disable.
async_recovery 1

5
pandora_server/conf/pandora_server.conf.windows
View File

@ -277,3 +277,8 @@ restart_delay 60
# Update parent from the agent xml # Update parent from the agent xml
#update_parent 1 #update_parent 1
# If set to 1 asynchronous modules that do not receive data for twice their
# interval will become normal. Set to 0 to disable.
async_recovery 1

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

@ -335,6 +335,9 @@ sub pandora_load_config {
# Event auto-expiry time window # Event auto-expiry time window
$pa_config->{"claim_back_snmp_modules"} = 1; # 5.1 $pa_config->{"claim_back_snmp_modules"} = 1; # 5.1
# Auto-recovery of asynchronous modules.
$pa_config->{"async_recovery"} = 1; # 5.1SP1
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# This values are not stored in .conf files. # This values are not stored in .conf files.
# This values should be stored in database, not in .conf files! # This values should be stored in database, not in .conf files!
@ -797,6 +800,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^claim_back_snmp_modules\s(.*)/i) { elsif ($parametro =~ m/^claim_back_snmp_modules\s(.*)/i) {
$pa_config->{'claim_back_snmp_modules'}= safe_input($1); $pa_config->{'claim_back_snmp_modules'}= safe_input($1);
} }
elsif ($parametro =~ m/^async_recovery\s+([0-1])/i) {
$pa_config->{'async_recovery'}= safe_input($1);
}
} # end of loop for parameter # } # end of loop for parameter #
# Set to RDBMS' standard port # Set to RDBMS' standard port

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

@ -4219,6 +4219,8 @@ sub pandora_module_unknown ($$) {
$module->{'id_tipo_modulo'} == 22 || $module->{'id_tipo_modulo'} == 22 ||
$module->{'id_tipo_modulo'} == 23) { $module->{'id_tipo_modulo'} == 23) {
next if ($pa_config->{"async_recovery"} == 0);
# Set the module state to normal # Set the module state to normal
logger ($pa_config, "Module " . $module->{'nombre'} . " is going to NORMAL", 10); logger ($pa_config, "Module " . $module->{'nombre'} . " is going to NORMAL", 10);
db_do ($dbh, 'UPDATE tagente_estado SET last_status = 0, estado = 0 WHERE id_agente_estado = ?', $module->{'id_agente_estado'}); db_do ($dbh, 'UPDATE tagente_estado SET last_status = 0, estado = 0 WHERE id_agente_estado = ?', $module->{'id_agente_estado'});