diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3c6ad42cfc..59922eccda 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -10,6 +10,16 @@ * ChangeLog: Style correction again. Please, be careful. +2009-01-21 Sancho Lerena <slerena@artica.es> + + * operation/agentes/status_monitor.php: Added filter for modulegroup + + * operation/agentes/estado_ultimopaquete.php: Removed link to edit. + + * operation/agentes/estado_monitores.php: Fixed link to edit module + + * godmode/agentes/configurar_agente.php: Edit tabs more tiny. + 2009-01-21 Sancho Lerena <slerena@artica.es> * pandoradb_data.sql: Updated DB Schema version/build. diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index ed2bf2c26e..1625481368 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -188,7 +188,7 @@ echo "<div id='menu_tab_frame'>"; echo "<div id='menu_tab_left'><ul class='mn'>"; echo "<li class='nomn'>"; echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente'> -<img src='images/setup.png' class='top' border='0'> ".substr(get_agent_name ($id_agente),0,15)." - ".__('Setup mode')."</a>"; +<img src='images/setup.png' class='top' border='0'> ".substr(get_agent_name ($id_agente),0,21)."</a>"; echo "</li>"; echo "</ul></div>"; @@ -203,7 +203,7 @@ if ($tab == "main") { } else { echo "<li class='nomn'>"; } -echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=$id_agente'><img src='images/cog.png' width='16' class='top' border='0'> ".__('Setup Agent')."</a>"; +echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=$id_agente'><img src='images/cog.png' width='16' class='top' border='0'> ".__('Setup')."</a>"; echo "</li>"; if ($tab == "module") { diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index f9c0209dd9..c36d1015a2 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -68,7 +68,7 @@ foreach ($modules as $module) { $data[1] = show_server_type ($module['id_modulo']); $data[1] .= ' <img src="images/'.show_icon_type ($module["id_tipo_modulo"]).'" border="0">'; if (give_acl ($config['id_user'], $id_grupo, "AW")) - $data[1] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&update_module='.$module["id_agente_modulo"].'&moduletype=2#modules"><img src="images/config.png"></a>'; + $data[1] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&update_module='.$module["id_agente_modulo"].'&moduletype='.$module["id_modulo"].'#modules"><img src="images/config.png"></a>'; $data[2] = substr ($module["nombre"], 0, 25); $data[3] = substr ($module["descripcion"], 0, 35); diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index a4d627dccf..029c0924e2 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -109,13 +109,8 @@ if (mysql_num_rows ($result3)) { echo "<td class='".$tdcolor."_id' title='".salida_limpia($row3["nombre"])."'>"; echo salida_limpia(substr($row3["nombre"],0,15)); echo "</td><td class='".$tdcolor."'>"; - - echo show_server_type ($row3['id_modulo']); - echo " <img src='images/".show_icon_type($row3["id_tipo_modulo"])."' border=0>"; - if (give_acl ($config['id_user'], $id_grupo, "AW")) - echo '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&update_module='.$row3["id_agente_modulo"].'&moduletype=2#modules"><img src="images/config.png"></a>'; - - + + echo " <img src='images/".show_icon_type($row3["id_tipo_modulo"])."' border=0>"; echo "</td><td class='".$tdcolor."'>"; if ($row3["module_interval"] != 0){ echo $row3["module_interval"]; diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 57127acd33..2ac09febe1 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -2,7 +2,7 @@ // Pandora FMS - the Flexible Monitoring System // ============================================ -// Copyright (c) 2008 Artica Soluciones Tecnologicas, http://www.artica.es +// Copyright (c) 2009 Artica Soluciones Tecnologicas, http://www.artica.es // Please see http://pandora.sourceforge.net for full contribution list // This program is free software; you can redistribute it and/or @@ -36,7 +36,8 @@ $ag_freestring = get_parameter ("ag_freestring", ""); $ag_modulename = get_parameter ("ag_modulename", ""); $ag_group = get_parameter ("ag_group", -1); $offset = get_parameter ("offset", 0); -$status = get_parameter ("status", 0); +$status = get_parameter ("status", 4); +$modulegroup = get_parameter ("modulegroup", 0); $url = ''; if ($ag_group > 0) { @@ -51,10 +52,13 @@ if ($ag_freestring != "") { if ($status != 0) { $url .= "&status=".$status; } +if ($modulegroup != 0) { + $url .= "&modulegroup=".$modulegroup; +} echo '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60'.$url.'">'; -echo '<table cellspacing="4" cellpadding="4" width="600" class="databox">'; +echo '<table cellspacing="4" cellpadding="4" width="750" class="databox">'; echo '<tr><td valign="middle">'.__('Group').'</td>'; echo '<td valign="middle">'; @@ -71,8 +75,17 @@ $fields[3] = __('Unknown'); $fields[4] = __('Not normal'); print_select ($fields, "status", $status, 'this.form.submit();', __('All'), -1); +echo '</td>'; -echo '</td></tr><tr><td valign="middle">'.__('Module name').'</td>'; + + +echo '<td valign="middle">'.__('Module group').'</td>'; +echo '<td valign="middle">'; +print_select_from_sql ("SELECT * FROM tmodule_group order by name", "modulegroup",$modulegroup, '',__('All'), 0); + + + +echo '</tr><tr><td valign="middle">'.__('Module name').'</td>'; echo '<td valign="middle">'; $result = get_db_all_rows_sql ("SELECT DISTINCT(nombre) FROM tagente_modulo ORDER BY nombre"); @@ -113,6 +126,12 @@ if ($ag_group > 1 && give_acl ($config["id_user"], $ag_group, "AR")) { $sql .= " AND tagente.id_grupo IN (".implode (",", array_keys (get_user_groups ())).")"; } +// Module group +if ($modulegroup > 0) { + $sql .= sprintf (" AND tagente_modulo.id_module_group = '%d'", $modulegroup); +} + + // Module name selector if ($ag_modulename != "") { $sql .= sprintf (" AND tagente_modulo.nombre = '%s'", $ag_modulename);