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

2009-09-02 Ramon Novoa <rnovoa@artica.es> 

* conf/pandora_server.conf,
          lib/PandoraFMS/Config.pm,
          lib/PandoraFMS/Core.pm: Removed the inhibit_alerts configuration
          token. Alert inhibition is configured on a per-agent basis.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1903 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2009-09-02 10:52:57 +00:00
parent 2ca666e16a
commit 6ea6e716f1
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2009-09-02 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf,
lib/PandoraFMS/Config.pm,
lib/PandoraFMS/Core.pm: Removed the inhibit_alerts configuration
token. Alert inhibition is configured on a per-agent basis.
2009-09-02 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf: Added sample configurations for

2
pandora_server/conf/pandora_server.conf
View File

@ -219,5 +219,3 @@ max_queue_files 250
# Use the XML file last modification time as timestamp.
# use_xml_timestamp 1
# Inhibit agent alerts if the parent has fired a critical alert.
# inhibit_alerts 1

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

@ -226,9 +226,6 @@ sub pandora_load_config {
# Ignore the timestamp in the XML and use the file timestamp instead
$pa_config->{'use_xml_timestamp'} = 0;
# Inhibit alerts if the parent agent fired a critical alert
$pa_config->{'inhibit_alerts'} = 0;
# Check for UID0
if ($pa_config->{"quiet"} != 0){
if ($> == 0){
@ -494,9 +491,6 @@ sub pandora_load_config {
elsif ($parametro =~ m/^use_xml_timestamp\s([0-1])/i) {
$pa_config->{'use_xml_timestamp'} = clean_blank($1);
}
elsif ($parametro =~ m/^inhibit_alerts\s([0-1])/i) {
$pa_config->{'inhibit_alerts'} = clean_blank($1);
}
} # end of loop for parameter #

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

@ -1162,7 +1162,7 @@ sub export_module_data ($$$$$$) {
sub pandora_inhibit_alerts ($$$) {
my ($pa_config, $agent, $dbh) = @_;
return 0 if ($pa_config->{'inhibit_alerts'} ne '1' || $agent->{'id_parent'} eq '0');
return 0 if ($agent->{'cascade_protection'} ne '1' || $agent->{'id_parent'} eq '0');
# Are any of the parent's critical alerts fired?
my $count = get_db_value ($dbh, 'SELECT COUNT(*) FROM tagente_modulo, talert_template_modules, talert_templates