From 1261c751a912717943280eaa227574983dc5bc85 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 9 Aug 2010 08:43:56 +0000 Subject: [PATCH] 2010-08-09 Sergio Martin * operation/agentes/agents_modules_view.php operation/agentes/tactical.php operation/agentes/group_view.php operation/menu.php: Added the agents VS modules matrix and changed the color of some alert fired numbers and table rows git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3108 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 + .../operation/agentes/agents_modules_view.php | 186 ++++++++++++++++++ .../operation/agentes/group_view.php | 2 +- .../operation/agentes/tactical.php | 4 +- pandora_console/operation/menu.php | 3 + 5 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 pandora_console/operation/agentes/agents_modules_view.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a28142186a..b3b0de04de 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2010-08-09 Sergio Martin + + * operation/agentes/agents_modules_view.php + operation/agentes/tactical.php + operation/agentes/group_view.php + operation/menu.php: Added the agents VS modules matrix + and changed the color of some alert fired numbers and + table rows + 2010-08-06 Sergio Martin * include/functions_alerts.php diff --git a/pandora_console/operation/agentes/agents_modules_view.php b/pandora_console/operation/agentes/agents_modules_view.php new file mode 100644 index 0000000000..1bb01fdb78 --- /dev/null +++ b/pandora_console/operation/agentes/agents_modules_view.php @@ -0,0 +1,186 @@ + $module) { + if($module == $name){ + $modules_by_name[$cont-1]['id'][] = $key; + } + else{ + $name = $module; + $modules_by_name[$cont]['name'] = $name; + $modules_by_name[$cont]['id'][] = $key; + $cont ++; + } +} + +echo ''; + +if($hor_offset > 0) { + $new_hor_offset = $hor_offset-$block; + echo ""; +} + +echo ""; + +$nmodules = 0; +foreach($modules_by_name as $module) { + $nmodules++; + + if($nmodules <= $hor_offset || $nmodules > ($hor_offset+$block)) { + continue; + } + echo ""; +} + + if(($hor_offset + $block) < $nmodules) { + $new_hor_offset = $hor_offset+$block; + echo ""; + } + +$agents = get_agents (array ('offset' => (int) $offset, + 'limit' => (int) $config['block_size'])); + +// Prepare pagination +pagination ((int)count(get_agents ())); +echo "
"; + +foreach ($agents as $agent) { + // Get stats for this group + $data = get_agent_module_info($agent['id_agente']); + + // Calculate entire row color + if ($data["monitor_alertsfired"] > 0){ + echo ""; + } elseif ($data["monitor_critical"] > 0) { + echo ""; + } elseif ($data["monitor_warning"] > 0) { + echo ""; + } elseif ($data["monitor_unknown"] > 0) { + echo ""; + } elseif ($data["monitor_normal"] > 0) { + echo ""; + } else { + echo ""; + } + + if($hor_offset > 0) { + echo ""; + } + + echo ""; + $agent_modules = get_agent_modules($agent['id_agente']); + + $nmodules = 0; + + foreach($modules_by_name as $module) { + $nmodules++; + + if($nmodules <= $hor_offset || $nmodules > ($hor_offset+$block)) { + continue; + } + + $match = false; + + foreach($module['id'] as $module_id){ + if(!$match && array_key_exists($module_id,$agent_modules)) { + $status = get_agentmodule_status($module_id); + echo ""; + $match = true; + } + } + + if(!$match) { + echo ""; + } + } + + if(($hor_offset+$block) < $nmodules) { + echo ""; + } + echo ""; +} + +echo "
<< ".__("Agents")." \\ ".__("Modules")."".printTruncateText($module['name'],4, false).">>
".printTruncateText($agent['nombre'],20).""; + switch($status){ + case 0: + print_status_image ('module_ok.png', $module['name']." in ".$agent['nombre'].": ".__('NORMAL')); + break; + case 1: + print_status_image ('module_critical.png', $module['name']." in ".$agent['nombre'].": ".__('CRITICAL')); + break; + case 2: + print_status_image ('module_warning.png', $module['name']." in ".$agent['nombre'].": ".__('WARNING')); + break; + case 3: + print_status_image ('module_unknown.png', $module['name']." in ".$agent['nombre'].": ".__('UNKNOWN')); + break; + case 4: + print_status_image ('module_alertsfired.png', $module['name']." in ".$agent['nombre'].": ".__('ALERTS FIRED')); + break; + } + echo "
"; + +?> + diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index 9f9d8f742e..6982fd96d4 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -101,7 +101,7 @@ foreach ($groups as $id_group => $group_name) { // Calculate entire row color if ($data["monitor_alerts_fired"] > 0){ - echo ""; + echo ""; } elseif ($data["monitor_critical"] > 0) { echo ""; } elseif ($data["monitor_warning"] > 0) { diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 8257963763..ddc9e7fd9d 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -126,7 +126,7 @@ $cells[3]["color"] = "#c00"; $cells[2][0] = __('Monitors warning'); $cells[2][1] = $data["monitor_warning"]; $cells[2]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=1"; //Down -$cells[2]["color"] = "#ffb900"; +$cells[2]["color"] = "#ffcc00"; $cells[1][0] = __('Monitors normal'); $cells[1][1] = $data["monitor_ok"]; @@ -151,7 +151,7 @@ $cells[6]["color"] = "#000"; $cells[7][0] = __('Alerts fired'); $cells[7][1] = $data["monitor_alerts_fired"]; $cells[7]["href"] = "index.php?sec=eventos&sec2=operation/events/events&search=&event_type=alert_fired"; //Fired alert events -$cells[7]["color"] = "#c00"; +$cells[7]["color"] = "#ff8800"; print_cells_temp ($cells); diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 083ae2a3a1..9b8a60c873 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -47,6 +47,9 @@ if (give_acl ($config['id_user'], 0, "AR")) { $sub["operation/agentes/group_view"]["text"] = __('Group view'); $sub["operation/agentes/group_view"]["refr"] = 60; + $sub["operation/agentes/agents_modules_view"]["text"] = __('Agents/Modules view'); + $sub["operation/agentes/agents_modules_view"]["refr"] = 60; + $sub["operation/agentes/networkmap"]["text"] = __('Network map'); $sub["operation/agentes/estado_agente"]["text"] = __('Agent detail');