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

Merge branch 'ent-5463-modificar-la-obtencion-de-logs-desde-la-consola-elastic' into 'develop'

Browse Source 
Deleted logstash

See merge request artica/pandorafms!3123
This commit is contained in:
Daniel Rodriguez 2020-03-30 14:10:31 +02:00
commit ea631afb52
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_server/util/pandora_db.pl
View File

@ -402,16 +402,11 @@ sub pandora_purgedb ($$) {
log_message ('PURGE', 'netflow_max_lifetime is set to 0. Old netflow data will not be deleted.'); log_message ('PURGE', 'netflow_max_lifetime is set to 0. Old netflow data will not be deleted.');
} }
# Delete old log data # Delete old log data
log_message ('PURGE', "Deleting old log data."); log_message ('PURGE', "Deleting old log data.");
if (!defined ($conf->{'logstash_host'}) || $conf->{'logstash_host'} eq '') { if (defined($conf->{'_days_purge_old_information'}) && $conf->{'_days_purge_old_information'} > 0) {
log_message ('!', "Log collection disabled.");
}
elsif (defined($conf->{'_days_purge_old_information'}) && $conf->{'_days_purge_old_information'} > 0) {
log_message ('PURGE', 'Deleting log data older than ' . $conf->{'_days_purge_old_information'} . ' days.'); log_message ('PURGE', 'Deleting log data older than ' . $conf->{'_days_purge_old_information'} . ' days.');
enterprise_hook ('pandora_purge_logs', [$dbh, $conf]); enterprise_hook ('pandora_purge_logs', [$dbh, $conf]);
} }
else { else {
log_message ('PURGE', 'days_purge_old_data is set to 0. Old log data will not be deleted.'); log_message ('PURGE', 'days_purge_old_data is set to 0. Old log data will not be deleted.');