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

Merge branch '74-muestra-last-contact-en-rojo-no-deberia-2' into 'develop' 

Check interval filter agents without modules and disabled modules - 

See merge request
This commit is contained in:
Enrique Camargo 2017-02-28 14:39:23 +01:00
parent 24ef7a1e11 7034f7afc6
commit cba93067d9
2 changed files with 3 additions and 3 deletions

2
pandora_console/include/functions_agents.php
View File

@ -1443,7 +1443,7 @@ function agents_get_interval_status ($agent) {
$time = ui_print_timestamp ($last_time, true, array('style' => 'font-size:6.5pt')); $time = ui_print_timestamp ($last_time, true, array('style' => 'font-size:6.5pt'));
$min_interval = modules_get_agentmodule_mininterval_no_async($agent['id_agente']); $min_interval = modules_get_agentmodule_mininterval_no_async($agent['id_agente']);
$return = $time; $return = $time;
if ($diferencia > ($min_interval["min_interval"] * 2)) if ($diferencia > ($min_interval["min_interval"] * 2) && $min_interval['num_interval'] > 0)
$return = '<b><span style="color: #ff0000;">'.$time.'</span></b>'; $return = '<b><span style="color: #ff0000;">'.$time.'</span></b>';
return $return; return $return;

4
pandora_console/include/functions_modules.php
View File

@ -2509,10 +2509,10 @@ function modules_get_agentmodule_mininterval($id_agent) {
function modules_get_agentmodule_mininterval_no_async($id_agent) { function modules_get_agentmodule_mininterval_no_async($id_agent) {
$sql = 'SELECT MIN(tae.current_interval) AS min_interval $sql = 'SELECT COUNT(tae.current_interval) AS num_interval, MIN(tae.current_interval) AS min_interval
FROM tagente_estado tae FROM tagente_estado tae
INNER JOIN tagente_modulo tam ON tae.id_agente_modulo = tam.id_agente_modulo INNER JOIN tagente_modulo tam ON tae.id_agente_modulo = tam.id_agente_modulo
INNER JOIN ttipo_modulo ttm ON tam.id_tipo_modulo = ttm.id_tipo where ttm.nombre not like "async%" and tae.id_agente = '.$id_agent; INNER JOIN ttipo_modulo ttm ON tam.id_tipo_modulo = ttm.id_tipo where ttm.nombre not like "async%" and tae.id_agente = '.$id_agent.' and tam.disabled = 0';
return db_get_row_sql($sql); return db_get_row_sql($sql);
} }