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

Merge branch 'ent-2707-System-Uptime-data-show-bug' into 'develop'

Browse Source 
Fixed bug data in history show

See merge request artica/pandorafms!2504
This commit is contained in:
Alejandro Fraguas 2019-06-18 11:15:59 +02:00
commit ec73be66f5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,11 +392,16 @@ if (check_login()) {
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);
// System Uptime:
// In case of System Uptime module, shows data in format "Days hours minutes seconds" if and only if
// selected module unit is "_timeticks_"
// Take notice that selected unit may not be postrocess unit
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') {
if ($post_process > 0) { $data_macro = modules_get_unit_macro($row[$attr[0]], $unit);
$data[] = human_milliseconds_to_string(($row['data'] / $post_process)); if ($data_macro) {
$data[] = $data_macro;
} else { } else {
$data[] = human_milliseconds_to_string($row['data']); $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision']));
} }
} else { } 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']));

1
pandora_console/include/functions_modules.php
View File

@ -2230,6 +2230,7 @@ function modules_get_agentmodule_data(
'module_name' => $values[$key]['module_name'], 'module_name' => $values[$key]['module_name'],
'agent_id' => $values[$key]['agent_id'], 'agent_id' => $values[$key]['agent_id'],
'agent_name' => $values[$key]['agent_name'], 'agent_name' => $values[$key]['agent_name'],
'module_type' => $values[$key]['module_type'],
]; ];
} }