2006-08-30 Sancho Lerena <slerena@gmail.com>
* pandora_agent/ChangeLog: Created and added to repository * pandora_server/ChangeLog: Created and added to repository * pandora_console/CHANGELOG: Renamed to ChangeLog * pandora_console/reporting/*.php: Replaced old code with new code for trunk. Deleted old_jpg_functions directory from repository git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@155 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
4234516f4c
commit
9ce8d781b9
|
@ -0,0 +1,4 @@
|
|||
2006-08-30 Sancho Lerena <slerena@gmail.com>
|
||||
|
||||
* pandora_agent/ChangeLog: Created and added to repository
|
||||
|
|
@ -1,3 +1,11 @@
|
|||
2006-08-30 Sancho Lerena <slerena@artica.es>
|
||||
|
||||
* CHANGELOG: Renamed to ChangeLog
|
||||
|
||||
* reporting/*.php: Replaced old code with new code for trunk. Deleted
|
||||
old_jpg_functions directory from repository
|
||||
|
||||
|
||||
2006-07-20 Raul Mateos <raulofpandora@gmail.com>
|
||||
|
||||
* language_fr.php. Update text.
|
||||
|
@ -10,7 +18,9 @@
|
|||
|
||||
* language_it.php. Update text.
|
||||
|
||||
* snmp_alert.php. Add text when alert not created /updated / deleted. Add different colors between rows (cosmetic changes).
|
||||
* snmp_alert.php. Add text when alert not created /updated / deleted. Add
|
||||
different colors between
|
||||
rows (cosmetic changes).
|
||||
|
||||
|
||||
2006-07-18 Raul Mateos <raulofpandora@gmail.com>
|
|
@ -477,7 +477,7 @@ function graphic_agentaccess($id_agent, $periodo){
|
|||
include ("jpgraph/jpgraph.php");
|
||||
include ("jpgraph/jpgraph_line.php");
|
||||
require ("../include/languages/language_".$language_code.".php");
|
||||
$color ="#437722"; // Green pandora 1.1 octopus
|
||||
$color ="#437722"; // Green pandora 1.1 octopus color
|
||||
|
||||
$agent_interval = give_agentinterval($id_agent);
|
||||
$intervalo = 30 * $config_graph_res; // Desired interval / range between dates
|
||||
|
@ -525,7 +525,7 @@ function graphic_agentaccess($id_agent, $periodo){
|
|||
|
||||
// Create graph
|
||||
$graph = new Graph(280,70);
|
||||
$graph-> img-> SetImgFormat("gif");
|
||||
$graph-> img-> SetImgFormat("png"); // GIF was causing odd problems in Redhat EL 4
|
||||
$graph->SetMargin(25,5,3,3);
|
||||
$graph->SetScale("textlin",0,0,0,0);
|
||||
$graph->SetAlphaBlending(true);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,74 +0,0 @@
|
|||
<?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
|
||||
|
||||
// Cargamos variables globales
|
||||
session_start();
|
||||
include ("../include/config.php");
|
||||
include ("../include/functions.php");
|
||||
include("../include/functions_db.php");
|
||||
include("../include/languages/language_".$language_code.".php");
|
||||
echo '<style>';
|
||||
include("../include/styles/pandora.css");
|
||||
echo '</style>';
|
||||
if (comprueba_login() == 0) {
|
||||
// Has access to this page ???
|
||||
if (isset($_GET["tipo"]) AND isset($_GET["id"])) {
|
||||
$tipo =entrada_limpia($_GET["tipo"]);
|
||||
$id_agente_modulo = entrada_limpia($_GET["id"]);
|
||||
}
|
||||
else {
|
||||
echo "<h3 class='error'>".$lang_label["graf_error"]."</h3>";
|
||||
exit;
|
||||
}
|
||||
|
||||
// Nota: En los intervalos, se han aumentado por encima de los 24 del grafico diario y los 7 del semanal para
|
||||
// que la grafica tenga mas resolucion. Cuanto mayor sea el intervalo mas tardara la grafica en generarse !!!.
|
||||
|
||||
// TODO: Crear una variable para que se pueda utilizar como factor de resolucion de graficos y parametrizarlo en un
|
||||
// archivo de configuracion.
|
||||
|
||||
$module_interval = give_moduleinterval($id_agente_modulo);
|
||||
// Interval defined for this module or agent general interval, if interval for this specific module not defined
|
||||
$module_interval = $module_interval / 60; // Convert to resol / minute
|
||||
// Please be caution, interval now is in MINUTES not in seconds
|
||||
// interval is the number of rows that will store data. more rows, more resolution
|
||||
|
||||
switch ($tipo) {
|
||||
case "mes": $intervalo = 30 * $config_graph_res;
|
||||
$intervalo_real = (43200 / $module_interval);
|
||||
if ($intervalo_real < $intervalo ){
|
||||
$intervalo = $intervalo_real;
|
||||
}
|
||||
echo "<img src='fgraph.php?id=".$id_agente_modulo."&color=6e90ff&tipo=sparse&periodo=43200&intervalo=".$intervalo."&label=".$lang_label["month_graph"]."' border=0>";
|
||||
break;
|
||||
|
||||
case "dia": $intervalo = 24 * $config_graph_res;
|
||||
$intervalo_real = (1440 / $module_interval);
|
||||
if ($intervalo_real < $intervalo ){
|
||||
$intervalo = $intervalo_real;
|
||||
}
|
||||
echo "<img src='fgraph.php?id=".$id_agente_modulo."&color=f3c330&tipo=sparse&periodo=1440&intervalo=".$intervalo."&label=".$lang_label["day_graph"]."' border=0 alt=''>";
|
||||
break;
|
||||
case "semana": $intervalo = 28 * $config_graph_res;
|
||||
$intervalo_real = (10080 / $module_interval);
|
||||
if ($intervalo_real < $intervalo ) {
|
||||
$intervalo = $intervalo_real;
|
||||
}
|
||||
echo "<img src='fgraph.php?id=".$id_agente_modulo."&color=e366cd&tipo=sparse&periodo=10080&intervalo=".$intervalo."&label=".$lang_label["week_graph"]."' border=0 alt=''>";
|
||||
break;
|
||||
case "hora": $intervalo = 5 * $config_graph_res;
|
||||
$intervalo_real = 60 / $module_interval;
|
||||
if ($intervalo_real < $intervalo ) {
|
||||
$intervalo = $intervalo_real;
|
||||
}
|
||||
// $intervalo=20;
|
||||
echo "<img src='fgraph.php?id=".$id_agente_modulo."&color=40d840&tipo=sparse&periodo=60&intervalo=".$intervalo."&label=".$lang_label["hour_graph"]."' border=0 alt=''>";
|
||||
break;
|
||||
|
||||
}
|
||||
} // Fin pagina
|
||||
|
||||
?>
|
Loading…
Reference in New Issue