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

Added data precision to events. Ticket #288

This commit is contained in:
Arturo Gonzalez 2017-02-20 09:50:57 +01:00
parent f7fd67ca79
commit 89f0ec658c
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,6 +200,7 @@ sub pandora_load_config {
$pa_config->{"umask"} = "0007"; # environment settings umask applied over chmod (A & (not B)) $pa_config->{"umask"} = "0007"; # environment settings umask applied over chmod (A & (not B))
$pa_config->{"server_threshold"} = 30; $pa_config->{"server_threshold"} = 30;
$pa_config->{"alert_threshold"} = 60; $pa_config->{"alert_threshold"} = 60;
$pa_config->{"graph_precision"} = 1;
$pa_config->{"log_file"} = "/var/log/pandora_server.log"; $pa_config->{"log_file"} = "/var/log/pandora_server.log";
$pa_config->{"errorlog_file"} = "/var/log/pandora_server.error"; $pa_config->{"errorlog_file"} = "/var/log/pandora_server.error";
$pa_config->{"networktimeout"} = 5; # By default, not in config file yet $pa_config->{"networktimeout"} = 5; # By default, not in config file yet
@ -692,6 +693,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^alert_threshold\s+([0-9]*)/i) { elsif ($parametro =~ m/^alert_threshold\s+([0-9]*)/i) {
$pa_config->{"alert_threshold"} = clean_blank($1); $pa_config->{"alert_threshold"} = clean_blank($1);
} }
elsif ($parametro =~ m/^graph_precision\s+([0-9]*)/i) {
$pa_config->{"graph_precision"} = clean_blank($1);
}
elsif ($parametro =~ m/^network_timeout\s+([0-9]*)/i) { elsif ($parametro =~ m/^network_timeout\s+([0-9]*)/i) {
$pa_config->{'networktimeout'}= clean_blank($1); $pa_config->{'networktimeout'}= clean_blank($1);
} }

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

@ -947,6 +947,13 @@ sub pandora_execute_action ($$$$$$$$$;$) {
$group = get_db_single_row ($dbh, 'SELECT * FROM tgrupo WHERE id_grupo = ?', $agent->{'id_grupo'}); $group = get_db_single_row ($dbh, 'SELECT * FROM tgrupo WHERE id_grupo = ?', $agent->{'id_grupo'});
} }
if (is_numeric($data)) {
my $data_precision = $pa_config->{'graph_precision'};
$data = sprintf("%.$data_precision" . "f", $data);
$data =~ s/0+$//;
$data =~ s/\.+$//;
}
# Thanks to people of Cordoba univ. for the patch for adding module and # Thanks to people of Cordoba univ. for the patch for adding module and
# id_agent macros to the alert. # id_agent macros to the alert.
@ -3965,6 +3972,13 @@ sub generate_status_event ($$$$$$$$) {
return; return;
} }
if (is_numeric($data)) {
my $data_precision = $pa_config->{'graph_precision'};
$data = sprintf("%.$data_precision" . "f", $data);
$data =~ s/0+$//;
$data =~ s/\.+$//;
}
# Replace macros # Replace macros
my %macros = ( my %macros = (
_module_ => safe_output($module->{'nombre'}), _module_ => safe_output($module->{'nombre'}),