Merge branch '1669-Sincronizacion-de-agentes-deshabilitados-de-la-metaconsola-Carrefour' into 'develop'

Fix agent sinchronization from node to metaconsole when enable/disable and have…

See merge request artica/pandorafms!1156
This commit is contained in:
vgilc 2017-12-04 15:29:05 +01:00
commit 8c187ad4be
2 changed files with 11 additions and 3 deletions

View File

@ -812,7 +812,7 @@ if ($update_agent) { // if modified some agent paramenter
else {
// Update the agent from the metaconsole cache
enterprise_include_once('include/functions_agents.php');
enterprise_hook ('agent_update_from_cache', array($id_agente, $values));
enterprise_hook ('agent_update_from_cache', array($id_agente, $values,$server_name));
if ($old_interval != $intervalo) {
enterprise_hook('config_agents_update_config_interval', array($id_agente, $intervalo));

View File

@ -67,6 +67,14 @@ $agent_to_delete = (int)get_parameter('borrar_agente');
$enable_agent = (int)get_parameter('enable_agent');
$disable_agent = (int)get_parameter('disable_agent');
if($disable_agent != 0){
$server_name = db_get_row_sql('select server_name from tagente where id_agente = '.$disable_agent);
}
elseif ($enable_agent != 0) {
$server_name = db_get_row_sql('select server_name from tagente where id_agente = '.$enable_agent);
}
$result = null;
if ($agent_to_delete) {
@ -106,7 +114,7 @@ if ($enable_agent) {
// Update the agent from the metaconsole cache
enterprise_include_once('include/functions_agents.php');
$values = array('disabled' => 0);
enterprise_hook ('agent_update_from_cache', array($enable_agent, $values));
enterprise_hook ('agent_update_from_cache', array($enable_agent, $values,$server_name));
db_pandora_audit("Agent management", 'Enable ' . $alias);
}
@ -126,7 +134,7 @@ if ($disable_agent) {
// Update the agent from the metaconsole cache
enterprise_include_once('include/functions_agents.php');
$values = array('disabled' => 1);
enterprise_hook ('agent_update_from_cache', array($disable_agent, $values));
enterprise_hook ('agent_update_from_cache', array($disable_agent, $values,$server_name));
db_pandora_audit("Agent management", 'Disable ' . $alias);
}