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

Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' of brutus.artica.es:artica/pandorafms into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow

Browse Source
This commit is contained in:
Calvo 2023-03-22 14:27:25 +01:00
commit 6c8337de8c
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/conf/pandora_server.conf.new
View File

@ -737,3 +737,10 @@ tentacle_service_watchdog 1
# Enable (1) or disable (0) the parameter of mysql ssl certification (mysql_ssl_verify_server_cert) (enabled by default). # Enable (1) or disable (0) the parameter of mysql ssl certification (mysql_ssl_verify_server_cert) (enabled by default).
verify_mysql_ssl_cert 1 verify_mysql_ssl_cert 1
# Enable (1) or disable (0) the Pandora FMS Netflow Server (PANDORA FMS ENTERPRISE ONLY).
netflowserver 0
# Number of threads for the Pandora FMS Netflow Server (PANDORA FMS ENTERPRISE ONLY).
netflowserver_threads 1

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

@ -553,6 +553,9 @@ sub pandora_load_config {
$pa_config->{"unknown_block_size"} = 1000; # 7.0.769 $pa_config->{"unknown_block_size"} = 1000; # 7.0.769
$pa_config->{"netflowserver"} = 0; # 7.0.770
$pa_config->{"netflowserver_threads"} = 1; # 7.0.770
# Check for UID0 # Check for UID0
if ($pa_config->{"quiet"} != 0){ if ($pa_config->{"quiet"} != 0){
if ($> == 0){ if ($> == 0){
@ -1313,6 +1316,12 @@ sub pandora_load_config {
elsif ($parametro =~ m/^dataserver_smart_queue\s([0-1])/i) { elsif ($parametro =~ m/^dataserver_smart_queue\s([0-1])/i) {
$pa_config->{'dataserver_smart_queue'} = clean_blank($1); $pa_config->{'dataserver_smart_queue'} = clean_blank($1);
} }
elsif ($parametro =~ m/^netflowserver\s([0-1])/i) {
$pa_config->{'netflowserver'} = clean_blank($1);
}
elsif ($parametro =~ m/^netflowserver_threads\s+([0-9]*)/i) {
$pa_config->{'netflowserver_threads'}= clean_blank($1);
}
} # end of loop for parameter # } # end of loop for parameter #

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

@ -293,7 +293,7 @@ our @ServerTypes = qw (
dataserver dataserver
networkserver networkserver
snmpconsole snmpconsole
reconserver discoveryserver
pluginserver pluginserver
predictionserver predictionserver
wmiserver wmiserver
@ -304,6 +304,7 @@ our @ServerTypes = qw (
icmpserver icmpserver
snmpserver snmpserver
satelliteserver satelliteserver
transactionalserver
mfserver mfserver
syncserver syncserver
wuxserver wuxserver
@ -312,6 +313,8 @@ our @ServerTypes = qw (
migrationserver migrationserver
alertserver alertserver
correlationserver correlationserver
ncmserver
netflowserver
); );
our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not execute the alert, but increment its internal counter', 'Cease the alert', 'Recover the alert', 'Reset internal counter'); our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not execute the alert, but increment its internal counter', 'Cease the alert', 'Recover the alert', 'Reset internal counter');

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

@ -78,6 +78,7 @@ our @EXPORT = qw(
PROVISIONINGSERVER PROVISIONINGSERVER
MIGRATIONSERVER MIGRATIONSERVER
NCMSERVER NCMSERVER
NETFLOWSERVER
METACONSOLE_LICENSE METACONSOLE_LICENSE
OFFLINE_LICENSE OFFLINE_LICENSE
DISCOVERY_HOSTDEVICES DISCOVERY_HOSTDEVICES
@ -202,6 +203,7 @@ use constant MIGRATIONSERVER => 20;
use constant ALERTSERVER => 21; use constant ALERTSERVER => 21;
use constant CORRELATIONSERVER => 22; use constant CORRELATIONSERVER => 22;
use constant NCMSERVER => 23; use constant NCMSERVER => 23;
use constant NETFLOWSERVER => 24;
# Module status # Module status
use constant MODULE_NORMAL => 0; use constant MODULE_NORMAL => 0;
@ -2844,6 +2846,8 @@ sub get_server_name {
return "MIGRATIONSERVER" if ($server_type eq MIGRATIONSERVER); return "MIGRATIONSERVER" if ($server_type eq MIGRATIONSERVER);
return "ALERTSERVER" if ($server_type eq ALERTSERVER); return "ALERTSERVER" if ($server_type eq ALERTSERVER);
return "CORRELATIONSERVER" if ($server_type eq CORRELATIONSERVER); return "CORRELATIONSERVER" if ($server_type eq CORRELATIONSERVER);
return "NCMSERVER" if ($server_type eq NCMSERVER);
return "NETFLOWSERVER" if ($server_type eq NETFLOWSERVER);
return "UNKNOWN"; return "UNKNOWN";
} }