diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index e6c591b7e9..b55446055a 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -659,6 +659,12 @@ syslog_threads 2 # Maximum number of lines queued by the Syslog Server's producer on each run (PANDORA FMS ENTERPRISE ONLY). syslog_max 65535 +# Blacklist regexp filter for the Syslog Server (PANDORA FMS ENTERPRISE ONLY). +# syslog_blacklist [regex] + +# Whitelist regexp filter for the Syslog Server (PANDORA FMS ENTERPRISE ONLY). +# syslog_whitelist .* + # Sync Server #syncserver diff --git a/pandora_server/conf/pandora_server_sec.conf.template b/pandora_server/conf/pandora_server_sec.conf.template index 0ec427ef21..e4cbe335c5 100644 --- a/pandora_server/conf/pandora_server_sec.conf.template +++ b/pandora_server/conf/pandora_server_sec.conf.template @@ -658,6 +658,12 @@ syslog_threads 2 # Maximum number of lines queued by the Syslog Server's producer on each run (PANDORA FMS ENTERPRISE ONLY). syslog_max 65535 +# Blacklist regexp filter for the Syslog Server (PANDORA FMS ENTERPRISE ONLY). +# syslog_blacklist [regex] + +# Whitelist regexp filter for the Syslog Server (PANDORA FMS ENTERPRISE ONLY). +# syslog_whitelist .* + # Sync Server #syncserver diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index c34346bb51..e5dde80f0b 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -515,6 +515,8 @@ sub pandora_load_config { $pa_config->{"syslog_file"} = '/var/log/messages/'; # 7.0.716 $pa_config->{"syslog_max"} = 65535; # 7.0.716 $pa_config->{"syslog_threads"} = 4; # 7.0.716 + $pa_config->{"syslog_blacklist"} = undef; # 7.0.773 + $pa_config->{"syslog_whitelist"} = undef; # 7.0 773 # External .enc files for XML::Parser. $pa_config->{"enc_dir"} = ""; # > 6.0SP4 @@ -1254,6 +1256,12 @@ sub pandora_load_config { elsif ($parametro =~ m/^syslog_threads\s+([0-9]*)/i) { $pa_config->{'syslog_threads'}= clean_blank($1); } + elsif ($parametro =~ m/^syslog_blacklist\s+(.*)/i) { + $pa_config->{'syslog_blacklist'}= clean_blank($1); + } + elsif ($parametro =~ m/^syslog_whitelist\s+(.*)/i) { + $pa_config->{'syslog_whitelist'}= clean_blank($1); + } elsif ($parametro =~ m/^thread_log\s+([0-1])/i) { $pa_config->{'thread_log'}= clean_blank($1); }