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

2013-01-15 Dario Rodriguez <dario.rodriguez@artica.es> 

* include/functions_visual_map.php: Now modules with warning
        status and alert fired are in yellow with orange border, before
        they were red with orange border.
        * include/constants.php: Mew constant for visual map to
        identify modules with warning status and alerts fired.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2013-01-15 10:09:37 +00:00
parent c92b473301
commit 08d2dac7b3
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-01-15 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_visual_map.php: Now modules with warning
status and alert fired are in yellow with orange border, before
they were red with orange border.
* include/constants.php: Mew constant for visual map to
identify modules with warning status and alerts fired.
MERGED FROM 4.0.2
2013-01-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/db/postgresql.php

1
pandora_console/include/constants.php
View File

@ -166,6 +166,7 @@ define('VISUAL_MAP_STATUS_CRITICAL_ALERT', 4);
define('VISUAL_MAP_STATUS_NORMAL', 0);
define('VISUAL_MAP_STATUS_WARNING', 2);
define('VISUAL_MAP_STATUS_UNKNOW', 3);
define('VISUAL_MAP_STATUS_WARNING_ALERT', 10);

12
pandora_console/include/functions_visual_map.php
View File

@ -819,6 +819,15 @@ function visual_map_get_status_element($layoutData) {
//Status for a simple module
if ($layoutData['id_agente_modulo'] != 0) {
$status = modules_get_agentmodule_status ($layoutData['id_agente_modulo']);
//We need to get the diference between warning and critical alerts!!!
$real_status = db_get_row ("tagente_estado", "id_agente_modulo", $layoutData["id_agente_modulo"]);
if ($real_status['estado'] == 2) {
//This module has an alert fired and warning status
$status = VISUAL_MAP_STATUS_WARNING_ALERT;
}
//Status for a whole agent, if agente_modulo was == 0
}
@ -1087,6 +1096,9 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
case VISUAL_MAP_STATUS_CRITICAL_ALERT:
$img = "4".$img."_bad.png";
break;
case VISUAL_MAP_STATUS_WARNING_ALERT:
$img = "4".$img."_warning.png";
break;
case VISUAL_MAP_STATUS_NORMAL:
$img .= "_ok.png";
break;