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

2013-02-07 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Clean code on Dataserver,
	improve error message when ignore GIS data, and change the
	way of update parent info (only in learning mode now)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7610 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-07 17:01:10 +00:00
parent d003228405
commit 2e785b165b
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-07 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
lib/PandoraFMS/DataServer.pm: Clean code on Dataserver,
improve error message when ignore GIS data, and change the
way of update parent info (only in learning mode now)
2013-02-07 Sancho Lerena <slerena@artica.es> 2013-02-07 Sancho Lerena <slerena@artica.es>
* pandora_server_installer: Fixed missing JSON dependecy * pandora_server_installer: Fixed missing JSON dependecy

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

@ -1885,7 +1885,7 @@ sub pandora_update_agent ($$$$$$$;$$$$$$) {
} }
} }
else { else {
logger($pa_config, "Agent id $agent_id positional data ignored (update_gis_data = $update_gis_data)",10); logger($pa_config, "Agent id $agent_id positional data ignored (update_gis_data (agent) = $update_gis_data ; activate_gis (server) = " . $pa_config->{'activate_gis'} . ")",10);
} }
} }

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

@ -224,7 +224,7 @@ sub process_xml_data ($$$$$) {
if ($parent_id < 1) { # Unknown parent if ($parent_id < 1) { # Unknown parent
$parent_id = 0; $parent_id = 0;
} }
logger($pa_config,"Parent_agent_name: $parent_agent_name parent_id: $parent_id",10); logger($pa_config,"Parent_agent_name: $parent_agent_name parent_id: $parent_id",10);
} }
my $valid_position_data = 1; my $valid_position_data = 1;
@ -401,13 +401,15 @@ sub process_xml_data ($$$$$) {
} }
} }
# Check if agent is disabled and return if it's disabled. Disabled agents doesnt process data # Get the data of the agent, if fail return
# 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 = get_db_single_row ($dbh, 'SELECT * FROM tagente WHERE id_agente = ?', $agent_id);
if (!defined ($agent)) { if (!defined ($agent)) {
logger($pa_config, "Error retrieving information for agent ID $agent_id",10); logger($pa_config, "Error retrieving information for agent ID $agent_id",10);
return; return;
} }
# 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.
return if ($agent->{'disabled'} == 1); return if ($agent->{'disabled'} == 1);
# Do not overwrite agent parameters if the agent is in normal mode # Do not overwrite agent parameters if the agent is in normal mode
@ -416,7 +418,9 @@ sub process_xml_data ($$$$$) {
$os_version = $agent->{'os_version'}; $os_version = $agent->{'os_version'};
$agent_version = $agent->{'agent_version'}; $agent_version = $agent->{'agent_version'};
$timezone_offset = $agent->{'timezone_offset'}; $timezone_offset = $agent->{'timezone_offset'};
} else { $parent_id = $agent->{'id_parent'};
}
else { # Learning mode
# Update agent address if necessary # Update agent address if necessary
if ($address ne '' && $address ne $agent->{'direccion'}) { if ($address ne '' && $address ne $agent->{'direccion'}) {
# Update the main address # Update the main address
@ -424,37 +428,32 @@ sub process_xml_data ($$$$$) {
# Update the addres list if necessary # Update the addres list if necessary
pandora_add_agent_address($pa_config, $agent_id, $address, $dbh); pandora_add_agent_address($pa_config, $agent_id, $address, $dbh);
} }
}
# Update parent if is allowed and is valid
if ($valid_position_data == 1 && $pa_config->{'activate_gis'} != 0) {
if (!defined($parent_agent_name)){
$parent_agent_name = "";
}
logger($pa_config,"Parent_agent_name $parent_agent_name",10);
if ($pa_config->{'update_parent'} == 1 && $parent_id != 0) {
logger($pa_config,"Parent_agent_name $parent_agent_name",10);
logger($pa_config, "Updating agent $agent_name at long: $longitude lat: $latitude alt: $altitude parent_id: $parent_id", 5);
# Update agent information including position information and the paret
pandora_update_agent($pa_config, $timestamp, $agent_id, $os_version, $agent_version, $interval, $dbh, $timezone_offset,
$longitude, $latitude, $altitude, $position_description, $parent_id);
}
else {
logger($pa_config, "Updating agent $agent_name at long: $longitude lat: $latitude alt: $altitude", 5);
# Update agent information including position information
} pandora_update_agent($pa_config, $timestamp, $agent_id, $os_version, $agent_version, $interval, $dbh, $timezone_offset, $longitude, $latitude, $altitude, $position_description);
}
else {
if ($pa_config->{'update_parent'} == 1 && $parent_id != 0) { if ($pa_config->{'update_parent'} == 1 && $parent_id != 0) {
logger($pa_config, "Updating agent $agent_name parent_id: $parent_id", 5); logger($pa_config, "Updating agent $agent_name parent_id: $parent_id", 5);
# Update agent information including the parent without position information
pandora_update_agent($pa_config, $timestamp, $agent_id, $os_version, $agent_version, $interval, $dbh, $timezone_offset, undef, undef, undef, undef, $parent_id);
} }
else { else {
logger($pa_config, "Updating agent $agent_name", 5); $parent_id = $agent->{'id_parent'};
# Update agent information without position information ignoring the parent
pandora_update_agent($pa_config, $timestamp, $agent_id, $os_version, $agent_version, $interval, $dbh, $timezone_offset);
} }
} }
# Update GIS data only if is allowed and is valid position
if ($valid_position_data == 1 && $pa_config->{'activate_gis'} != 0) {
logger($pa_config, "Updating agent $agent_name at long: $longitude lat: $latitude alt: $altitude parent_id: $parent_id", 5);
}
else {
$longitude = undef;
$latitude = undef;
$altitude = undef;
$position_description = undef;
}
# Update agent information
pandora_update_agent($pa_config, $timestamp, $agent_id, $os_version, $agent_version, $interval, $dbh, $timezone_offset,
$longitude, $latitude, $altitude, $position_description, $parent_id);
pandora_module_keep_alive ($pa_config, $agent_id, $agent_name, $server_id, $dbh); pandora_module_keep_alive ($pa_config, $agent_id, $agent_name, $server_id, $dbh);
# Process modules # Process modules