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

ç2008-09-01 Sancho Lerena <slerena@gmail.com> 

* lib/PandoraFMS/DB.pm: Sending mail now replaces macros also
        in the subject.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1054 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2008-09-01 08:53:01 +00:00
parent 77845891e2
commit 9a38226e1d
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2008-09-01 Sancho Lerena <slerena@gmail.com>
* lib/PandoraFMS/DB.pm: Sending mail now replaces macros also
in the subject.
2008-08-28 Evi Vanoost <vanooste@rcbi.rochester.edu>
* util/pandora2ast: Pandora to Asterisk script. Check README for how to

24
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -545,9 +545,15 @@ sub execute_alert (%$$$$$$$$$$$$$$$) {
pandora_audit ($pa_config, $field1, $agent, "Alert ($alert_description)", $dbh);
$create_event = 0;
} elsif ($id_alert == 2) { # email
$field2 =~ s/_agent_/$agent/ig;
$field2 =~ s/_timestamp_/$timestamp/ig;
$field2 =~ s/_data_/$data/ig;
$field3 =~ s/_agent_/$agent/ig;
$field3 =~ s/_timestamp_/$timestamp/ig;
$field3 =~ s/_data_/$data/ig;
pandora_sendmail ( $pa_config, $field1, $field2, $field3);
} elsif ($id_alert == 4) { # internal event
$create_event = 1;
@ -631,6 +637,16 @@ sub pandora_writestate (%$$$$$$$) {
@data = $s_idag->fetchrow_array();
}
# Postprocess management
if ((defined($data[23])) && ($data[23] != 0) && (is_numeric($data[23]))){
if (($id_modulo == 1) || ($id_modulo == 7) || ($id_modulo == 15) || ($id_modulo == 22) || ($id_modulo == 4) || ($id_modulo == 8) || ($id_modulo == 16) ){
$datos = $datos * $data[23];
}
}
$s_idag->finish();
# Get module interval or agent interval if module don't defined
my $id_module_type = $data[2];
my $module_interval = $data[7];
@ -656,14 +672,6 @@ sub pandora_writestate (%$$$$$$$) {
my $s_idages = $dbh->prepare($idages);
$s_idages ->execute;
# Postprocess management
if ((defined($data[23])) && ($data[23] != 0) && (is_numeric($data[23]))){
if (($id_modulo == 1) || ($id_modulo == 7) || ($id_modulo == 15) || ($id_modulo == 22) || ($id_modulo == 4) || ($id_modulo == 8) || ($id_modulo == 16) ){
$datos = $datos * $data[23];
}
}
# Apply Mysql quotes to data to prepare for database insertion / update
$datos = $dbh->quote($datos); # Parse data entry for adecuate SQL representation.