tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for the new metaconsole licensing mode.

Browse Source
This commit is contained in:
Ramon Novoa 2017-03-30 09:47:00 +02:00
parent da17532889
commit 7f1030abd6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,6 +170,11 @@ sub pandora_get_sharedconfig ($$) {
#Public url #Public url
$pa_config->{'public_url'} = pandora_get_tconfig_token ($dbh, 'public_url', 'http://localhost/pandora_console'); $pa_config->{'public_url'} = pandora_get_tconfig_token ($dbh, 'public_url', 'http://localhost/pandora_console');
# Node with a metaconsole license.
# NOTE: This must be read when checking license limits!
#$pa_config->{"node_metaconsole"} = pandora_get_tconfig_token ($dbh, 'node_metaconsole', 0);
if ($pa_config->{'include_agents'} eq '') { if ($pa_config->{'include_agents'} eq '') {
$pa_config->{'include_agents'} = 0; $pa_config->{'include_agents'} = 0;
} }
@ -400,6 +405,7 @@ sub pandora_load_config {
$pa_config->{"stats_interval"} = 300; $pa_config->{"stats_interval"} = 300;
$pa_config->{"agentaccess"} = 1; $pa_config->{"agentaccess"} = 1;
$pa_config->{"event_storm_protection"} = 0; $pa_config->{"event_storm_protection"} = 0;
$pa_config->{"node_metaconsole"} = 0; # > 7.0NG
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
#SNMP Forwarding tokens #SNMP Forwarding tokens

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

@ -1459,7 +1459,9 @@ sub valid_regex ($) {
sub is_metaconsole ($) { sub is_metaconsole ($) {
my ($pa_config) = @_; my ($pa_config) = @_;
if (defined($pa_config->{"license_type"}) && $pa_config->{"license_type"} == METACONSOLE_LICENSE) { if (defined($pa_config->{"license_type"}) &&
$pa_config->{"license_type"} == METACONSOLE_LICENSE &&
$pa_config->{"node_metaconsole"} == 0) {
return 1; return 1;
} }