tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'No-funciona-módulo-system-dev' into 'develop'

Browse Source 
Fixed problem in data display snmp wizard

See merge request !534
This commit is contained in:
vgilc 2017-06-14 11:50:26 +02:00
commit d8fc3ac9e9
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/include/ajax/module.php
View File

@ -254,7 +254,9 @@ if ($get_module_detail) {
$id_type_web_content_string = db_get_value('id_tipo', $id_type_web_content_string = db_get_value('id_tipo',
'ttipo_modulo', 'nombre', 'web_content_string'); 'ttipo_modulo', 'nombre', 'web_content_string');
$post_process = db_get_value_filter('post_process','tagente_modulo',array('id_agente_modulo' => $module_id));
foreach ($result as $row) { foreach ($result as $row) {
$data = array (); $data = array ();
@ -305,10 +307,16 @@ if ($get_module_detail) {
switch($row['module_type']) { switch($row['module_type']) {
case 15: case 15:
$value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module_id); $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module_id);
if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0'){
$data[] = human_milliseconds_to_string($row['data']); if($post_process > 0){
else $data[] = human_milliseconds_to_string($row['data'] / $post_process);
} else {
$data[] = human_milliseconds_to_string($row['data']);
}
}else{
$data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision'])); $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision']));
}
break; break;
default: default:
$data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision'])); $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision']));
@ -970,10 +978,16 @@ if ($list_modules) {
switch($module['id_tipo_modulo']) { switch($module['id_tipo_modulo']) {
case 15: case 15:
$value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']); $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0'){
$salida = human_milliseconds_to_string($module['datos']); if($module['post_process']>0){
else $salida = human_milliseconds_to_string($module['datos'] / $module['post_process']);
} else {
$salida = human_milliseconds_to_string($module['datos']);
}
} else {
$salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision'])); $salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision']));
}
break; break;
default: default:
$salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision'])); $salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision']));
@ -986,16 +1000,20 @@ if ($list_modules) {
switch($module['id_tipo_modulo']) { switch($module['id_tipo_modulo']) {
case 15: case 15:
$value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']); $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0'){
$salida = human_milliseconds_to_string($module['datos']); if($module['post_process']>0){
else $salida = human_milliseconds_to_string($module['datos'] / $module['post_process']);
} else {
$salida = human_milliseconds_to_string($module['datos']);
}
} else {
$salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision'])); $salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision']));
}
break; break;
default: default:
$salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision'])); $salida = remove_right_zeros(number_format($module["datos"], $config['graph_precision']));
break; break;
} }
//~ $salida = (number_format($module["datos"], $config['graph_precision']));
} }
// Show units ONLY in numeric data types // Show units ONLY in numeric data types
if (isset($module["unit"])) { if (isset($module["unit"])) {