(Pandora Console)

* estado_agente.php: Clean code, add new text about authors

* configurar_agente.php: Solve small bug that in some cases the module association form didn't work.Added the feature of disable the not required inputs for the different type of agents while editingmodule.

* indicent_search.php: Add new text about authors and add a line between table and button (cosmetic change)

* setup.php: Add new text about authors and add a line between table and button (cosmetic change)

* estado_grupo.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.

* view_server.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.

* snmp_alert.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. Cosmetic change, adding class 'suc' when creating alert is successful.

* snmp_view.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.

* tip.css: Change class padding to not showing error in Firefox Javascript Console

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@119 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2006-07-11 08:49:21 +00:00
parent a5ce1bb1d9
commit 88f5d5e86e
11 changed files with 185 additions and 71 deletions

View File

@ -1,3 +1,25 @@
2006-07-11 Raul Mateos <raulofpandora@gmail.com>
* estado_agente.php: Clean code, add new text about authors
* configurar_agente.php: Solve small bug that in some cases the module association form didn't work.
Added the feature of disable the not required inputs for the different type of agents while editing
module.
* indicent_search.php: Add new text about authors and add a line between table and button (cosmetic change)
* setup.php: Add new text about authors and add a line between table and button (cosmetic change)
* estado_grupo.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.
* view_server.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.
* snmp_alert.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. Cosmetic change, adding class 'suc' when creating alert is successful.
* snmp_view.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.
* tip.css: Change class padding to not showing error in Firefox Javascript Console
2006-07-09 Sancho Lerena <slerena@artica.es>
* ChangeLog: Create this file, prior to launch final 1.2 version. For the next
@ -20,4 +42,3 @@
we take now the more higest interval in modules to calculate if an agent is DOWN.
* fgraph.php: updated progressbar function to show N/A when data is above 100 or below 0.

View File

