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

Deleted logstash references

This commit is contained in:
Jose Gonzalez 2020-12-15 13:12:00 +01:00
parent fcb7d36146
commit 430457b30a
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -658,7 +658,6 @@ class ConsoleSupervisor
case 'NOTIF.PANDORADB.HISTORICAL':
case 'NOTIF.HISTORYDB.MR':
case 'NOTIF.EXT.ELASTICSEARCH':
case 'NOTIF.EXT.LOGSTASH':
case 'NOTIF.METACONSOLE.DB_CONNECTION':
case 'NOTIF.DOWNTIME':
case 'NOTIF.UPDATEMANAGER.REGISTRATION':
@ -1790,7 +1789,6 @@ class ConsoleSupervisor
{
global $config;
// Cannot check logstash, configuration is only available from server.
// Cannot check selenium, configuration is only available from server.
if (isset($config['log_collector'])
&& $config['log_collector'] == 1

4
pandora_server/conf/pandora_server.conf.new
View File

@ -668,10 +668,6 @@ syslog_max 65535
# Address
# sync_address
# Target LogStash server, to allow Dataserver and SyslogServer store log information in ElasticSearch
#logstash_host ip
#logstash_port 10514
# Pandora FMS Database HA Tool execution interval in seconds (PANDORA FMS ENTERPRISE ONLY).
ha_interval 30

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

@ -518,10 +518,6 @@ sub pandora_load_config {
$pa_config->{"warmup_unknown_interval"} = 300; # 6.1
$pa_config->{"warmup_unknown_on"} = 1; # 6.1
# Logstash
$pa_config->{"logstash_host"} = '';
$pa_config->{"logstash_port"} = 0;
$pa_config->{"wuxserver"} = 1; # 7.0
$pa_config->{"wux_host"} = undef; # 7.0
$pa_config->{"wux_port"} = 4444; # 7.0
@ -1192,13 +1188,6 @@ sub pandora_load_config {
elsif ($parametro =~ m/^dynamic_constant\s+([0-9]*)/i) {
$pa_config->{'dynamic_constant'}= clean_blank($1);
}
elsif ($parametro =~ m/^logstash_host\s+(.*)/i) {
$pa_config->{'logstash_host'}= clean_blank($1);
}
elsif ($parametro =~ m/^logstash_port\s+([0-9]*)/i) {
$pa_config->{'logstash_port'}= clean_blank($1);
}
elsif ($parametro =~ m/^wuxserver\s+([0-1]*)/i) {
$pa_config->{"wuxserver"} = clean_blank($1);
}