Merge branch '2491-Alert-view-meta' into 'develop'

fixed bug in meta alert view: agent names not showing in table

See merge request artica/pandorafms!1618
This commit is contained in:
vgilc 2018-09-28 10:39:52 +02:00
commit ad5581f0c2
1 changed files with 20 additions and 4 deletions

View File

@ -823,10 +823,26 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
else
return array ("", "", "", "", "", "", "");
}
// Get agent id
$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
$agente = db_get_row ('tagente', 'id_agente', $id_agent);
if (defined('METACONSOLE')) {
$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
if (metaconsole_connect($server) == NOERR) {
// Get agent data from node
$agente = db_get_row ('tagente', 'id_agente', $alert['id_agent']);
metaconsole_restore_db ();
}
} else {
// Get agent id
$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
$agente = db_get_row ('tagente', 'id_agente', $id_agent);
}
$template = alerts_get_alert_template ($alert['id_alert_template']);
$description = io_safe_output($template['name']);