2008-07-22 Sancho Lerena <slerena@gmail.com>

* pandoradb_data.sql: Some changes for types not implemented in 2.0

	* module_manager_editor.php: Added help, more space in textareas for
	tcp recv/send. Better layout.

	* help.png: Smaller icon.

	* view_server.php: Fixed problem with lastupdate render. This was using
	and incorrect function to render data



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@968 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2008-07-22 16:21:05 +00:00
parent 9bc457226c
commit 4aa5247d94
5 changed files with 27 additions and 11 deletions

View File

@ -1,3 +1,15 @@
2008-07-22 Sancho Lerena <slerena@gmail.com>
* pandoradb_data.sql: Some changes for types not implemented in 2.0
* module_manager_editor.php: Added help, more space in textareas for
tcp recv/send. Better layout.
* help.png: Smaller icon.
* view_server.php: Fixed problem with lastupdate render. This was using
and incorrect function to render data.
2008-07-21 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/functions_reporting.php: Last commit forgot a semicolon. Fixed.

View File

@ -1,5 +1,5 @@
<?PHP
// Pandora FMS - the Free Monitoring System
// Pandora FMS - the Flexible Monitoring System
// ========================================
// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
// Copyright (c) 2008 Jorge Gonzalez <jorge.gonzalez@artica.es>
@ -245,10 +245,12 @@ echo '</tr>';
// tcp send / rcv value
echo '<tr>';
echo '<td class="datos2">'.lang_string ("tcp_send")."</td>";
echo '<td class="datos2"><textarea cols=20 style="height:40px;" name="form_tcp_send">'.$form_tcp_send.'</textarea>';
echo '<td class="datos2">'.lang_string ("tcp_rcv")."</td>";
echo '<td class="datos2"><textarea cols=20 style="height:40px;" name="form_tcp_rcv">'.$form_tcp_rcv.'</textarea>';
echo '<td class="datos2" valign="top">'.lang_string ("tcp_send");
pandora_help ("tcp_send");
echo "</td>";
echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_send">'.$form_tcp_send.'</textarea>';
echo '<td class="datos2" valign="top">'.lang_string ("tcp_rcv")."</td>";
echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_rcv">'.$form_tcp_rcv.'</textarea>';
echo '</tr>';
// Description

Binary file not shown.

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 517 B

View File

@ -43,7 +43,7 @@ $servers = get_db_all_rows_in_table ('tserver');
if (sizeof ($servers) == 0)
return;
$table->width = '90%';
$table->width = '98%';
$table->size = array ();
$table->size[6] = '60';
$table->align = array ();
@ -64,7 +64,6 @@ $table->data = array ();
foreach ($servers as $server) {
$data = array ();
$serverinfo = server_status ($server['id_server']);
$data[0] = $server['name'];
if ($server['status'] == 0){
$data[1] = '<img src="images/pixel_red.png" width="20" height="20">';
@ -114,7 +113,7 @@ foreach ($servers as $server) {
$data[6] .= ' <img src="images/binary.png" title="'.lang_string ('checksum').'">';
}
$data[7] = $server['version'];
$data[8] = human_date_relative ($server['keepalive'])."</td>";
$data[8] = human_time_comparation ($server['keepalive']) . "</td>";
array_push ($table->data, $data);
}

View File

@ -180,13 +180,16 @@ INSERT INTO `ttipo_modulo` VALUES
(17,'remote_snmp_string',5,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.png'),
(18,'remote_snmp_proc',4,'Remote SNMP network agent, boolean data','mod_snmp_proc.png'),
(19,'image_jpg',9,'Image JPG data', 'mod_image_jpg.png'),
(20,'image_png',9,'Image PNG data', 'mod_image_png.png'),
(21,'async_proc', 7, 'Asyncronous proc data', 'mod_async_proc.png'),
(22,'async_data', 6, 'Asyncronous numeric data', 'mod_async_data.png'),
(23,'async_string', 8, 'Asyncronous string data', 'mod_async_string.png'),
(24,'async_inc', 6, 'Asyncronous incremental data', 'mod_async_inc.png'),
(100,'keep_alive',-1,'KeepAlive','mod_keepalive.png');
/*
Not implemented yet
(19,'image_jpg',9,'Image JPG data', 'mod_image_jpg.png'),
(20,'image_png',9,'Image PNG data', 'mod_image_png.png'),
(24,'async_inc', 6, 'Asyncronous incremental data', 'mod_async_inc.png'),
*/
/* Categoria field is used to segregate several types (plugin, agents, network) on their data
types, could be used or could be avoided and use directly primary key (id_tipo) */