diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7632c9a8b4..951898b579 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,23 @@ +2013-07-24 Sergio Martin + + * include/functions_visual_map.php + include/functions_agents.php + include/functions_modules.php + include/functions_reporting.php + include/constants.php + operation/agentes/status_monitor.php + operation/agentes/estado_agente.php + operation/agentes/estado_monitores.php + mobile/operation/agents.php + mobile/operation/modules.php + godmode/agentes/module_manager.php: Fix typo + errors on few constants + + * operation/tree.php: Fix status check for + async not init modules to set the status in + modules branch of tree view. Now it depends on + the server + 2013-07-24 Sergio Martin * include/functions_modules.php diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 091120744d..34b6ae1a03 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -191,7 +191,7 @@ if ($multiple_delete) { SET warning_count = warning_count - 1 WHERE id_agente=' . $module['id_agente']); } - else if ($module['estado'] == AGENT_MODULE_STATUS_UNKNOW) { + else if ($module['estado'] == AGENT_MODULE_STATUS_UNKNOWN) { db_process_sql ('UPDATE tagente SET unknown_count = unknown_count - 1 WHERE id_agente =' . $module['id_agente']); diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 6cd43c2032..c1032c9641 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -146,7 +146,7 @@ define('AGENT_MODULE_STATUS_NO_DATA', 4); define('AGENT_MODULE_STATUS_NORMAL', 0); define('AGENT_MODULE_STATUS_NOT_NORMAL', 6); define('AGENT_MODULE_STATUS_WARNING', 2); -define('AGENT_MODULE_STATUS_UNKNOW', 3); +define('AGENT_MODULE_STATUS_UNKNOWN', 3); define('AGENT_MODULE_STATUS_NOT_INIT', 5); /* Agent module status */ @@ -155,7 +155,7 @@ define('AGENT_STATUS_CRITICAL', 1); define('AGENT_STATUS_NORMAL', 0); define('AGENT_STATUS_NOT_INIT', 5); define('AGENT_STATUS_NOT_NORMAL', 6); -define('AGENT_STATUS_UNKNOW', 3); +define('AGENT_STATUS_UNKNOWN', 3); define('AGENT_STATUS_ALERT_FIRED', 4); define('AGENT_STATUS_WARNING', 2); @@ -186,14 +186,14 @@ define('VISUAL_MAP_STATUS_CRITICAL_BAD', 1); 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_UNKNOWN', 3); define('VISUAL_MAP_STATUS_WARNING_ALERT', 10); /* Service constants */ //Status -define('SERVICE_STATUS_UNKNOW', -1); +define('SERVICE_STATUS_UNKNOWN', -1); define('SERVICE_STATUS_NORMAL', 0); define('SERVICE_STATUS_CRITICAL', 1); define('SERVICE_STATUS_WARNING', 2); diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 4c64cb8f28..2aac1b65e3 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -286,7 +286,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o $status_sql = "critical_count > 0"; break; - case AGENT_STATUS_UNKNOW: + case AGENT_STATUS_UNKNOWN: $status_sql = "critical_count = 0 AND warning_count = 0 AND unknown_count > 0"; @@ -1468,7 +1468,7 @@ function agents_get_status_from_counts($agent) { return AGENT_MODULE_STATUS_WARNING; } else if ($agent['unknown_count'] > 0) { - return AGENT_MODULE_STATUS_UNKNOW; + return AGENT_MODULE_STATUS_UNKNOWN; } else if ($agent['normal_count'] == $agent['total_count']) { return AGENT_MODULE_STATUS_NORMAL; @@ -1551,7 +1551,7 @@ function agents_get_status($id_agent = 0, $noACLs = false) { } if (! $status) - return AGENT_MODULE_STATUS_UNKNOW; + return AGENT_MODULE_STATUS_UNKNOWN; } // Checking if any module has alert fired @@ -1567,8 +1567,8 @@ function agents_get_status($id_agent = 0, $noACLs = false) { return AGENT_MODULE_STATUS_WARNING; } // Checking if any module has unknown status - elseif (is_int(array_search(AGENT_MODULE_STATUS_UNKNOW, $modules_status))) { - return AGENT_MODULE_STATUS_UNKNOW; + elseif (is_int(array_search(AGENT_MODULE_STATUS_UNKNOWN, $modules_status))) { + return AGENT_MODULE_STATUS_UNKNOWN; } else { return AGENT_MODULE_STATUS_NORMAL; diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 7a89eda6f2..d844e6ff59 100644 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -237,7 +237,7 @@ function modules_delete_agent_module ($id_agent_module) { SET warning_count=warning_count-1 WHERE id_agente=' . $module['id_agente']); } - else if ($module['estado'] == AGENT_MODULE_STATUS_UNKNOW) { + else if ($module['estado'] == AGENT_MODULE_STATUS_UNKNOWN) { db_process_sql ('UPDATE tagente SET unknown_count=unknown_count-1 WHERE id_agente=' . $module['id_agente']); @@ -1436,7 +1436,7 @@ function modules_get_status($id_agent_module, $db_status, $data, &$status, &$tit $status = STATUS_MODULE_OK; $title = __('NORMAL'); } - elseif ($db_status == AGENT_MODULE_STATUS_UNKNOW) { + elseif ($db_status == AGENT_MODULE_STATUS_UNKNOWN) { $status = STATUS_AGENT_DOWN; $last_status = modules_get_agentmodule_last_status($id_agent_module); switch($last_status) { @@ -1600,4 +1600,4 @@ function modules_group_agent_warning ($module_group) { AND critical_count = 0 AND warning_count > 0 AND id_module_group = $module_group"); } -?> \ No newline at end of file +?> diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 4a37ea7ba3..fbdade6589 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1016,7 +1016,7 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he "refr=60&status=" . AGENT_MODULE_STATUS_NORMAL; $urls['monitor_unknown'] = "index.php?" . "sec=estado&sec2=operation/agentes/status_monitor&" . - "refr=60&status=" . AGENT_MODULE_STATUS_UNKNOW; + "refr=60&status=" . AGENT_MODULE_STATUS_UNKNOWN; $urls['monitor_not_init'] = "index.php?" . "sec=estado&sec2=operation/agentes/status_monitor&" . "refr=60&status=" . AGENT_MODULE_STATUS_NOT_INIT; diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 00399fdb2c..3975b9fbea 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -88,7 +88,7 @@ function visual_map_print_item($layoutData) { //Warning $colorStatus = "#ffff00"; break; - case VISUAL_MAP_STATUS_UNKNOW: + case VISUAL_MAP_STATUS_UNKNOWN: default: //Unknown // Default is Blue (Other) @@ -838,10 +838,10 @@ function visual_map_get_status_element($layoutData) { else if ($layoutData['id_agent'] != 0) { $status = agents_get_status ($layoutData["id_agent"]); if ($status == -1) // agents_get_status return -1 for unknown! - $status = VISUAL_MAP_STATUS_UNKNOW; + $status = VISUAL_MAP_STATUS_UNKNOWN; } else { - $status = VISUAL_MAP_STATUS_UNKNOW; + $status = VISUAL_MAP_STATUS_UNKNOWN; $id_agent = 0; } @@ -971,7 +971,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line $line['node_end'] = 'layout-data-'.$layout_data["id"]; switch ($status_parent) { default: - case VISUAL_MAP_STATUS_UNKNOW: + case VISUAL_MAP_STATUS_UNKNOWN: $line["color"] = COL_UNKNOWN; // Gray break; case VISUAL_MAP_STATUS_WARNING: @@ -1013,7 +1013,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line //Warning $colorStatus = COL_WARNING; break; - case VISUAL_MAP_STATUS_UNKNOW: + case VISUAL_MAP_STATUS_UNKNOWN: default: //Unknown $colorStatus = COL_UNKNOWN; @@ -1121,7 +1121,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line case VISUAL_MAP_STATUS_WARNING: $img .= "_warning.png"; break; - case VISUAL_MAP_STATUS_UNKNOW: + case VISUAL_MAP_STATUS_UNKNOWN: default: // Default is Grey (Other) $img .= ".png"; @@ -1803,7 +1803,7 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0) { // TODO: Implement this limit as a configurable item in setup if ($depth > 10) { - return VISUAL_MAP_STATUS_UNKNOW; // No status data if we need to exit by a excesive recursion + return VISUAL_MAP_STATUS_UNKNOWN; // No status data if we need to exit by a excesive recursion } $id_layout = (int) $id_layout; diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php index ef690031f1..8cbf6ff694 100644 --- a/pandora_console/mobile/operation/agents.php +++ b/pandora_console/mobile/operation/agents.php @@ -34,7 +34,7 @@ class Agents { AGENT_MODULE_STATUS_CRITICAL_ALERT => __('Alert'), AGENT_MODULE_STATUS_NORMAL => __('Normal'), AGENT_MODULE_STATUS_WARNING => __('Warning'), - AGENT_MODULE_STATUS_UNKNOW => __('Unknow')); + AGENT_MODULE_STATUS_UNKNOWN => __('Unknown')); if ($system->checkACL($this->acl)) { $this->correct_acl = true; @@ -445,4 +445,4 @@ class Agents { } } -?> \ No newline at end of file +?> diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php index df804b02d2..8ae5454484 100644 --- a/pandora_console/mobile/operation/modules.php +++ b/pandora_console/mobile/operation/modules.php @@ -39,7 +39,7 @@ class Modules { AGENT_MODULE_STATUS_NORMAL => __('Normal'), AGENT_MODULE_STATUS_WARNING => __('Warning'), AGENT_MODULE_STATUS_CRITICAL_BAD => __('Critical'), - AGENT_MODULE_STATUS_UNKNOW => __('Unknown'), + AGENT_MODULE_STATUS_UNKNOWN => __('Unknown'), AGENT_MODULE_STATUS_NOT_NORMAL => __('Not normal'), //default AGENT_MODULE_STATUS_NOT_INIT => __('Not init')); @@ -322,7 +322,7 @@ class Modules { elseif ($this->status == AGENT_MODULE_STATUS_NOT_NORMAL) { //Not normal $sql_conditions .= " AND tagente_estado.estado <> 0"; } - elseif ($this->status == AGENT_MODULE_STATUS_UNKNOW) { //Unknown + elseif ($this->status == AGENT_MODULE_STATUS_UNKNOWN) { //Unknown $sql_conditions .= " AND tagente_estado.estado = 3 AND tagente_estado.utimestamp <> 0"; } elseif ($this->status == AGENT_MODULE_STATUS_NOT_INIT) { //Not init @@ -688,4 +688,4 @@ class Modules { } } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 4cca83b3c7..8848ecb51e 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -176,7 +176,7 @@ $fields = array (); $fields[AGENT_STATUS_NORMAL] = __('Normal'); $fields[AGENT_STATUS_WARNING] = __('Warning'); $fields[AGENT_STATUS_CRITICAL] = __('Critical'); -$fields[AGENT_STATUS_UNKNOW] = __('Unknown'); +$fields[AGENT_STATUS_UNKNOWN] = __('Unknown'); $fields[AGENT_STATUS_NOT_NORMAL] = __('Not normal'); $fields[AGENT_STATUS_NOT_INIT] = __('Not init'); diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 5b82938162..54f578512f 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -637,7 +637,7 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1, AGENT_MODULE_STATUS_NORMAL => __('Normal'), AGENT_MODULE_STATUS_NOT_NORMAL => __('Not Normal'), AGENT_MODULE_STATUS_WARNING => __('Warning'), - AGENT_MODULE_STATUS_UNKNOW => __('Unknow')); + AGENT_MODULE_STATUS_UNKNOWN => __('Unknown')); $table->data[0][1] = html_print_select ($status_list, 'status_filter_monitor', $status_filter_monitor, '', '', 0, true); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index b31eb10325..fae76fa19f 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -144,7 +144,7 @@ elseif ($status == AGENT_MODULE_STATUS_WARNING) { //Warning elseif ($status == AGENT_MODULE_STATUS_NOT_NORMAL) { //Not normal $sql_conditions .= " AND tagente_estado.estado <> 0"; } -elseif ($status == AGENT_MODULE_STATUS_UNKNOW) { //Unknown +elseif ($status == AGENT_MODULE_STATUS_UNKNOWN) { //Unknown $sql_conditions .= " AND tagente_estado.estado = 3 AND tagente_estado.utimestamp <> 0"; } elseif ($status == AGENT_MODULE_STATUS_NOT_INIT) { //Not init @@ -357,7 +357,7 @@ $fields = array (); $fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal'); $fields[AGENT_MODULE_STATUS_WARNING] = __('Warning'); $fields[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical'); -$fields[AGENT_MODULE_STATUS_UNKNOW] = __('Unknown'); +$fields[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown'); $fields[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal'); //default $fields[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init'); diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index e1c09632c6..7fe527219a 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -342,28 +342,25 @@ if (is_ajax ()) else html_print_image ("operation/tree/last_leaf.png", false, array ("style" => 'vertical-align: middle;', "id" => "tree_image_os_" . $row["id_agente"], "pos_tree" => "2" )); - // This line checks for (non-initialized) asyncronous modules - if ($row["estado"] == 0 AND $row["utimestamp"] == 0 - AND ($row["id_tipo_modulo"] >= 21 - AND $row["id_tipo_modulo"] <= 23)) { - $status = STATUS_MODULE_NO_DATA; - $title = __('UNKNOWN'); - } // Else checks module status - elseif ($row["estado"] == 1) { - $status = STATUS_MODULE_CRITICAL; - $title = __('CRITICAL'); - } - elseif ($row["estado"] == 2) { - $status = STATUS_MODULE_WARNING; - $title = __('WARNING'); - } - elseif ($row["estado"] == 3) { - $status = STATUS_MODULE_NO_DATA; - $title = __('UNKNOWN'); - } - else { - $status = STATUS_MODULE_OK; - $title = __('NORMAL'); + // Assign image and status depend on the status data + switch ($row["estado"]) { + case AGENT_MODULE_STATUS_NO_DATA: + case AGENT_MODULE_STATUS_UNKNOWN: + $status = STATUS_MODULE_NO_DATA; + $title = __('UNKNOWN'); + break; + case AGENT_MODULE_STATUS_CRITICAL_BAD: + $status = STATUS_MODULE_CRITICAL; + $title = __('CRITICAL'); + break; + case AGENT_MODULE_STATUS_WARNING: + $status = STATUS_MODULE_WARNING; + $title = __('WARNING'); + break; + default: + $status = STATUS_MODULE_OK; + $title = __('NORMAL'); + break; } if (is_numeric($row["datos"])) {