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

Merge branch 'ent-13158-error-en-pandora_server-error' into 'develop' 

Ent 13158 error en pandora server error

See merge request artica/pandorafms!7068
This commit is contained in:
Matias Didier 2024-04-16 10:44:06 +00:00
parent aa00fe6a22 7564e41993
commit a59a5ccc7f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/pc/Linux/pandora_agent.conf
View File

@ -311,4 +311,4 @@ module_plugin pandora_df
#module_type log
#module_regexp /var/log/messages
#module_pattern .*
#module_end
#module_end

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

@ -2485,8 +2485,10 @@ sub pandora_process_module ($$$$$$$$$;$) {
}
# Generate alerts
my $inhibit_service_alerts = enterprise_hook('pandora_inhibit_service_alerts', [$pa_config, $module, $dbh, 0]);
$inhibit_service_alerts = 0 unless defined($inhibit_service_alerts);
if (pandora_inhibit_alerts ($pa_config, $agent, $dbh, 0) == 0 &&
(pandora_cps_enabled($agent, $module) == 0 || enterprise_hook('pandora_inhibit_service_alerts', [$pa_config, $module, $dbh, 0]) == 0))
(pandora_cps_enabled($agent, $module) == 0 || $inhibit_service_alerts == 0))
{
pandora_generate_alerts ($pa_config, $processed_data, $status, $agent, $module, $utimestamp, $dbh, $timestamp, $extra_macros, $last_data_value);
}