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

Added new macro

This commit is contained in:
Arturo Gonzalez 2017-06-06 10:08:14 +02:00
parent 0c57d35f53
commit 6c63067ff5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3642,23 +3642,29 @@ sub on_demand_macro($$$$$$) {
} elsif ($macro =~ /_data_module_(\S+)_/) { } elsif ($macro =~ /_data_module_(\S+)_/) {
my $field_number = $1; my $field_number = $1;
my @rows = get_db_rows ($dbh, 'SELECT alias FROM tagente WHERE id_agente = (SELECT id_agente FROM tagente_modulo WHERE nombre = ?)', $field_number); my $id_mod = get_db_value ($dbh, 'SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = ? AND nombre = ?', $module->{'id_agente'}, $field_number);
my $type_mod = get_db_value ($dbh, 'SELECT id_tipo_modulo FROM tagente_modulo WHERE id_agente_modulo = ?', $id_mod);
my $unit_mod = get_db_value ($dbh, 'SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ?', $id_mod);
use Data::Dumper; my $field_value = "";
$Data::Dumper::Sortkeys = 1; if ($type_mod eq 3){
$field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos_string where id_agente_modulo = ? order by utimestamp desc limit 1', $id_mod);
my $field_value = ''; }
foreach my $row (@rows) { else{
my $agent_name = $row->{'alias'}; $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos where id_agente_modulo = ? order by utimestamp desc limit 1', $id_mod);
if ($agent_name ne "") { my $data_precision = $pa_config->{'graph_precision'};
$field_value .= "Agent " . $agent_name . " - Module " . $field_number; $field_value = sprintf("%.$data_precision" . "f", $field_value);
} $field_value =~ s/0+$//;
$field_value =~ s/\.+$//;
} }
if($field_value eq ''){ if ($field_value eq ''){
$field_value = 'Module ' . $field_number . " not found"; $field_value = 'Module ' . $field_number . " not found";
} }
elsif ($unit_mod ne '') {
$field_value .= $unit_mod;
}
return(defined($field_value)) ? $field_value : ''; return(defined($field_value)) ? $field_value : '';
} }