From 5b15ef46f4d03e7ed9a7e567c1597341369263a9 Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 22 Jun 2007 12:00:04 +0000 Subject: [PATCH] 2007-06-22 Sancho Lerena This commit should finish Pandora FMS Console 1.3 beta 1 :-) * pandoradb_data.sql: Added default news for new instalation. * include/styles/op.css: Changed icon for Visual Console. * include/config.inc.php: Some minimal changes for skeleton. * include/languages/language_en.php: Added final strings (hope!). * index.php: Adjusted some issues for production. * operation/incidents/incident_statistics.php: Added titles. * operation/events/event_statistics.php: Added titles. * operation/agentes/tactical.php: DivZero bug fixed. * images/image_problem.png: Updated image with new logo. * reporting/fgraph.php: Added generic_bar_graph and, at least, no more jpgraph graph usage !. All graphs are using GD/Pear Graph now. * general/logon_ok.php: Fixed the same bug that in tactical. * godmode/db/db_info.php: Added titles. * godmode/db/db_purge.php: Now render detailed info in graph for each agent selected. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 34 ++ pandora_console/general/logon_ok.php | 16 +- pandora_console/godmode/db/db_info.php | 8 +- pandora_console/godmode/db/db_purge.php | 24 +- pandora_console/images/image_problem.png | Bin 10814 -> 13958 bytes pandora_console/include/config.inc.php | 26 +- .../include/languages/language_en.php | 9 + pandora_console/include/styles/op.css | 2 +- pandora_console/index.php | 10 +- .../operation/agentes/tactical.php | 102 +----- .../operation/events/event_statistics.php | 12 +- .../incidents/incident_statistics.php | 31 +- pandora_console/pandoradb_data.sql | 1 + pandora_console/reporting/fgraph.php | 306 +++++++----------- 14 files changed, 236 insertions(+), 345 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d3b357227a..eaea204e62 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,37 @@ +2007-06-22 Sancho Lerena + + This commit should finish Pandora FMS Console 1.3 beta 1 :-) + + * pandoradb_data.sql: Added default news for new instalation. + + * include/styles/op.css: Changed icon for Visual Console. + + * include/config.inc.php: Some minimal changes for skeleton. + + * include/languages/language_en.php: Added final strings (hope!). + + * index.php: Adjusted some issues for production. + + * operation/incidents/incident_statistics.php: Added titles. + + * operation/events/event_statistics.php: Added titles. + + * operation/agentes/tactical.php: DivZero bug fixed. + + * images/image_problem.png: Updated image with new logo. + + * reporting/fgraph.php: Added generic_bar_graph and, at least, no + more jpgraph graph usage !. All graphs are using GD/Pear Graph + now. + + * general/logon_ok.php: Fixed the same bug that in tactical. + + * godmode/db/db_info.php: Added titles. + + * godmode/db/db_purge.php: Now render detailed info in graph for + each agent selected. + + 2007-06-22 Raul Mateos * include/languages/language_en.php: More strings. diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 304e3df5f0..1fe1a391a6 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -76,9 +76,19 @@ $total_alerts = $data_alert_total + $monitor_alert_total; $total_checks = $data_checks + $monitor_checks; - $monitor_health = format_numeric ((($monitor_ok - $monitor_alert - $monitor_unknown) / $monitor_checks) * 100,1); - $data_health = format_numeric ( (($data_checks -($data_unknown + $data_alert)) / $data_checks ) * 100,1);; - $global_health = format_numeric( ((($monitor_ok - $monitor_alert - $monitor_unknown)+($data_checks -($data_unknown + $data_alert))) / ($data_checks + $monitor_checks) ) * 100, 1); + if ($monitor_checks > 0){ + $monitor_health = format_numeric ((($monitor_ok - $monitor_alert - $monitor_unknown)/ $monitor_checks) * 100,1); + } else + $monitor_health = 100; + if ($data_checks > 0){ + $data_health = format_numeric ( (($data_checks -($data_unknown + $data_alert)) / $data_checks ) * 100,1);; + } else + $data_health = 100; + if (($data_checks != 0) OR ($data_checks != 0)){ + $global_health = format_numeric( ((($monitor_ok -$monitor_alert - $monitor_unknown )+($data_checks -($data_unknown + $data_alert))) / ($data_checks + $monitor_checks) ) * 100, 1); + } else + $global_health = 100; + echo "

".$lang_label["tactical_indicator"]."

