diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 538fb1bdef..f3a44a1bfe 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -470,6 +470,9 @@ log_window 3600 # Pre-load windows on start with available information. (PANDORA FMS ENTERPRISE ONLY). #preload_windows 0 +# Correlated Alerts, group cache ttl (in seconds). Set to 0 to disable. (PANDORA FMS ENTERPRISE ONLY). +#event_server_cache_ttl 10 + # If set to 1, an alert will not be fired if the last event it generated is in 'in-process' status. event_inhibit_alerts 0 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 7788686d08..ca5dd2705a 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -302,6 +302,7 @@ sub pandora_load_config { $pa_config->{"eventserver"} = 1; # 4.0 $pa_config->{"event_window"} = 3600; # 4.0 $pa_config->{"log_window"} = 3600; # 7.741 + $pa_config->{"event_server_cache_ttl"} = 10; # 7.754 $pa_config->{"preload_windows"} = 0; # 7.741 $pa_config->{"icmpserver"} = 0; # 4.0 $pa_config->{"icmp_threads"} = 3; # 4.0 @@ -1001,6 +1002,9 @@ sub pandora_load_config { elsif ($parametro =~ m/^preload_windows\s+([0-9]*)/i) { $pa_config->{'preload_windows'}= clean_blank($1); } + elsif ($parametro =~ m/^event_server_cache_ttl\s+([0-9]*)/i) { + $pa_config->{"event_server_cache_ttl"} = clean_blank($1); + } elsif ($parametro =~ m/^snmp_threads\s+([0-9]*)/i) { $pa_config->{'snmp_threads'}= clean_blank($1); } diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm index 045e84f1e2..1148984d18 100644 --- a/pandora_server/lib/PandoraFMS/DB.pm +++ b/pandora_server/lib/PandoraFMS/DB.pm @@ -92,6 +92,7 @@ our @EXPORT = qw( get_priority_name get_server_id get_tag_id + get_tag_name get_group_name get_template_id get_template_module_id @@ -276,6 +277,20 @@ sub get_tag_id ($$) { return defined ($rc) ? $rc : -1; } +######################################################################## +## Return the name of a tag given its id. +######################################################################## +sub get_tag_name ($$) { + my ($dbh, $id) = @_; + + my $rc = get_db_value( + $dbh, "SELECT name FROM ttag + WHERE id_tag = ?", + safe_input($id) + ); + return $rc; +} + ######################################################################## ## Return the first enabled server name found. ########################################################################