diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 80e8c6c778..eddc2bce82 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -2459,27 +2459,27 @@ function agents_get_network_interfaces ($agents = false, $agents_filter = false) else{ $interface_traffic_modules = agents_get_modules($agent_id, $columns, "nombre LIKE 'if%Octets_$interface_name'"); } + if (!empty($interface_traffic_modules) && count($interface_traffic_modules) >= 2) { $interface_traffic_modules_aux = array('in' => '', 'out' => ''); foreach ($interface_traffic_modules as $interface_traffic_module) { $interface_name_escaped = str_replace("/", "\/", $interface_name); - if($type_interface){ - + if ($type_interface) { if (preg_match ("/^" . $interface_name_escaped . "_if(.+)Octets$/i", $interface_traffic_module['nombre'], $matches)) { - if (strtolower($matches[1]) == 'in') { + if (strtolower($matches[1]) == 'in' || strtolower($matches[1]) == 'hcin') { $interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo']; } - elseif (strtolower($matches[1]) == 'out') { + elseif (strtolower($matches[1]) == 'out' || strtolower($matches[1]) == 'hcout') { $interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo']; } } } else{ if (preg_match ("/^if(.+)Octets_$interface_name_escaped$/i", $interface_traffic_module['nombre'], $matches)) { - if (strtolower($matches[1]) == 'in') { + if (strtolower($matches[1]) == 'in' || strtolower($matches[1]) == 'hcin') { $interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo']; } - elseif (strtolower($matches[1]) == 'out') { + elseif (strtolower($matches[1]) == 'out' || strtolower($matches[1]) == 'hcout') { $interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo']; } } diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index da29447ff7..2ded4e7adb 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1720,20 +1720,10 @@ function db_check_minor_relase_available () { * * @return bool Return if minor release is available or not */ -function db_check_minor_relase_available_to_um ($package, $ent, $offline) { +function db_check_minor_relase_available_to_um ($package) { global $config; - if (!$ent) { - $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; - } - else { - if ($offline) { - $dir = $package . "/extras/mr"; - } - else { - $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; - } - } + $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; $have_minor_release = false; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index e1bc7bd28b..9cb2c5d0da 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -450,6 +450,7 @@ if (!empty($network_interfaces)) { $table_interface->head_colspan[0] = 8; $table_interface->data = array(); $event_text_cont = 0; + foreach ($network_interfaces as $interface_name => $interface) { if (!empty($interface['traffic'])) { $permission = false; diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index 2472be7cea..2c2ffdf7c7 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -82,11 +82,12 @@ $interface_traffic_modules = array( Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>) - + - + @@ -295,6 +296,13 @@ $interface_traffic_modules = array( +