"; echo ""; diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php index 1777040171..b19d662f93 100644 --- a/pandora_console/godmode/db/db_info.php +++ b/pandora_console/godmode/db/db_info.php @@ -23,9 +23,13 @@ if (comprueba_login() == 0) echo "

".$lang_label["dbmain_title"]." > "; echo $lang_label["db_info2"]." ".$lang_label["help"]."

"; echo ""; - echo "

"; + echo "
"; + echo '

'.$lang_label["db_agente_modulo"].'

'; + echo "
"; echo "

"; - echo "

"; + echo "
"; + echo '

'.$lang_label["db_agente_paquetes"].'

'; + echo "
"; echo "

".$lang_label["press_db_info"].""; echo "
"; } diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php index 72aa13e8b0..fdc9a0bc72 100644 --- a/pandora_console/godmode/db/db_purge.php +++ b/pandora_console/godmode/db/db_purge.php @@ -19,12 +19,16 @@ if (comprueba_login() == 0) - A more powerful selection (by Agent, by Module, etc). */ - ?> -

> -  

-

-

- '.$lang_label["dbmain_title"].' >'.$lang_label["db_purge"]." ".$lang_label["help"].""; + echo ""; + echo "

"; + echo '

'.$lang_label["get_data_agent"].'

'; + // All data (now) $purge_all=date("Y-m-d H:i:s",time()); @@ -77,9 +81,7 @@ if (comprueba_login() == 0) # ====================================== # Purge data using dates - if (isset($_POST["agent"])){ - $id_agent =$_POST["agent"]; - } + # Purge data using dates if (isset($_POST["purgedb"])){ $from_date =$_POST["date_purge"]; @@ -148,8 +150,8 @@ if (comprueba_login() == 0) $sql_2='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_agent; $result_t=mysql_query($sql_2); while ($row=mysql_fetch_array($result_t)){ - flush(); - ob_flush(); +/* flush(); + ob_flush(); */ $rango00=mysql_query('SELECT COUNT(*) FROM tagente_datos WHERE id_agente_modulo = '.$row["id_agente_modulo"].' and timestamp > "'.$d1.'"'); $rango0=mysql_query('SELECT COUNT(*) FROM tagente_datos WHERE id_agente_modulo = '.$row["id_agente_modulo"].' and timestamp > "'.$d3.'"'); $rango1=mysql_query('SELECT COUNT(*) FROM tagente_datos WHERE id_agente_modulo = '.$row["id_agente_modulo"].' and timestamp > "'.$week.'"'); diff --git a/pandora_console/images/image_problem.png b/pandora_console/images/image_problem.png index d29f481df6fb710918be77363c444494617cb3fd..1e0f86405298dd8238f350bba35cd288234217ed 100644 GIT binary patch literal 13958 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%0D+eB{bIj;2wC*GdSC1BCeeLTR<~g-j@*?+ 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 literal 10814 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 diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php index 8996b951ed..609f2d1792 100644 --- a/pandora_console/include/config.inc.php +++ b/pandora_console/include/config.inc.php @@ -1,15 +1,16 @@ +// Additions to code for Pandora FMS 1.2 graph code +// // 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 version 2 +// as published by the Free Software Foundation for version 2. // 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 @@ -17,13 +18,16 @@ // 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. -// This is the base config file + +// Pandora FMS 1.x uses icons from famfamfam, licensed under CC Atr. 2.5 +// Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/ +// Pandora FMS 1.x uses Pear Image::Graph code //Pandora Version if (!isset($build_version)) - $build_version="PC070602"; + $build_version="PC070622"; if (!isset($pandora_version)) - $pandora_version="v1.3 devel"; + $pandora_version="v1.3 Beta 1"; // Database configuration (default ones) //$dbname="pandora13"; // MySQL DataBase @@ -32,7 +36,7 @@ if (!isset($pandora_version)) //$dbhost="localhost"; // MySQL Host // This is used for reporting, please add "/" character at the end -//$config_homedir = "/var/www/pandora2/"; +//$config_homedir = "/var/www/pandora/"; // Do not display any ERROR //error_reporting(0); // Need to use active console at this moment @@ -123,4 +127,4 @@ if ($language_code == 'ast_es') { } else $help_code = substr($language_code,0,2); -?> +?> \ No newline at end of file diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index eca1b39932..3c50c722bd 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -876,6 +876,15 @@ $lang_label["map_item_add"] = "Add map item"; $lang_label["graph_event_total"] = "Event graph"; $lang_label["graph_event_group"] = "Event graph by group"; $lang_label["graph_event_user"] = "Event graph by user"; +$lang_label["db_agente_paquetes"] = "Packets per agent"; +$lang_label["db_agente_modulo"] = "Modules per agent"; + +$lang_label["inc_stat_status"] = "Incidents by status"; +$lang_label["inc_stat_priority"] = "Incidents by priority"; +$lang_label["inc_stat_user"] = "Incidents by user"; +$lang_label["inc_stat_source"] = "Incidents by source"; +$lang_label["inc_stat_group"] = "Incidents by group"; + $lang_label["no_layout_def"] = "There are no defined layouts"; $lang_label["no_reporting_def"] = "There are no defined reportings"; $lang_label["no_map_def"] = "There are no defined maps"; diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 70bec7a2e4..1812bddddd 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -51,7 +51,7 @@ div#op7s>ul, div#op8s>ul, div#op9s>ul { background: url(../../images/reporting.png) no-repeat 4px 4px; } #op9 li, #op9 li:hover, #op9s li { - background: url(../../images/application.png) no-repeat 4px 3px; + background: url(../../images/monitor.png) no-repeat 4px 3px; } div.arrow>ul, div.arrows>ul, div#arrowl>ul, div#arrowls>ul { width: 75%; diff --git a/pandora_console/index.php b/pandora_console/index.php index d5346a8a39..6eaca337e3 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1,6 +1,6 @@ // Additions to code for Pandora FMS 1.2 graph code -// + // 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 for version 2. @@ -25,13 +25,13 @@ // Pandora FMS 1.x uses Pear Image::Graph code //Pandora Version, if not defined here it would take from config.php -$build_version="PC070612"; -$pandora_version="v1.3 devel"; +$build_version="PC070622"; +$pandora_version="v1.3 Beta 1"; global $build_version; global $pandora_version; // Set to 1 to do not check for installer or config file (for development!). -$develop_bypass = 1; +$develop_bypass = 0; if ($develop_bypass != 1){ // If no config file, automatically try to install diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index b4eb4674b4..0c00351519 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -35,106 +35,6 @@ echo "

".$lang_label["ag_title"]." > "; echo $lang_label["tactical_view"]."

"; - - /* - // Get group list that user has access - $mis_grupos = list_group2 ($id_user); - $contador_grupo = 0; - $contador_agente = 0; - $array_index = 0; - - // Init final counters - $monitor_checks = 0; - $monitor_ok = 0; - $monitor_bad = 0; - $monitor_unknown =0; - $monitor_alert = 0; - $total_agents = 0; - $data_checks = 0; - $data_unknown =0; - $data_alert = 0; - $data_alert_total = 0; - $monitor_alert_total = 0; - - - $monitor->checks = 0; - $monitor->ok = 0; - $monitor->bad =0; - $monitor->unknown = 0; - $monitor->alert = 0; - $monitor->alert_total = 0; - - $total->agents = 0; - - $data->checks = 0; - $data->unknown = 0; - $data->alert = 0; - $data->alert_total= 0; - - $ahora=date("Y/m/d H:i:s"); - $ahora_sec = strtotime($ahora); - - // Prepare data to show - // For each valid group for this user, take data from agent and modules - foreach ($mis_grupos as $migrupo) { - if ($migrupo != "") { - $existen_agentes = 0; - $sql0 = "SELECT COUNT(id_agente) FROM tagente WHERE id_grupo = $migrupo AND disabled = 0"; - $result0 = mysql_query ($sql0); - $row0 = mysql_fetch_array ($result0); - $total_agents = $total_agents + $row0[0]; - if ($row0[0] > 0) - $existen_agentes = 1; - - // SQL Join to get monitor status for agents belong this group - $sql1 = "SELECT tagente.id_agente, tagente_estado.estado, tagente_estado.datos, tagente_estado.current_interval, tagente_estado.utimestamp, tagente_estado.id_agente_modulo FROM tagente, tagente_estado WHERE tagente.disabled = 0 AND tagente.id_grupo = $migrupo AND tagente.id_agente = tagente_estado.id_agente"; - if ($result1 = mysql_query ($sql1)){ - while ($row1 = mysql_fetch_array ($result1)) { - $id_agente = $row1[0]; - $estado = $row1[1]; - $datos = $row1[2]; - $module_interval = $row1[3]; - $seconds = $ahora_sec - $row1[4]; - $id_agente_modulo = $row1[5]; - if ($estado != 100){ - // Monitor check - $monitor_checks++; - if ($seconds >= ($module_interval*2)) - $monitor_unknown++; - elseif ($datos != 0) { - $monitor_ok++; - } else { - $monitor_bad++; - } - // Alert - $sql2 = "SELECT times_fired FROM talerta_agente_modulo WHERE id_agente_modulo = $id_agente_modulo"; - if ($result2 = mysql_query ($sql2)){ - if ($row2 = mysql_fetch_array ($result2)){ - $monitor_alert_total++; - if ($row2[0] > 0) - $monitor_alert++; - } - } - } else { - // Data check - if ($seconds >= ($module_interval*2)) - $data_unknown++; - $data_checks++; - // Alert - $sql2 = "SELECT times_fired FROM talerta_agente_modulo WHERE id_agente_modulo = $id_agente_modulo"; - if ($result2 = mysql_query ($sql2)){ - if ($row2 = mysql_fetch_array ($result2)) { - $data_alert_total++; - if ($row2[0] > 0) - $data_alert++; - } - } - } - } - } - } - } - */ $data = general_stats($id_user,0); $monitor_checks = $data[0]; $monitor_ok = $data[1]; @@ -226,7 +126,7 @@ $data_health = format_numeric ( (($data_checks -($data_unknown + $data_alert)) / $data_checks ) * 100,1);; } else $data_health = 100; - if (($data_checks == 0) && ($data_checks == 0)){ + if (($data_checks != 0) OR ($data_checks != 0)){ $global_health = format_numeric( ((($monitor_ok -$monitor_alert - $monitor_unknown )+($data_checks -($data_unknown + $data_alert))) / ($data_checks + $monitor_checks) ) * 100, 1); } else $global_health = 100; diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php index 3395bafc69..0a6681a19c 100644 --- a/pandora_console/operation/events/event_statistics.php +++ b/pandora_console/operation/events/event_statistics.php @@ -26,15 +26,17 @@ if (comprueba_login() == 0) { echo "

".$lang_label["events"]." > "; echo $lang_label["event_statistics"]." ".$lang_label["help"]."

"; echo "

"; + echo ""; + echo "
"; echo "

".$lang_label["graph_event_total"]."

"; - echo ''; - echo "

"; + echo ''; + echo "		"; echo "

".$lang_label["graph_event_user"]."

"; - echo ''; - echo "

"; + echo ''; + echo "
"; echo "

".$lang_label["graph_event_group"]."

"; echo ''; - echo "

"; + echo "
"; } else { audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access event viewer"); require ("general/noaccess.php"); diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php index 01e29fcdb9..e52ecc497e 100644 --- a/pandora_console/operation/incidents/incident_statistics.php +++ b/pandora_console/operation/incidents/incident_statistics.php @@ -26,18 +26,25 @@ if (comprueba_login() == 0) { if (give_acl($id_user, 0, "IR")==1) { echo "

".$lang_label["incident_manag"]." > "; echo $lang_label["statistics"]." ".$lang_label["help"]."

"; -?> - -

- -

- -

- -

- -

-"; + echo ""; + echo '

'.$lang_label["inc_stat_status"].'

'; + echo ''; + echo ""; + echo '

'.$lang_label["inc_stat_priority"].'

'; + echo ''; + echo ""; + echo '

'.$lang_label["inc_stat_group"].'

'; + echo ''; + echo ""; + echo '

'.$lang_label["inc_stat_user"].'

'; + echo ''; + echo ""; + echo '

'.$lang_label["inc_stat_source"].'

'; + echo ''; + echo ""; + echo ""; } else { require ("general/noaccess.php"); audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Incident section"); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 3109e70dd8..e1a15dd163 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -124,3 +124,4 @@ INSERT INTO `tusuario_perfil` VALUES (1,'demo',1,1,'admin'),(2,'admin',5,1,'admi INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1); +INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 1.3 !','This is our new console, a lot of new features has been added from last version. Please read documentation about it and be free to test any option.\r\n\r\nPandora FMS team.','2007-06-22 13:03:20'); diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php index 38977698f9..57ec8b3836 100644 --- a/pandora_console/reporting/fgraph.php +++ b/pandora_console/reporting/fgraph.php @@ -3,16 +3,15 @@ // Pandora FMS - the Free monitoring system // ======================================== // Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com -// Main PHP/SQL code development and project architecture and management +// Main PHP/SQL code development, project architecture and management. // Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com -// CSS and some PHP additions -// Copyright (c) 2006 Jose Navarro -// Additions to Pandora FMS 1.2 graph code -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es +// CSS and some PHP code additions +// Copyright (c) 2006 Jose Navarro +// Additions to code for Pandora FMS 1.2 graph code // // 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; version 2 +// as published by the Free Software Foundation for version 2. // 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 @@ -20,7 +19,11 @@ // 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 + +// Pandora FMS 1.x uses icons from famfamfam, licensed under CC Atr. 2.5 +// Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/ +// Pandora FMS 1.x uses Pear Image::Graph code + include ("../include/config.php"); include ("../include/functions.php"); include ("../include/functions_db.php"); @@ -642,7 +645,7 @@ function generic_pie_graph ($width=300, $height=200, $data, $legend) { // Merge data into a dataset object (sancho) $Dataset1 =& Image_Graph::factory('dataset'); for ($a=0;$a < sizeof($data); $a++){ - $Dataset1->addPoint($legend[$a], $data[$a]); + $Dataset1->addPoint(str_pad($legend[$a],15), $data[$a]); } $Plot =& $Plotarea->addNew('pie', $Dataset1); $Plotarea->hideAxis(); @@ -966,7 +969,7 @@ function graphic_incident_user() { generic_pie_graph (320, 200, $data, $legend); } -function graphic_user_activity($width=300, $height=200) { +function graphic_user_activity($width=350, $height=230) { include ("../include/config.php"); require ("../include/languages/language_".$language_code.".php"); @@ -980,7 +983,7 @@ function graphic_user_activity($width=300, $height=200) { $result2=mysql_query($sql1); $row2=mysql_fetch_array($result2); $data[] = $row2[0]; - $legend[] = substr($row[0],0,16)."(".$row2[0].")"; + $legend[] = str_pad(substr($row[0],0,16)."(".format_for_graph($row2[0],0).")", 15); } // Sort array by bubble method (yes, I study more methods in university, but if you want more speed, please, submit a patch :) @@ -1047,10 +1050,8 @@ function graphic_incident_source ($width=320, $height=200) { generic_pie_graph ($width, $height, $data, $legend); } -function grafico_db_agentes_modulos() { +function grafico_db_agentes_modulos($width, $height) { include ("../include/config.php"); - include ("jpgraph/jpgraph.php"); - include ("jpgraph/jpgraph_bar.php"); require ("../include/languages/language_".$language_code.".php"); $data = array(); @@ -1065,56 +1066,22 @@ function grafico_db_agentes_modulos() { $legend[] = $row["nombre"]; } // Sort array by bubble method (yes, I study more methods in university, but if you want more speed, please, submit a patch :) - // or much better, pay me to do a special version for you, highly optimized :-)))) - for ($a=0;$a < sizeof($data);$a++){ - for ($b=$a; $b $data[$a]){ - $temp = $data[$a]; - $temp_label = $legend[$a]; - $data[$a] = $data[$b]; - $legend[$a] = $legend[$b]; - $data[$b] = $temp; - $legend[$b] = $temp_label; - } - } - $mayor = 0; - $mayor_data =0; - for ($a=0;$a < sizeof($data); $a++) - if ($data[$a] > $mayor_data){ - $mayor = $a; - $mayor_data = $data[$a]; - } - - $ajuste_altura = sizeof($data) * 20; - //$graph = new PieGraph(400,140+$ajuste_altura,"auto"); - $graph = new Graph(400,140+$ajuste_altura,'auto'); - $graph->SetScale("textlin"); - $graph->SetMarginColor('white@0.2'); - $graph->title->Set($lang_label["modules_per_agent"]); - $graph->title->SetFont(FF_FONT1,FS_BOLD); - $graph->yaxis->scale->SetGrace(0); - $graph->yaxis->SetLabelAlign('center','bottom'); - $graph->SetAlphaBlending(); - $graph->SetFrame(true); - $graph->xaxis->SetLabelMargin(5); - $graph->Set90AndMargin(100,20,50,30); - $p1 = new BarPlot($data); - $p1->value->SetFormat('%.0f '); - $p1->value->Show(); - $p1->value->SetAlign('left','center'); - $p1->SetFillColor("#00bf00"); - $p1->SetWidth(0.6); - $p1->SetShadow(); - $graph->yaxis->SetLabelFormat('%d'); - $graph->xaxis->SetTickLabels($legend); - $graph->legend->Pos(0.05,0.49,"right","center"); - $graph->Add($p1); - $graph->img->SetAntiAliasing(); - $graph->Stroke(); - + // or much better, pay me to do a special version for you, highly optimized :-)))) + for ($a=0;$a < sizeof($data);$a++){ + for ($b=$a; $b $data[$a]){ + $temp = $data[$a]; + $temp_label = $legend[$a]; + $data[$a] = $data[$b]; + $legend[$a] = $legend[$b]; + $data[$b] = $temp; + $legend[$b] = $temp_label; + } + } + generic_bar_graph ($width, $height, $data, $legend); } -function grafico_eventos_usuario( $width=320, $height=200) { +function grafico_eventos_usuario( $width=420, $height=200) { include ("../include/config.php"); require ("../include/languages/language_".$language_code.".php"); @@ -1190,12 +1157,6 @@ function grafico_eventos_total() { $legend[$b] = $temp_label; } } - $mayor=0; $mayor_data=0; - for ($a=0;$a < sizeof($data); $a++) - if ($data[$a] > $mayor_data){ - $mayor = $a; - $mayor_data = $data[$a]; - } generic_pie_graph (320, 200, $data, $legend); } @@ -1240,10 +1201,50 @@ function grafico_eventos_grupo ($width = 300, $height = 200 ) { generic_pie_graph ($width, $height, $data, $legend); } -function grafico_db_agentes_paquetes() { + +function generic_bar_graph ( $width =380, $height = 300, $data, $legend) { + include ("../include/config.php"); + require_once 'Image/Graph.php'; + require ("../include/languages/language_".$language_code.".php"); + + $ajuste_altura = sizeof($data) * 20; + if (sizeof($data) > 10){ + $height = $height + $ajuste_altura; + } + + // create the graph + $Graph =& Image_Graph::factory('graph', array($width, $height)); + // add a TrueType font + $Font =& $Graph->addNew('font', $config_fontpath); + // set the font size to 11 pixels + $Font->setSize(8); + $Graph->setFont($Font); + $Graph->add( + Image_Graph::vertical ( + $Plotarea = Image_Graph::factory('plotarea',array('category', 'axis', 'horizontal')), + $Legend = Image_Graph::factory('legend'), + 100 + ) + ); + + $Legend->setPlotarea($Plotarea); + // Create the dataset + // Merge data into a dataset object (sancho) + $Dataset1 =& Image_Graph::factory('dataset'); + for ($a=0;$a < sizeof($data); $a++){ + $Dataset1->addPoint(str_pad($legend[$a],15), $data[$a]); + } + $Plot =& $Plotarea->addNew('bar', $Dataset1); + $GridY2 =& $Plotarea->addNew('bar_grid', IMAGE_GRAPH_AXIS_Y_SECONDARY); + $GridY2->setLineColor('gray'); + $GridY2->setFillColor('lightgray@0.05'); + $Plot->setLineColor('gray'); + $Plot->setFillColor('blue@0.85'); + $Graph->done(); +} + +function grafico_db_agentes_paquetes ($width = 380, $height = 300) { include ("../include/config.php"); - include ("jpgraph/jpgraph.php"); - include ("jpgraph/jpgraph_bar.php"); require ("../include/languages/language_".$language_code.".php"); $data = array(); @@ -1256,59 +1257,27 @@ function grafico_db_agentes_paquetes() { $result3=mysql_query($sql1); if ($row3=mysql_fetch_array($result3)){ $data[]= $row3[0]; - $legend[] = dame_nombre_agente($row[0]); + $legend[] = str_pad(dame_nombre_agente($row[0]),15); } } } // Sort array by bubble method (yes, I study more methods in university, but if you want more speed, please, submit a patch :) - // or much better, pay me to do a special version for you, highly optimized :-)))) - for ($a=0;$a < sizeof($data);$a++){ - for ($b=$a; $b $data[$a]){ - $temp = $data[$a]; - $temp_label = $legend[$a]; - $data[$a] = $data[$b]; - $legend[$a] = $legend[$b]; - $data[$b] = $temp; - $legend[$b] = $temp_label; - } - } - $mayor = 0; - $mayor_data =0; - for ($a=0;$a < sizeof($data); $a++) - if ($data[$a] > $mayor_data){ - $mayor = $a; - $mayor_data = $data[$a]; - } - - $ajuste_altura = sizeof($data) * 20; - $graph = new Graph(400,140+$ajuste_altura,'auto'); - $graph->SetScale("textlin"); - $graph->SetMarginColor('white@0.2'); - $graph->title->Set($lang_label["packets_by_agent"]); - $graph->title->SetFont(FF_FONT1,FS_BOLD); - $graph->yaxis->scale->SetGrace(0); - $graph->yaxis->SetLabelAlign('center','bottom'); - $graph->SetAlphaBlending(); - $graph->SetFrame(true); - $graph->xaxis->SetLabelMargin(5); - $graph->Set90AndMargin(100,20,50,30); - $p1 = new BarPlot($data); - $p1->value->SetFormat('%.0f '); - $p1->value->Show(); - $p1->value->SetAlign('left','center'); - $p1->SetFillColor("#0000fd"); - $p1->SetWidth(0.6); - $p1->SetShadow(); - $graph->yaxis->SetLabelFormat('%d'); - $graph->xaxis->SetTickLabels($legend); - $graph->legend->Pos(0.05,0.49,"right","center"); - $graph->Add($p1); - $graph->img->SetAntiAliasing(); - $graph->Stroke(); + // or much better, pay me to do a special version for you, highly optimized :-)))) + for ($a=0;$a < sizeof($data);$a++){ + for ($b=$a; $b $data[$a]){ + $temp = $data[$a]; + $temp_label = $legend[$a]; + $data[$a] = $data[$b]; + $legend[$a] = $legend[$b]; + $data[$b] = $temp; + $legend[$b] = $temp_label; + } + } + generic_bar_graph ($width, $height, $data, $legend); } -function grafico_db_agentes_purge ($id_agente, $width, $height) { +function grafico_db_agentes_purge ($id_agent, $width, $height) { include ("../include/config.php"); require_once 'Image/Graph.php'; require ("../include/languages/language_".$language_code.".php"); @@ -1334,77 +1303,23 @@ function grafico_db_agentes_purge ($id_agente, $width, $height) { for ($a=0; $a < sizeof ($fechas); $a++){ // 4 x intervals will be enought, increase if your database is very very fast :) - if ($a==3) - $sql1="SELECT COUNT(id_agente_datos) FROM tagente_datos WHERE utimestamp >= ".$fechas[$a]; - else - $sql1="SELECT COUNT(id_agente_datos) FROM tagente_datos WHERE utimestamp >= ".$fechas[$a]." AND utimestamp < ".$fechas[$a+1]; + if ($a==3){ + if ($id_agent == -1) + $sql1="SELECT COUNT(id_agente_datos) FROM tagente_datos WHERE utimestamp >= ".$fechas[$a]; + else + $sql1="SELECT COUNT(id_agente_datos) FROM tagente_datos WHERE id_agente = $id_agent AND utimestamp >= ".$fechas[$a]; + } else { + if ($id_agent == -1) + $sql1="SELECT COUNT(id_agente_datos) FROM tagente_datos WHERE utimestamp >= ".$fechas[$a]." AND utimestamp < ".$fechas[$a+1]; + else + $sql1="SELECT COUNT(id_agente_datos) FROM tagente_datos WHERE id_agente = $id_agent AND utimestamp >= ".$fechas[$a]." AND utimestamp < ".$fechas[$a+1]; + } $result=mysql_query($sql1); $row=mysql_fetch_array($result); - $data[] = $row[0]; - $legend[]=$fechas_label[$a]." ( ".$row[0]." )"; + $data[] = $row[0]; + $legend[]=$fechas_label[$a]." ( ".format_for_graph($row[0],0)." )"; } - - $mayor = 0; - $mayor_data =0; - for ($a=0;$a < sizeof($data); $a++) - if ($data[$a] > $mayor_data){ - $mayor = $a; - $mayor_data = $data[$a]; - } - - if ($total> 1){ - // create the graph - $Graph =& Image_Graph::factory('graph', array($width, $height)); - // add a TrueType font - $Font =& $Graph->addNew('font', $config_fontpath); - // set the font size to 7 pixels - $Font->setSize(7); - $Graph->setFont($Font); - // create the plotarea - $Graph->add( - Image_Graph::horizontal( - $Plotarea = Image_Graph::factory('plotarea'), - $Legend = Image_Graph::factory('legend'), - 70 - ) - ); - $Legend->setPlotarea($Plotarea); - // Create the dataset - // Merge data into a dataset object (sancho) - $Dataset1 =& Image_Graph::factory('dataset'); - for ($a=0;$a < sizeof($data); $a++){ - $Dataset1->addPoint($legend[$a], $data[$a]); - } - $Plot =& $Plotarea->addNew('pie', $Dataset1); - $Plotarea->hideAxis(); - // create a Y data value marker - $Marker =& $Plot->addNew('Image_Graph_Marker_Value', IMAGE_GRAPH_PCT_Y_TOTAL); - // create a pin-point marker type - $PointingMarker =& $Plot->addNew('Image_Graph_Marker_Pointing_Angular', array(1, &$Marker)); - // and use the marker on the 1st plot - $Plot->setMarker($PointingMarker); - // format value marker labels as percentage values - $Marker->setDataPreprocessor(Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', '%0.1f%%')); - $Plot->Radius = 15; - $FillArray =& Image_Graph::factory('Image_Graph_Fill_Array'); - $Plot->setFillStyle($FillArray); - - $FillArray->addColor('green@0.7'); - $FillArray->addColor('yellow@0.7'); - $FillArray->addColor('red@0.7'); - $FillArray->addColor('orange@0.7'); - $FillArray->addColor('blue@0.7'); - $FillArray->addColor('purple@0.7'); - $FillArray->addColor('lightgreen@0.7'); - $FillArray->addColor('lightblue@0.7'); - $FillArray->addColor('lightred@0.7'); - $FillArray->addColor('grey@0.6', 'rest'); - $Plot->explode(6); - $Plot->setStartingAngle(145); - // output the Graph - $Graph->done(); - } else - graphic_error (); + generic_pie_graph ($width, $height, $data, $legend); } function drawWarning($width,$height) { @@ -1485,6 +1400,8 @@ function progress_bar($progress,$width,$height) { drawRating($progress,$width,$height); } +/*NOT USED ! + function graphic_test ($id, $period, $interval, $label, $width, $height){ require_once 'Image/Graph.php'; include ("../include/config.php"); @@ -1571,6 +1488,7 @@ function graphic_test ($id, $period, $interval, $label, $width, $height){ $Graph->done(); } +*/ function odo_tactic ($value1, $value2, $value3){ require_once 'Image/Graph.php'; @@ -1800,31 +1718,31 @@ if (isset($_GET["tipo"])){ elseif ($_GET["tipo"] =="prioridad_incidente") grafico_incidente_prioridad(); elseif ($_GET["tipo"]=="db_agente_modulo") - grafico_db_agentes_modulos(); + grafico_db_agentes_modulos($width, $height); elseif ($_GET["tipo"]=="db_agente_paquetes") - grafico_db_agentes_paquetes(); + grafico_db_agentes_paquetes($width, $height); elseif ($_GET["tipo"] =="db_agente_purge") - grafico_db_agentes_purge(-1, $width, $height); + grafico_db_agentes_purge($id, $width, $height); elseif ($_GET["tipo"] =="group_events") grafico_eventos_grupo($width, $height); elseif ($_GET["tipo"] =="user_events") - grafico_eventos_usuario(); + grafico_eventos_usuario($width, $height); elseif ($_GET["tipo"] =="total_events") grafico_eventos_total(); elseif ($_GET["tipo"] =="group_incident") graphic_incident_group(); elseif ($_GET["tipo"] =="user_incident") - graphic_incident_user(); + graphic_incident_user(); elseif ($_GET["tipo"] =="source_incident") - graphic_incident_source(); + graphic_incident_source(); elseif ($_GET["tipo"] =="user_activity") - graphic_user_activity($width,$height); + graphic_user_activity($width,$height); elseif ($_GET["tipo"] == "agentaccess") graphic_agentaccess($_GET["id"], $_GET["periodo"], $width, $height); elseif ($_GET["tipo"] == "agentmodules") graphic_agentmodules($_GET["id"], $width, $height); - elseif ($_GET["tipo"] == "gdirect") - graphic_test ($id, $period, $intervalo, $label, $width, $height); + //elseif ($_GET["tipo"] == "gdirect") +// graphic_test ($id, $period, $intervalo, $label, $width, $height); elseif ( $_GET["tipo"] =="progress"){ $percent= $_GET["percent"]; progress_bar($percent,$width,$height);