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

2006-11-23 Sancho Lerena <slerena@artica.es> 

* agentes/datos_agente.php: Better output (sort DESC and with M and K suffix)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@276 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2006-11-23 12:45:27 +00:00
parent c04d9e5731
commit 0f4abe0518
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/ChangeLog
View File

@ -5,6 +5,8 @@
* agentes/estado_generalagente.php: Added "border=0" in setup icon.
* agentes/datos_agente.php: Better output (sort DESC and with M and K suffix)
2006-11-22 Sancho Lerena <slerena@artica.es>
* agentes/estado_ultimopaquete.php: Fixed small size of

24
pandora_console/operation/agentes/datos_agente.php
View File

@ -66,10 +66,10 @@ function datos_raw($id_agente_modulo, $periodo){
if ( (dame_nombre_tipo_modulo($id_tipo_modulo) == "generic_data_string" ) OR
(dame_nombre_tipo_modulo($id_tipo_modulo) == "remote_tcp_string" ) OR
(dame_nombre_tipo_modulo($id_tipo_modulo) == "remote_snmp_string" )) {
$sql1="SELECT * FROM tagente_datos_string WHERE id_agente_modulo = ".$id_agente_modulo." AND timestamp > '".$periodo."' ORDER BY timestamp";
$sql1="SELECT * FROM tagente_datos_string WHERE id_agente_modulo = ".$id_agente_modulo." AND timestamp > '".$periodo."' ORDER BY timestamp DESC";
}
else {
$sql1="SELECT * FROM tagente_datos WHERE id_agente_modulo = ".$id_agente_modulo." AND timestamp > '".$periodo."' ORDER BY timestamp";
$sql1="SELECT * FROM tagente_datos WHERE id_agente_modulo = ".$id_agente_modulo." AND timestamp > '".$periodo."' ORDER BY timestamp DESC";
}
$result=mysql_query($sql1);
@ -94,7 +94,23 @@ function datos_raw($id_agente_modulo, $periodo){
}
echo "<tr>";
echo "<td class='".$tdcolor."f9 w130'>".$row["timestamp"];
echo "<td class='".$tdcolor."'>".salida_limpia($row["datos"]);
echo "<td class='".$tdcolor."'>";
if (($row["datos"] != 0) AND (is_numeric($row["datos"]))) {
$mytempdata = fmod($row["datos"], $row["datos"]);
if ($mytempdata == 0)
$myvalue = intval($row["datos"]);
else
$myvalue = $row["datos"];
if ($myvalue > 1000000) { // Add sufix "M" for millions
$mytempdata = $myvalue / 1000000;
echo $mytempdata." M";
} elseif ( $myvalue > 1000){ // Add sufix "K" for thousands
$mytempdata = $myvalue / 1000;
echo $mytempdata." K";
} else
echo substr($myvalue,0,12);
} else
echo substr($row["datos"],0,12);
}
echo "<tr><td colspan='3'><div class='raya'></div></td></tr>";
echo "</table>";
@ -118,4 +134,4 @@ if (comprueba_login() == 0) {
datos_raw($id,$tipo);
}
?>
?>

11
pandora_console/operation/agentes/estado_ultimopaquete.php
View File

@ -148,11 +148,14 @@ if (comprueba_login() == 0) {
$myvalue = intval($row3["datos"]);
else
$myvalue = $row3["datos"];
if ($myvalue > 1000){ // Add sufix "M" for thousands
$mytempdata = $myvalue / 1000;
if ($myvalue > 1000000) { // Add sufix "M" for millions
$mytempdata = $myvalue / 1000000;
echo $mytempdata." M";
} else
echo substr($myvalue,0,12);
} elseif ( $myvalue > 1000){ // Add sufix "K" for thousands
$mytempdata = $myvalue / 1000;
echo $mytempdata." K";
} else
echo substr($myvalue,0,12);
} elseif ($row3["datos"] == 0)
echo "0";
else