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

Merge branch '1425-new-improvements-in-route-analyzer-feature-dev' into 'develop' 

1425 new improvements in route analyzer feature dev

See merge request !919
This commit is contained in:
vgilc 2017-10-11 17:40:55 +02:00
parent 9b4288501a 1e6f3a9d9b
commit c1fe2a3447
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/bad_rutas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
pandora_console/images/ok_rutas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@ -562,11 +562,15 @@ sub process_xml_data ($$$$$) {
# No parent module defined
my $parent_module_name = get_tag_value ($module_data, 'module_parent', undef);
next if (! defined ($parent_module_name));
my $parent_module_unlink = get_tag_value ($module_data, 'module_parent_unlink', undef);
next if ( (! defined ($parent_module_name)) && (! defined($parent_module_unlink)));
link_modules($pa_config, $dbh, $agent_id, $module_name, $parent_module_name);
link_modules($pa_config, $dbh, $agent_id, $module_name, $parent_module_name) if (defined($parent_module_name) && ($parent_module_name ne ''));
unlink_modules($pa_config, $dbh, $agent_id, $module_name) if (defined($parent_module_unlink) && ($parent_module_unlink eq '1'));
}
# Process inventory modules
enterprise_hook('process_inventory_data', [$pa_config, $data, $server_id, $agent_name,
$interval, $timestamp, $dbh]);
@ -602,7 +606,8 @@ sub process_module_data ($$$$$$$$$$) {
'str_warning' => '', 'str_critical' => '', 'critical_instructions' => '', 'warning_instructions' => '',
'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0,
'module_ff_interval' => 0, 'alert_template' => '', 'crontab' => '', 'min_ff_event_normal' => 0,
'min_ff_event_warning' => 0, 'min_ff_event_critical' => 0, 'ff_timeout' => 0, 'each_ff' => 0, 'module_parent' => 0};
'min_ff_event_warning' => 0, 'min_ff_event_critical' => 0, 'ff_timeout' => 0, 'each_ff' => 0, 'module_parent' => 0,
'module_parent_unlink' => 0};
# Other tags will be saved here
$module_conf->{'extended_info'} = '';
@ -714,12 +719,19 @@ sub process_module_data ($$$$$$$$$$) {
my $module_parent = $module_conf->{'module_parent'};
delete $module_conf->{'module_parent'};
# module_parent_unlink is a special case. It is not stored in the DB, but we will need it later.
my $module_parent_unlink = $module_conf->{'module_parent_unlink'};
delete $module_conf->{'module_parent_unlink'};
# Create the module
my $module_id = pandora_create_module_from_hash ($pa_config, $module_conf, $dbh);
# Restore module_parent.
$module_conf->{'module_parent'} = $module_parent;
# Restore module_parent_unlink.
$module_conf->{'module_parent_unlink'} = $module_parent_unlink;
$module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND ' . db_text('nombre') . ' = ?', $agent->{'id_agente'}, safe_input($module_name));
if (! defined ($module)) {
logger($pa_config, "Could not create module '$module_name' for agent '$agent_name'.", 3);
@ -920,5 +932,21 @@ sub link_modules {
db_do($dbh, "UPDATE tagente_modulo SET parent_module_id = ? WHERE id_agente_modulo = ?", $parent_id, $child_id);
}
###############################################################################
# Unlink module from parent
###############################################################################
sub unlink_modules {
my ($pa_config, $dbh, $agent_id, $child_name) = @_;
# Get the child module ID.
my $child_id = get_agent_module_id ($dbh, $child_name, $agent_id);
return unless ($child_id != -1);
# Link them.
logger($pa_config, "Unlinking parent from module $child_name agent ID $agent_id", 10);
db_do($dbh, "UPDATE tagente_modulo SET parent_module_id = 0 WHERE id_agente_modulo = ?", $child_id);
}
1;
__END__