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

Merge branch '2385-Siguen-fallando-los-mapas-en-la-metaconsola-dev' into 'develop'

Browse Source 
Fixed node connection in visual_map

See merge request artica/pandorafms!1637
This commit is contained in:
vgilc 2018-08-01 15:06:27 +02:00
commit ce18002ae5
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/functions_visual_map.php
View File

@ -1731,15 +1731,27 @@ function visual_map_print_item($mode = "read", $layoutData,
$result = array_merge($result, $result_server); $result = array_merge($result, $result_server);
} }
if ($connection) {
metaconsole_restore_db();
}
} }
} }
if (($layoutData['image'] != null && $layoutData['image'] != 'none') || $layoutData['show_statistics'] == 1) { if (($layoutData['image'] != null && $layoutData['image'] != 'none') || $layoutData['show_statistics'] == 1) {
$img_style_title = strip_tags($label); $img_style_title = strip_tags($label);
if ($layoutData['type'] == STATIC_GRAPH) { if ($layoutData['type'] == STATIC_GRAPH) {
if ($layoutData['id_agente_modulo'] != 0) { if ($layoutData['id_agente_modulo'] != 0) {
if ($layoutData['id_metaconsole'] != 0) {
//Metaconsole db connection
$connection = db_get_row_filter ('tmetaconsole_setup',
array('id' => $layoutData['id_metaconsole']));
if (metaconsole_load_external_db($connection) != NOERR) {
continue;
}
}
$unit_text = trim(io_safe_output( $unit_text = trim(io_safe_output(
modules_get_unit($layoutData['id_agente_modulo']))); modules_get_unit($layoutData['id_agente_modulo'])));
@ -1759,6 +1771,11 @@ function visual_map_print_item($mode = "read", $layoutData,
" <br>" . __("Last value: ") " <br>" . __("Last value: ")
. remove_right_zeros(number_format($value, $config['graph_precision'])).$unit_text; . remove_right_zeros(number_format($value, $config['graph_precision'])).$unit_text;
} }
if ($layoutData['id_metaconsole'] != 0) {
//Restore db connection
metaconsole_restore_db();
}
} }
if(get_parameter('action') == 'edit'){ if(get_parameter('action') == 'edit'){
@ -3172,14 +3189,18 @@ function visual_map_get_status_element($layoutData) {
$module_status = db_get_sql ('SELECT estado $module_status = db_get_sql ('SELECT estado
FROM tagente_estado FROM tagente_estado
WHERE id_agente_modulo = ' . $layoutData['id_agente_modulo']); WHERE id_agente_modulo = ' . $layoutData['id_agente_modulo']);
switch($module_status) { switch($module_status) {
case AGENT_STATUS_NORMAL: case AGENT_STATUS_NORMAL:
case AGENT_MODULE_STATUS_NORMAL_ALERT:
$layoutData['status_calculated'] = VISUAL_MAP_STATUS_NORMAL; $layoutData['status_calculated'] = VISUAL_MAP_STATUS_NORMAL;
break; break;
case AGENT_MODULE_STATUS_WARNING: case AGENT_MODULE_STATUS_WARNING:
case AGENT_MODULE_STATUS_WARNING_ALERT:
$layoutData['status_calculated'] = VISUAL_MAP_STATUS_WARNING; $layoutData['status_calculated'] = VISUAL_MAP_STATUS_WARNING;
break; break;
case AGENT_STATUS_CRITICAL: case AGENT_STATUS_CRITICAL:
case AGENT_MODULE_STATUS_CRITICAL_ALERT:
$layoutData['status_calculated'] = VISUAL_MAP_STATUS_CRITICAL_BAD; $layoutData['status_calculated'] = VISUAL_MAP_STATUS_CRITICAL_BAD;
break; break;
case AGENT_MODULE_STATUS_NO_DATA: case AGENT_MODULE_STATUS_NO_DATA: