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

2010-09-21 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/DataServer.pm: Do not update agent configuration if
	  not in learning mode. Fixes bug #3069710.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3268 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-09-21 15:32:53 +00:00
parent 88ee12776c
commit 69171cfa6f
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 @@
2010-09-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not update agent configuration if
not in learning mode. Fixes bug #3069710.
2010-09-21 Sergio Martin <sergio.martin@artica.es> 2010-09-21 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Fixed the agent deletion and * util/pandora_manage.pl: Fixed the agent deletion and

15
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -304,11 +304,20 @@ sub process_xml_data ($$$$$) {
# Check if agent is disabled and return if it's disabled. Disabled agents doesnt process data # Check if agent is disabled and return if it's disabled. Disabled agents doesnt process data
# in order to avoid not only events, also possible invalid data coming from agents. # in order to avoid not only events, also possible invalid data coming from agents.
my $agent = get_db_single_row ($dbh, 'SELECT * FROM tagente WHERE id_agente = ?', $agent_id);
my $agent_disabled = get_db_value ($dbh, 'SELECT disabled FROM tagente WHERE id_agente = ?', $agent_id); if (!defined ($agent)) {
if (defined ($agent_disabled) && $agent_disabled == 1){ logger($pa_config, "Error retrieving information for agent ID $agent_id",10);
return; return;
} }
return if ($agent->{'disabled'} == 1);
# Do not overwrite agent parameters if the agent is in normal mode
if ($agent->{'modo'} == 0) {;
$interval = $agent->{'intervalo'};
$os_version = $agent->{'os_version'};
$agent_version = $agent->{'agent_version'};
$timezone_offset = $agent->{'timezone_offset'};
}
if ($valid_position_data == 1 && $pa_config->{'activate_gis'} != 0) { if ($valid_position_data == 1 && $pa_config->{'activate_gis'} != 0) {
if (!defined($parent_agent_name)){ if (!defined($parent_agent_name)){