From 5e3cf3162a296f20625137b60faba852b63e302b Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 21 Mar 2018 16:58:42 +0100 Subject: [PATCH 1/5] CLI example check/get server_address --- pandora_server/util/pandora_manage.pl | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 201ce190ba..ab7b7c0f63 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -5612,6 +5612,82 @@ sub cli_export_visual_console() { print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n"; } +############################################################################## +# cli_get_server_address gets first occurrence of IP address +############################################################################## +sub cli_get_server_address { + my ($target_node_name) = $ARGV[2]; + + if (is_metaconsole($conf)) { + my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); + if (!defined($rs) || $rs eq '') { + print_log("0\n"); + print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); + return; + } + + print_log("$rs\n"); + } + else { + my $server_address = get_db_value($dbh, "SELECT ip_address FROM tserver where name = ? AND ip_address!= '' ", + $target_node_name); + + if (defined($server_address) && ("$server_address" ne "")) { + print_log("$server_address\n"); + } + else { + print_log("0\n"); + print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); + } + } +} + + +############################################################################## +# cli_check_server_address +############################################################################## +sub cli_check_server_address { + my ($target_node_name) = $ARGV[2]; + + if (!is_metaconsole($conf)) { + print_log("0\n"); + print STDERR "Error, this is not a Metaconsole Server.\n" if ($conf->{'verbosity'} >= 1); + return; + } + + my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); + if (!defined($rs) || $rs eq '') { + print_log("0\n"); + print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); + return; + } + + print_log("1\n"); +} + + +# +sub cli_check_mr_same {} +# +sub cli_check_alerts_act_exist {} +# +sub cli_check_alerts_temp_exist {} +# +sub cli_check_inventory_exist {} +# +sub cli_check_agent_conf {} +# +sub cli_check_collections_exist {} +# +sub cli_check_plugins_exist {} +# +sub cli_check_policies_exist {} +# +sub cli_check_group_exist {} +# +sub cli_check_agent_exist {} + + ############################################################################### ############################################################################### # MAIN @@ -6066,6 +6142,14 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } + elsif ($param eq '--check_server_address') { + param_check($ltotal, 1, 0); + cli_check_server_address(); + } + elsif ($param eq '--get_server_address') { + param_check($ltotal, 1, 0); + cli_get_server_address(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; From b61f8d5cdd85e3f6c89be116edb6045250ae012e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:18:48 +0100 Subject: [PATCH 2/5] add new functions cli --- pandora_server/util/pandora_manage.pl | 126 ++++++++++---------------- 1 file changed, 48 insertions(+), 78 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ab7b7c0f63..356f62ef21 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -223,7 +223,10 @@ sub help_screen{ help_screen_line('--duplicate_visual_console', ' []', 'Duplicate a visual console'); help_screen_line('--export_json_visual_console', ' [] []', 'Creates a json with the visual console elements information'); + help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); + help_screen_line('--migrate_agent', ' ', 'Is migrating the agent only metaconsole'); + print "\n"; exit; } @@ -5612,80 +5615,7 @@ sub cli_export_visual_console() { print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n"; } -############################################################################## -# cli_get_server_address gets first occurrence of IP address -############################################################################## -sub cli_get_server_address { - my ($target_node_name) = $ARGV[2]; - if (is_metaconsole($conf)) { - my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); - if (!defined($rs) || $rs eq '') { - print_log("0\n"); - print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); - return; - } - - print_log("$rs\n"); - } - else { - my $server_address = get_db_value($dbh, "SELECT ip_address FROM tserver where name = ? AND ip_address!= '' ", - $target_node_name); - - if (defined($server_address) && ("$server_address" ne "")) { - print_log("$server_address\n"); - } - else { - print_log("0\n"); - print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); - } - } -} - - -############################################################################## -# cli_check_server_address -############################################################################## -sub cli_check_server_address { - my ($target_node_name) = $ARGV[2]; - - if (!is_metaconsole($conf)) { - print_log("0\n"); - print STDERR "Error, this is not a Metaconsole Server.\n" if ($conf->{'verbosity'} >= 1); - return; - } - - my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); - if (!defined($rs) || $rs eq '') { - print_log("0\n"); - print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); - return; - } - - print_log("1\n"); -} - - -# -sub cli_check_mr_same {} -# -sub cli_check_alerts_act_exist {} -# -sub cli_check_alerts_temp_exist {} -# -sub cli_check_inventory_exist {} -# -sub cli_check_agent_conf {} -# -sub cli_check_collections_exist {} -# -sub cli_check_plugins_exist {} -# -sub cli_check_policies_exist {} -# -sub cli_check_group_exist {} -# -sub cli_check_agent_exist {} ############################################################################### @@ -6142,13 +6072,13 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } - elsif ($param eq '--check_server_address') { - param_check($ltotal, 1, 0); - cli_check_server_address(); + elsif ($param eq '--migration_agent_queue') { + param_check($ltotal, 4, 1); + cli_migration_agent_queue(); } - elsif ($param eq '--get_server_address') { + elsif ($param eq '--migration_agent') { param_check($ltotal, 1, 0); - cli_get_server_address(); + cli_migration_agent(); } else { print_log "[ERROR] Invalid option '$param'.\n\n"; @@ -6520,3 +6450,43 @@ sub cli_add_tag_to_module() { my $result = api_call(\%conf, 'set', 'add_tag_module', $module_id, $tag_id); print "\n$result\n"; } + +############################################################################## +# Only meta migrate agent +############################################################################## +sub cli_migration_agent_queue() { + my ($id_agent, $source_name, $target_name, $only_db) = @ARGV[2..5]; + + if( !defined($id_agent) || !defined($source_name) || !defined($target_name) ){ + print "\n0\n"; + } + + if(!defined($only_db)){ + $only_db = 0; + } + + # Call the API. + my $result = api_call( $conf, 'set', 'migrate_agent', $id_agent, 0, "$source_name|$target_name|$only_db" ); + print "\n$result\n"; +} + +############################################################################## +# Only meta is migrate agent +############################################################################## +sub cli_migration_agent() { + my ($id_agent) = @ARGV[2]; + + if( !defined($id_agent) ){ + print "\n0\n"; + } + + # Call the API. + my $result = api_call( $conf, 'get', 'migrate_agent', $id_agent); + + if( defined($result) && "$result" ne "" ){ + print "\n1\n"; + } + else{ + print "\n0\n"; + } +} From 55d0ca122b1f9706a8d785d5e0100c7c345f46bb Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:28:18 +0100 Subject: [PATCH 3/5] fixed error --- pandora_server/util/pandora_manage.pl | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0291c9e46c..f99b93c3c1 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -6067,21 +6067,10 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } -<<<<<<< HEAD - elsif ($param eq '--migration_agent_queue') { - param_check($ltotal, 4, 1); - cli_migration_agent_queue(); - } - elsif ($param eq '--migration_agent') { - param_check($ltotal, 1, 0); - cli_migration_agent(); - } -======= elsif ($param eq '--apply_module_template') { param_check($ltotal, 2, 2); cli_apply_module_template(); } ->>>>>>> origin/develop else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; @@ -6434,7 +6423,6 @@ sub cli_add_tag_to_module() { print "\n$result\n"; } -<<<<<<< HEAD ############################################################################## # Only meta migrate agent ############################################################################## @@ -6474,7 +6462,7 @@ sub cli_migration_agent() { print "\n0\n"; } } -======= + sub cli_apply_module_template() { my ($id_template, $id_agent) = @ARGV[2..3]; @@ -6566,4 +6554,3 @@ sub cli_apply_module_template() { } } ->>>>>>> origin/develop From 0156bff9e63c9f68c4c6a96e19fa4e4fc4f1c272 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:33:23 +0100 Subject: [PATCH 4/5] fixed error --- pandora_server/util/pandora_manage.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f99b93c3c1..f5a9e1e665 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -6070,7 +6070,15 @@ sub pandora_manage_main ($$$) { elsif ($param eq '--apply_module_template') { param_check($ltotal, 2, 2); cli_apply_module_template(); - } + } + elsif ($param eq '--migration_agent_queue') { + param_check($ltotal, 4, 1); + cli_migration_agent_queue(); + } + elsif ($param eq '--migration_agent') { + param_check($ltotal, 1, 0); + cli_migration_agent(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; From ad2746e6c39e403b870c6af81d182186a319344f Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:36:24 +0100 Subject: [PATCH 5/5] fixed add help incli --- pandora_server/util/pandora_manage.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f5a9e1e665..70901f77a3 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -126,6 +126,8 @@ sub help_screen{ help_screen_line('--clean_conf_file', '', "Clean a local conf of a given agent deleting all modules, \n\t policies, file collections and comments"); help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)'); help_screen_line('--locate_agent', '', 'Search a agent into of nodes of metaconsole. Only Enterprise.'); + help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); + help_screen_line('--migration_agent', ' ', 'Is migrating the agent only metaconsole'); print "\nMODULES:\n\n" unless $param ne ''; help_screen_line('--create_data_module', " [ \n\t \n\t \n\t \n\t \n\t ]", 'Add data server module to agent'); help_screen_line('--create_web_module', " [ \n\t \n\t \n\t \n\t \n\t ].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); @@ -222,9 +224,6 @@ sub help_screen{ help_screen_line('--duplicate_visual_console', ' []', 'Duplicate a visual console'); help_screen_line('--export_json_visual_console', ' [] []', 'Creates a json with the visual console elements information'); - help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); - help_screen_line('--migrate_agent', ' ', 'Is migrating the agent only metaconsole'); - print "\n"; exit;