@ -145,6 +145,7 @@ function type_change()
<?php
// Load global vars
require("include/config.php");
if (give_acl($id_user, 0, "AW")==1) {
// Init vars
$descripcion = "";
@ -512,7 +513,15 @@ if (give_acl($id_user, 0, "AW")==1) {
if ($snmp_oid == ""){
$snmp_oid = $combo_snmp_oid;
}
if (!isset($tcp_port) || $tcp_port== "") {
$tcp_port= "0";
}
if (!isset($modulo_max) || $modulo_max=="") {
$modulo_max= "0";
}
if (!isset($modulo_min) || $modulo_min=="") {
$modulo_min= "0";
}
$sql_insert = "INSERT INTO tagente_modulo (id_agente,id_tipo_modulo,nombre,descripcion,max,min,snmp_oid,snmp_community,id_module_group,module_interval,ip_target,tcp_port,tcp_rcv,tcp_send) VALUES (".$id_agente.",".$id_tipo_modulo.",'".$nombre."','".$descripcion."','".$modulo_max."','".$modulo_min."', '$snmp_oid', '$snmp_community', '$id_module_group', '$module_interval', '$ip_target', '$tcp_port', '$tcp_rcv', '$tcp_send')";
// Init vars to null to avoid trash in forms
$id_tipo_modulo = "";$nombre = "";$descripcion = "";$modulo_max = "";
@ -521,7 +530,8 @@ if (give_acl($id_user, 0, "AW")==1) {
$snmp_oid = "";$snmp_community = "";$id_module_group = "";
$module_interval = "";
//echo "DEBUG ".$sql_insert;
//echo "DEBUG: ".$sql_insert;
$result=mysql_query($sql_insert);
$id_agente_modulo = mysql_insert_id();
// Create with different estado if proc type or data type
@ -744,7 +754,7 @@ if ( $creacion_agente != 1) {
echo "<td class='$tdcolor'>";
if ($id_tipo != -1)
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=".$id_agente."&delete_module=".$row["id_agente_modulo"]."'><img src='images/cancel.gif' border=0 alt='".$lang_label["delete"]."'></b></a> &nbsp; ";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=".$id_agente."&update_module=".$row["id_agente_modulo"]."#modules'><img src='images/config.gif' border=0 alt='".$lang_label["update"]."'></b></a>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=".$id_agente."&update_module=".$row["id_agente_modulo"]."#modules'><img src='images/config.gif' border=0 alt='".$lang_label["update"]."' onLoad='type_change()'></b></a>";
}
echo "<tr><td colspan='7'><div class='raya'></div></td></tr>";
} else
@ -828,7 +838,7 @@ echo '<form name="modulo" method="post" action="index.php?sec=gagente&sec2=godmo
if ($update_module == "1"){
echo '<input type="hidden" name="update_module" value=1>';
echo '<input type="hidden" name="id_agente_modulo" value="'.$id_agente_modulo.'" ';
echo '<input type="hidden" name="id_agente_modulo" value="'.$id_agente_modulo.'">';
}
else {
echo '<input type="hidden" name="insert_module" value=1>';
@ -848,8 +858,10 @@ else {
<td class="datos"><?php echo $lang_label["module_type"] ?>
<td class="datos">
<?php
if ($update_module == "1")
if ($update_module == "1") {
echo "<input type='hidden' name='tipo' value='".$modulo_id_tipo_modulo."'>";
echo "<i class='red'>".$lang_label["no_change_field"]."</i>";
}
else {
echo '<select name="tipo" onChange="type_change()">';
$sql1='SELECT * FROM ttipo_modulo ORDER BY nombre';
@ -900,7 +912,7 @@ else {
<tr><td class="datos"><?php echo $lang_label["snmp_oid"] ?>
<td colspan=3 class="datos"><select name="combo_snmp_oid">
<?PHP
<?php
// FILL OID Combobox
if (isset($_POST["oid"])){
for (reset($snmpwalk); $i = key($snmpwalk); next($snmpwalk)) {

View File

@ -1,12 +1,25 @@
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este codigo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2006
// Raul Mateos <raulofpandora@gmail.com>, 2005-2006
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require("include/config.php");
if (give_acl($id_user, 0, "AW")==1) {
if (isset($_GET["borrar_agente"])){ // if delete agent
$id_agente = entrada_limpia($_GET["borrar_agente"]);
@ -59,7 +72,7 @@ if (give_acl($id_user, 0, "AW")==1) {
$sql1='SELECT * FROM tagente ORDER BY nombre';
$result=mysql_query($sql1);
if (mysql_num_rows($result)){
echo "<table cellpadding='3' cellspacing='3'>";
echo "<table cellpadding='3' cellspacing='3' width='500'>";
echo "<th>".$lang_label["agent_name"];
echo "<th>".$lang_label["group"];
echo "<th>".$lang_label["description"];

View File

@ -1,15 +1,25 @@
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este codigo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2006
// Raul Mateos <raulofpandora@gmail.com>, 2005-2006
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Cargamos variables globales
// Load global vars
require("include/config.php");
//require("include/functions.php");
//require("include/functions_db.php");
if (comprueba_login() == 0)
if ((give_acl($id_user, 0, "PM")==1) or (dame_admin($id_user)==1)) {
if (isset($_GET["update"])){
@ -105,7 +115,7 @@ if (comprueba_login() == 0)
}
echo '</select>';
echo "<tr><td colspan='3'><div class='noraya'></div></td></tr>";
echo "<tr><td colspan='3'><div class='raya'></div></td></tr>";
echo "<tr><td colspan='3' align='right'>";
echo '<input type="submit" class="sub" value="'.$lang_label["update"].'">';
echo "</table>";

View File

@ -1,7 +1,7 @@
a.tip {cursor: help; position: relative; text-decoration: none; background:url(../../images/tip.gif) no-repeat; padding: 5px 2px 5px 12px;}
a.tip2 {cursor: help; position: relative; text-decoration: none; background:url(../../images/tip.gif) no-repeat; padding: 2px 2px 2px 12px;}
a.help {cursor: help; position: relative; text-decoration: none; background:url(../../images/help.gif) no-repeat; padding: 2px 2px 2px 12px; left: 5px;}
a.info {position: relative; text-decoration: none; padding: 25px 0px 0px -20px;}
a.info {position: relative; text-decoration: none; padding: 25px 0px 0px 0px;}
a.info2 {position: relative; text-decoration: none; padding: 2px 0px 0px 0px;}
a.tip:hover {text-decoration: none; background-color: #f5f5f5;}
a.tip2:hover {text-decoration: none; background-color: #778866;}

View File

@ -1,15 +1,25 @@
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este codigo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2006
// Raul Mateos <raulofpandora@gmail.com>, 2005-2006
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require("include/config.php");
//require("include/functions.php");
//require("include/functions_db.php");
if (comprueba_login() == 0) {
if ((give_acl($id_user, 0, "AR")==1) or (give_acl($id_user,0,"AW")) or (dame_admin($id_user)==1)) {
@ -65,7 +75,7 @@ if (comprueba_login() == 0) {
if ($ag_group > 1)
$sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' and disabled = 0 order by nombre';
else
$sql='SELECT * FROM tagente where disabled = 0 order by id_grupo, nombre';
$sql='SELECT * FROM tagente WHERE disabled = 0 ORDER BY id_grupo, nombre';
$result=mysql_query($sql);
if (mysql_num_rows($result)){

View File

@ -19,10 +19,11 @@
// Load global vars
require("include/config.php");
if (comprueba_login() == 0)
if (give_acl($id_user, 0, "AR")==1) {
echo "<h2>".$lang_label["ag_title"]."</h2>";
echo "<h3>".$lang_label["group_view"]."</h3>";
echo "<h3>".$lang_label["group_view"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
$iduser_temp=$_SESSION['id_usuario'];
$sql1='SELECT * FROM tgrupo';

View File

@ -1,14 +1,25 @@
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este codigo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2006
// Raul Mateos <raulofpandora@gmail.com>, 2005-2006
// Cargamos variables globales
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require("include/config.php");
//require("include/functions.php");
//require("include/functions_db.php");
if (comprueba_login() == 0) {
@ -35,10 +46,9 @@ echo "<div style='float:right;'><img src='images/pulpo_lupa.gif' class='bot' ali
?>
</select>
<tr><td class="datos2"><?php echo $lang_label["free_text_search"] ?>
<td class="datos2"><input type="text" size="45" name="texto">
<tr><td class="datos" colspan="2">
<i><?php echo $lang_label["free_text_search_msg"] ?></i>
<td class="datos2"><input type="text" size="45" name="texto"></tr>
<tr><td class="datos" colspan="2"><i><?php echo $lang_label["free_text_search_msg"] ?></i></td></tr>
<tr><td colspan='3'><div class='raya'></div></td></tr>
<tr><td align="right" colspan="3">
<?php echo "<input name='uptbutton' type='submit' class='sub' value='".$lang_label["search"]."'>"; ?>

View File

@ -1,20 +1,32 @@
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este codigo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2006
// Raul Mateos <raulofpandora@gmail.com>, 2005-2006
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Cargamos variables globales
// Load global vars
require("include/config.php");
if (comprueba_login() == 0) {
if ((give_acl($id_user, 0, "AR")==1) or (give_acl($id_user,0,"AW")) or (dame_admin($id_user)==1)) {
$sql='SELECT * FROM tserver';
echo "<h2>".$lang_label["view_servers"]."</h2>";
echo "<h3>".$lang_label["server_detail"]."</h3>";
echo "<h3>".$lang_label["server_detail"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
// Connect DataBase
$result=mysql_query($sql);

View File

@ -1,12 +1,25 @@
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este c<>igo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2005
// Raul Mateos <raulofpandora@gmail.com>, 2004-2005
// Cargamos variables globales
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require("include/config.php");
if (give_acl($id_user, 0, "LW")==1) {
// Variable init
$view_alert=1;
@ -97,7 +110,7 @@ if (give_acl($id_user, 0, "LW")==1) {
echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&submit=1">';
echo '<input type="hidden" name="id_as" value="'.$id_as.'">'; // if known, if add will be undetermined (0).
echo '<h3>'.$lang_label["create_alert"]."</h3>";
echo '<h3>'.$lang_label["create_alert"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
echo '<table cellpadding="3" cellspacing="3" width="650" class="fon">';
echo '<tr><th rowspan=13 width=5>';
// Alert
@ -149,12 +162,13 @@ if (give_acl($id_user, 0, "LW")==1) {
echo '<td class=datos><input type="text" size=60 name="field3" value="'.$al_field3.'">';
// max & min alerts, time threshold
echo '<tr><td class=datos>'.$lang_label["max_alerts"];
echo '<td class=datos><input type="text" size=3 name="max" value="'.$max_alerts.'">';
echo '<tr><td class=datos>'.$lang_label["min_alerts"];
echo '<td class=datos><input type="text" size=3 name="min" value="'.$min_alerts.'">';
echo '<tr><td class=datos>'.$lang_label["max_alerts"];
echo '<td class=datos><input type="text" size=3 name="max" value="'.$max_alerts.'">';
echo '<tr><td class=datos>'.$lang_label["time_threshold"];
echo '<td class=datos><input type="text" size=3 name="time" value="'.$time_threshold.'">';
echo '<tr><td colspan="3"><div class="raya"></div></td></tr>';
// Update or Add button
if ($alert_update != 0) {
echo '<tr><td colspan="3" align="right"><input name="uptbutton" type="submit" class="sub" value="'.$lang_label["update"].'">';
@ -177,11 +191,11 @@ if (give_acl($id_user, 0, "LW")==1) {
$sql1='SELECT * FROM talert_snmp';
$result=mysql_query($sql1);
echo '<h3>'.$lang_label["snmp_assigned_alerts"]."</h3>";
echo '<h3>'.$lang_label["snmp_assigned_alerts"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
if (mysql_num_rows($result)){
if ($alert_submit !=0) {
echo '<h3>'.$lang_label["update_alert_ok"]."</h3>";
echo '<h3 class="suc">'.$lang_label["create_alert_ok"].'</h3>';
}
echo '<table cellpadding="3" cellspacing="3" width="750" class="fon" border=0>';
echo '<tr><th>'.$lang_label["alert"];
@ -193,7 +207,7 @@ if (give_acl($id_user, 0, "LW")==1) {
echo '<th>'.$lang_label["times_fired"];
echo '<th>'.$lang_label["last_fired"];
echo '<th width="50">'.$lang_label["action"];
;
while ($row=mysql_fetch_array($result)){
$id_as = $row["id_as"];
$id_alert = $row["id_alert"];

View File

@ -28,16 +28,27 @@
</script>
<?php
// Pandora - The Free Monitoring System
// This code is protected by GPL license.
// Este codigo esta protegido por la licencia GPL.
// Sancho Lerena <slerena@gmail.com>, 2003-2005
// Raul Mateos <raulofpandora@gmail.com>, 2005-2006
// Pandora - the Free monitoring system
// ====================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require("include/config.php");
//require("include/functions.php");
//require("include/functions_db.php");
if (comprueba_login() == 0) {
// Var init
$accion = "";
@ -105,7 +116,7 @@ if (comprueba_login() == 0) {
}
}
echo "<h2>Pandora SNMP</h2>";
echo "<h3>".$lang_label["SNMP_console"]."</h3>";
echo "<h3>".$lang_label["SNMP_console"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
if (isset($_GET["offset"]))
$offset=$_GET["offset"];