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

Merge branch '560-modificar-la-metaconsola-consola-para-sincronizar-licencias-con-los-nodos' into 'develop' 

Metaconsole nodes will always sync the agent cache.

See merge request !333
This commit is contained in:
nramon 2017-03-31 14:50:12 +02:00
parent a445877497 03b0b3cb33
commit 5036ad9467
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/bin/pandora_server
View File

@ -102,7 +102,7 @@ sub pandora_startup () {
$Config{"encryption_key"} = enterprise_hook('pandora_get_encryption_key', [\%Config, $Config{"encryption_passphrase"}]); $Config{"encryption_key"} = enterprise_hook('pandora_get_encryption_key', [\%Config, $Config{"encryption_passphrase"}]);
# Update the agent cache. # Update the agent cache.
enterprise_hook('update_agent_cache', [\%Config, $DBH]) if ($Config{'metaconsole_agent_cache'} == 1); enterprise_hook('update_agent_cache', [\%Config, $DBH]) if ($Config{'node_metaconsole'} == 1);
pandora_audit (\%Config, 'Pandora FMS Server Daemon starting', 'SYSTEM', 'System', $DBH); pandora_audit (\%Config, 'Pandora FMS Server Daemon starting', 'SYSTEM', 'System', $DBH);

3
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -160,9 +160,6 @@ sub pandora_get_sharedconfig ($$) {
# Pandora FMS Console's attachment directory # Pandora FMS Console's attachment directory
$pa_config->{"attachment_dir"} = pandora_get_tconfig_token ($dbh, 'attachment_store', '/var/www/pandora_console/attachment'); $pa_config->{"attachment_dir"} = pandora_get_tconfig_token ($dbh, 'attachment_store', '/var/www/pandora_console/attachment');
# Metaconsole agent cache.
$pa_config->{"metaconsole_agent_cache"} = pandora_get_tconfig_token ($dbh, 'metaconsole_agent_cache', 0);
#Limit of events replicate in metaconsole #Limit of events replicate in metaconsole
$pa_config->{'replication_limit'} = pandora_get_tconfig_token ($dbh, 'replication_limit', 1000); $pa_config->{'replication_limit'} = pandora_get_tconfig_token ($dbh, 'replication_limit', 1000);
$pa_config->{'include_agents'} = pandora_get_tconfig_token ($dbh, 'include_agents', 0); $pa_config->{'include_agents'} = pandora_get_tconfig_token ($dbh, 'include_agents', 0);

4
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -4994,7 +4994,7 @@ sub pandora_update_agent_module_count ($$$) {
') WHERE id_agente = ' . $agent_id); ') WHERE id_agente = ' . $agent_id);
# Sync the agent cache every time the module count is updated. # Sync the agent cache every time the module count is updated.
enterprise_hook('update_agent_cache', [$pa_config, $dbh, $agent_id]) if ($pa_config->{'metaconsole_agent_cache'} == 1); enterprise_hook('update_agent_cache', [$pa_config, $dbh, $agent_id]) if ($pa_config->{'node_metaconsole'} == 1);
} }
########################################################################## ##########################################################################
@ -5008,7 +5008,7 @@ sub pandora_update_agent_alert_count ($$$) {
') WHERE id_agente = ' . $agent_id); ') WHERE id_agente = ' . $agent_id);
# Sync the agent cache every time the module count is updated. # Sync the agent cache every time the module count is updated.
enterprise_hook('update_agent_cache', [$pa_config, $dbh, $agent_id]) if ($pa_config->{'metaconsole_agent_cache'} == 1); enterprise_hook('update_agent_cache', [$pa_config, $dbh, $agent_id]) if ($pa_config->{'node_metaconsole'} == 1);
} }
######################################################################## ########################################################################