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

Add a new agent provisioning server (enterprise).

This commit is contained in:
Ramon Novoa 2018-03-13 17:52:10 +01:00
parent b63a1c4ce8
commit 21f8194f0d
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_server/bin/pandora_server
View File

@ -359,6 +359,7 @@ sub pandora_server_tasks ($) {
# Pandora self monitoring # Pandora self monitoring
if (defined($pa_config->{"self_monitoring"}) if (defined($pa_config->{"self_monitoring"})
&& $pa_config->{"self_monitoring"} == 1 && $pa_config->{"self_monitoring"} == 1
&& !is_metaconsole($pa_config)
&& $counter % $pa_config->{'self_monitoring_interval'} == 0) { && $counter % $pa_config->{'self_monitoring_interval'} == 0) {
pandora_self_monitoring ($pa_config, $dbh); pandora_self_monitoring ($pa_config, $dbh);
} }

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

@ -171,6 +171,8 @@ sub pandora_get_sharedconfig ($$) {
# NOTE: This must be read when checking license limits! # NOTE: This must be read when checking license limits!
#$pa_config->{"node_metaconsole"} = pandora_get_tconfig_token ($dbh, 'node_metaconsole', 0); #$pa_config->{"node_metaconsole"} = pandora_get_tconfig_token ($dbh, 'node_metaconsole', 0);
$pa_config->{"provisioning_mode"} = pandora_get_tconfig_token ($dbh, 'provisioning_mode', '');
if ($pa_config->{'include_agents'} eq '') { if ($pa_config->{'include_agents'} eq '') {
$pa_config->{'include_agents'} = 0; $pa_config->{'include_agents'} = 0;
@ -473,6 +475,10 @@ sub pandora_load_config {
$pa_config->{"unknown_updates"} = 0; # 7.0.718 $pa_config->{"unknown_updates"} = 0; # 7.0.718
$pa_config->{"provisioningserver"} = 1; # 7.0 720
$pa_config->{"provisioningserver_threads"} = 1; # 7.0 720
$pa_config->{"provisioning_cache_interval"} = 300; # 7.0 720
# Check for UID0 # Check for UID0
if ($pa_config->{"quiet"} != 0){ if ($pa_config->{"quiet"} != 0){
if ($> == 0){ if ($> == 0){
@ -1090,6 +1096,15 @@ sub pandora_load_config {
elsif ($parametro =~ m/^unknown_updates\s+([0-1])/i) { elsif ($parametro =~ m/^unknown_updates\s+([0-1])/i) {
$pa_config->{'unknown_updates'} = clean_blank($1); $pa_config->{'unknown_updates'} = clean_blank($1);
} }
elsif ($parametro =~ m/^provisioningserver\s+([0-1])/i){
$pa_config->{'provisioningserver'}= clean_blank($1);
}
elsif ($parametro =~ m/^provisioningserver_threads\s+([0-9]*)/i){
$pa_config->{'provisioningserver_threads'}= clean_blank($1);
}
elsif ($parametro =~ m/^provisioning_cache_interval\s+([0-9]*)/i){
$pa_config->{'provisioning_cache_interval'}= clean_blank($1);
}
} # end of loop for parameter # } # end of loop for parameter #
# Set to RDBMS' standard port # Set to RDBMS' standard port

2
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -64,6 +64,7 @@ our @EXPORT = qw(
SYSLOGSERVER SYSLOGSERVER
METACONSOLE_LICENSE METACONSOLE_LICENSE
WUXSERVER WUXSERVER
PROVISIONINGSERVER
$DEVNULL $DEVNULL
$OS $OS
$OS_VERSION $OS_VERSION
@ -133,6 +134,7 @@ use constant MFSERVER => 15;
use constant SYNCSERVER => 16; use constant SYNCSERVER => 16;
use constant WUXSERVER => 17; use constant WUXSERVER => 17;
use constant SYSLOGSERVER => 18; use constant SYSLOGSERVER => 18;
use constant PROVISIONINGSERVER => 19;
# Module status # Module status
use constant MODULE_NORMAL => 0; use constant MODULE_NORMAL => 0;