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

2012-12-10 Sancho Lerena <slerena@artica.es> 

* Core.pm: Applied patch 3576115 from Axel: implemented maintance
        priority from events coming from recovery alerts.

        * Tool.pm: Decode output in all logfile output.

        * Config.pm: Updated version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7249 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-12-10 19:09:58 +00:00
parent c94f05b2e4
commit 6aebffcaab
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_server/ChangeLog
View File

@ -1,3 +1,12 @@
2012-12-10 Sancho Lerena <slerena@artica.es>
* Core.pm: Applied patch 3576115 from Axel: implemented maintance
priority from events coming from recovery alerts.
* Tool.pm: Decode output in all logfile output.
* Config.pm: Updated version.
2012-12-09 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/tentacle_server: Changed how to get pid of tentacle_server

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

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "5.0dev";
my $pandora_build = "120621";
my $pandora_build = "121210";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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

@ -773,10 +773,13 @@ sub pandora_execute_alert ($$$$$$$$;$) {
my $unknown_instructions = get_db_value ($dbh, 'SELECT unknown_instructions FROM tagente_modulo WHERE id_agente_modulo = ?', $alert->{'id_agent_module'});
# Generate an event
my ($text, $event) = ($alert_mode == 0) ? ('recovered', 'alert_recovered') : ('fired', 'alert_fired');
#If we've spotted an alert recovered, we set the new event's severity to 0, otherwise the original value is maintained.
my $severity;
my ($text, $event, $severity) = ($alert_mode == 0) ? ('recovered', 'alert_recovered', 0) : ('fired', 'alert_fired', $alert->{'priority'});
pandora_event ($pa_config, "Alert $text (" . safe_output($alert->{'name'}) . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""),
(defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $alert->{'priority'}, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0),
(defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $alert->{'priority'}, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0),
(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
}

5
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -447,7 +447,10 @@ sub md5check {
########################################################################
sub logger ($$;$) {
my ($pa_config, $message, $level) = @_;
# Clean any string and ready to be printed in screen/file
$message = safe_output ($message);
$level = 1 unless defined ($level);
return if ($level > $pa_config->{'verbosity'});

2
pandora_server/pandora_server_installer
View File

@ -4,7 +4,7 @@
# Linux/FreeBSD Version (generic), for SuSe, Debian/Ubuntu and FreeBSD only
# other Linux distros could not work properly without modifications
# Please see http://www.pandorafms.org
# v4.0dev Build 111026
# v5.0 Build 121210
# This code is licensed under GPL 2.0 license.
# **********************************************************************