From de58fe7b900744ec84614bc45cb1615ca0a71dc0 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Fri, 6 Jul 2018 14:03:05 +0200 Subject: [PATCH 01/14] Fixes --- pandora_console/include/functions.php | 6 +----- pandora_console/include/functions_agents.php | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 95892d211a..6adcfa475b 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1360,11 +1360,7 @@ function safe_sql_string($string) { function is_metaconsole() { global $config; - - if ($config['metaconsole']) - return true; - else - return false; + return (bool) $config['metaconsole']; } /** diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 65e27936cd..a5bb41a29a 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -799,8 +799,17 @@ function agents_common_modules ($id_agent, $filter = false, $indexed = true, $ge * * @return array An array with all agents in the group or an empty array */ -function agents_get_group_agents ($id_group = 0, $search = false, - $case = "lower", $noACL = false, $childGroups = false, $serialized = false, $separator = '|', $add_alert_bulk_op = false) { +function agents_get_group_agents ( + $id_group = 0, + $search = false, + $case = "lower", + $noACL = false, + $childGroups = false, + $serialized = false, + $separator = '|', + $add_alert_bulk_op = false, + $meta_use_main_id = false +) { global $config; @@ -951,7 +960,7 @@ function agents_get_group_agents ($id_group = 0, $search = false, $table_name = 'tmetaconsole_agent'; $fields = array( - 'id_tagente AS id_agente', + $meta_use_main_id ? 'id_agente' : 'id_tagente AS id_agente', 'alias', 'id_tmetaconsole_setup AS id_server' ); @@ -2010,7 +2019,8 @@ function agents_get_agentmodule_group ($id_module) { * @return int The group id */ function agents_get_agent_group ($id_agent) { - return (int) db_get_value ('id_grupo', 'tagente', 'id_agente', (int) $id_agent); + $table = is_metaconsole() ? "tmetaconsole_agent" : "tagente"; + return (int) db_get_value ('id_grupo', $table, 'id_agente', (int) $id_agent); } /** From aaf8173b8aa4b448b99e2c6576f4bf944ce3542b Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 10 Jul 2018 17:49:46 +0200 Subject: [PATCH 02/14] Added is_central_policies function --- pandora_console/include/functions.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 6adcfa475b..240b06e5b9 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1363,6 +1363,11 @@ function is_metaconsole() { return (bool) $config['metaconsole']; } +function is_central_policies() { + global $config; + return is_metaconsole() && $config["centralized_management"]; +} + /** * Checks if current execution is under an AJAX request. * From d0b6c9775fead3e68cd95bf1bd067bf8f177753f Mon Sep 17 00:00:00 2001 From: fermin831 Date: Fri, 13 Jul 2018 11:56:37 +0200 Subject: [PATCH 03/14] Addapted modules edition to metaconsole --- pandora_console/godmode/agentes/module_manager.php | 9 ++++----- .../godmode/agentes/module_manager_editor_common.php | 7 ++++--- .../godmode/agentes/module_manager_editor_network.php | 6 +++--- .../modules/manage_network_components_form_common.php | 2 +- pandora_console/include/functions_snmp_browser.php | 2 +- pandora_console/operation/agentes/networkmap.dinamic.php | 6 ++---- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 02698e3326..91e7700d27 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -23,9 +23,9 @@ else { enterprise_include ('godmode/agentes/module_manager.php'); $isFunctionPolicies = enterprise_include_once ('include/functions_policies.php'); -require_once ('include/functions_modules.php'); -require_once ('include/functions_agents.php'); -require_once ('include/functions_servers.php'); +require_once ($config['homedir'] . '/include/functions_modules.php'); +require_once ($config['homedir'] . '/include/functions_agents.php'); +require_once ($config['homedir'] . '/include/functions_servers.php'); $search_string = io_safe_output(urldecode(trim(get_parameter ("search_string", "")))); @@ -35,7 +35,6 @@ if (!isset($policy_page)) $policy_page = false; // Search string filter form -//echo '
'; if (($policy_page) || (isset($agent))) echo ''; else @@ -67,7 +66,7 @@ $prediction_available = db_get_sql ("SELECT count(*) WHERE server_type = 5"); //POSTGRESQL AND ORACLE COMPATIBLE // Development mode to use all servers -if ($develop_bypass) { +if ($develop_bypass || is_metaconsole()) { $network_available = 1; $wmi_available = 1; $plugin_available = 1; diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index db77af000b..727e6348f7 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -14,10 +14,11 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -include_once("include/functions_modules.php"); -include_once("include/functions_categories.php"); +include_once($config['homedir'] . "/include/functions_modules.php"); +include_once($config['homedir'] . "/include/functions_categories.php"); +include_once($config['homedir'] . "/include/graphs/functions_d3.php"); -echo "" . "\n"; +include_javascript_d3(); function prepend_table_simple ($row, $id = false) { global $table_simple; diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php index 557b17f388..53a816a26e 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_network.php +++ b/pandora_console/godmode/agentes/module_manager_editor_network.php @@ -16,9 +16,9 @@ global $config; require_once($config['homedir'] . "/include/functions_snmp_browser.php"); -?> - -"; //This line does not run with the dinamic loader editor in policies. //ui_require_javascript_file ('pandora_snmp_browser'); diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index fd6744c283..c8ac72ade0 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -22,7 +22,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { return; } -echo "" . "\n"; +include_javascript_d3(); function push_table_row ($row, $id = false) { global $table; diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index c6698d70cd..e24f0119c5 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -36,7 +36,7 @@ function snmp_browser_print_tree ($tree, $id = 0, $depth = 0, $last = 0, $last_a // Get the base URL for images if ($url === false) { - $url = ui_get_full_url('operation/tree'); + $url = ui_get_full_url('operation/tree', false, false, false); } // Leaf diff --git a/pandora_console/operation/agentes/networkmap.dinamic.php b/pandora_console/operation/agentes/networkmap.dinamic.php index 5b7392b0f6..3100d03298 100644 --- a/pandora_console/operation/agentes/networkmap.dinamic.php +++ b/pandora_console/operation/agentes/networkmap.dinamic.php @@ -203,10 +203,8 @@ $zoom_default = file($config['homedir'] . '/images/zoom_default.svg'); '; +include_javascript_d3(); + echo '
'; ?>