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

2008-06-30 Sancho Lerena <slerena@artica.es> 

* agent_manager.php: Agent names are now show in order.

	* functions.php: Added a blank space in Help icon.

	* tactical.php: Added a few links in tactical view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@906 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2008-06-30 12:34:23 +00:00
parent c017180b4a
commit 62ee2459eb
5 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2008-06-30 Sancho Lerena <slerena@artica.es>
* agent_manager.php: Agent names are now show in order.
* functions.php: Added a blank space in Help icon.
* tactical.php: Added a few links in tactical view.
2008-06-30 Esteban Sanchez <estebans@artica.es>
* include/functions_db.php: Renamed get_db_all_rows_sqlfree() to

2
pandora_console/godmode/agentes/agent_manager.php
View File

@ -100,7 +100,7 @@ if ($create_agent != 1) {
echo '<tr><td class="datos"><b>'.lang_string ("Parent").'</b>';
echo '<td class="datos">';
print_select_from_sql ('SELECT id_agente, nombre FROM tagente',
print_select_from_sql ('SELECT id_agente, nombre FROM tagente ORDER BY nombre',
'id_parent', $id_parent, '', 'None', '0');
echo '<tr><td class="datos"><b>'.lang_string ("group").'</b>';

2
pandora_console/include/config.php
View File

@ -5,7 +5,7 @@ $config["dbuser"]="pandora"; // DB User
$config["dbpass"]="pandora"; // DB Password
$config["dbhost"]="localhost"; // DB Host
$config["homedir"]="/var/www/pandora_console/"; // Config homedir
$config["homeurl"]="http://192.168.13.211/pandora_console"; // Base URL
$config["homeurl"]="http://localhost/pandora_console"; // Base URL
// End of automatic config file
?><?php

2
pandora_console/include/functions.php
View File

@ -28,7 +28,7 @@ require ('functions_html.php');
*/
function pandora_help ($help_id, $return = false) {
global $config;
$output = '<img src="'.$config['homeurl'].'/images/help.png" onClick="pandora_help(\''.$help_id.'\')">';
$output = '&nbsp;<img src="images/help.png" onClick="pandora_help(\''.$help_id.'\')">';
if ($return)
return $return;
echo $output;

26
pandora_console/operation/agentes/tactical.php
View File

@ -1,12 +1,21 @@
<?php
// Pandora FMS - the Free Monitoring System
// ========================================
// Pandora FMS
// ====================================
// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
// Main PHP/SQL code development, project architecture and management.
// Copyright (c) 2004-2008 Raul Mateos Martin, raulofpandora@gmail.com
// CSS and some PHP code additions
// Please see http://pandora.sourceforge.net for full contribution list
// Copyright (c) 2005-2008 Artica Soluciones Tecnologicas, 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.
@ -98,10 +107,13 @@
echo "<td class=datos style='font: bold 2em Arial, Sans-serif; color: #000;'>".$monitor_ok."</td>";
echo "<tr><td class=datos2><b>"."Monitor BAD"."</b></td>";
echo "<td class=datos2 style='font: bold 2em Arial, Sans-serif; color: #f00;'>";
echo "<a style='text-decoration: none; font: bold 1em Arial, Sans-serif; color: #f00;' href='index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60'>";
if ($monitor_bad > 0)
echo $monitor_bad;
else
echo "-";
echo "</A>";
echo "</td></tr><tr><td class=datos><b>"."Monitor Unknown"."</b></td>";
echo "<td class=datos style='font: bold 2em Arial, Sans-serif; color: #888;'>";
if ($monitor_unknown > 0)
@ -118,10 +130,12 @@
echo "<tr><td class=datos><b>"."Alerts Fired"."</b></td>";
echo "<td class=datos style='font: bold 2em Arial, Sans-serif; color: #ff0000;'>";
echo "<a style='text-decoration: none; font: bold 1em Arial, Sans-serif; color: #ff0000;' href='index.php?sec=eventos&sec2=operation/events/events&search=&event_type=alert_fired'>";
if ($monitor_alert > 0)
echo $monitor_alert;
else
echo "-";
echo "</A>";
echo "<tr><td class=datos2><b>"."Alerts Total"."</b></td>";
echo "<td class=datos2 style='font: bold 2em Arial, Sans-serif; color: #000000;'>".$monitor_alert_total;