From d32b81ae1b70905cc6cd2334059f30f87412f3b5 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Wed, 26 Oct 2016 16:57:33 +0200 Subject: [PATCH] Fixed problems with creating modules with CLI. Ticket: #4140 (cherry picked from commit c358f1195d4b14d80dc78a044bf965bc8fd98d8e) --- pandora_server/util/pandora_manage.pl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 2c6531ef08..f8bbf81c95 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -1190,7 +1190,7 @@ sub cli_create_data_module($) { my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id); non_exist_check($module_exists, 'module name', $module_name); - print_log "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n"; + #~ print_log "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n"; } else { $policy_id = enterprise_hook('get_policy_id',[$dbh, safe_input($policy_name)]); @@ -1199,7 +1199,7 @@ sub cli_create_data_module($) { my $policy_module_exist = enterprise_hook('get_policy_module_id',[$dbh, $policy_id, $module_name]); non_exist_check($policy_module_exist,'policy module',$module_name); - print_log "[INFO] Adding module '$module_name' to policy '$policy_name'\n\n"; + #~ print_log "[INFO] Adding module '$module_name' to policy '$policy_name'\n\n"; } $module_name_def = $module_name; @@ -1238,6 +1238,15 @@ sub cli_create_data_module($) { enterprise_hook('pandora_update_md5_file', [$conf, $agent_name]); } + if ($in_policy == 0) { + non_exist_check($module_exists, 'module name', $module_name_def); + print_log "[INFO] Adding module '$module_name' to agent '$agent_name'\n\n"; + } + else { + non_exist_check($policy_module_exist,'policy module',$module_name_def); + print_log "[INFO] Adding module '$module_name' to policy '$policy_name'\n\n"; + } + if (defined($definition_file) && $module_type ne $module_type_def) { $module_type = $module_type_def; print_log "[INFO] The module type has been forced to '$module_type' by the definition file\n\n";