tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-25 23:05:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-01-29 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions_reporting.php: fixed the lost columns in the
	item general and added what "agent-module(op)" is the max and min
	and added in the resume the units.
	
	Fixes: #3602208




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7545 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-01-29 17:08:41 +00:00
parent 752fb3ae6f
commit 944a4465a7
2 changed files with 112 additions and 34 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 @@
2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: fixed the lost columns in the
item general and added what "agent-module(op)" is the max and min
and added in the resume the units.
Fixes: #3602208
2013-01-29 Miguel de Dios <miguel.dedios@artica.es> 2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
* godmode/menu.php, include/db/oracle.php, include/db/mysql.php, * godmode/menu.php, include/db/oracle.php, include/db/mysql.php,

138
pandora_console/include/functions_reporting.php
View File

@ -3962,7 +3962,9 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
break; break;
} }
$unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $row ['id_agent_module']); $unit = db_get_value('unit', 'tagente_modulo',
'id_agente_modulo',
$row['id_agent_module']);
$id_agent_module[$key] = $row['id_agent_module']; $id_agent_module[$key] = $row['id_agent_module'];
$agent_name[$key] = $ag_name; $agent_name[$key] = $ag_name;
@ -3976,17 +3978,28 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
} }
} }
//Order by data descending, ascending or without order //Order by data descending, ascending or without order
if ($order_uptodown == 0 || $order_uptodown == 1 || $order_uptodown == 2) { if (($order_uptodown == 0) || ($order_uptodown == 1)
|| ($order_uptodown == 2)) {
switch ($order_uptodown) { switch ($order_uptodown) {
//Descending //Descending
case 1: case 1:
array_multisort($data_res, SORT_DESC, $agent_name, SORT_ASC, $module_name, SORT_ASC, $id_agent_module, SORT_ASC, $operations, SORT_ASC); array_multisort($data_res, SORT_DESC,
$agent_name, SORT_ASC, $module_name,
SORT_ASC, $id_agent_module,
SORT_ASC, $operations, SORT_ASC);
break; break;
//Ascending //Ascending
case 2: case 2:
array_multisort($data_res, SORT_ASC, $agent_name, SORT_ASC, $module_name, SORT_ASC, $id_agent_module, SORT_ASC, $operations, SORT_ASC); array_multisort($data_res, SORT_ASC,
$agent_name, SORT_ASC, $module_name,
SORT_ASC, $id_agent_module,
SORT_ASC, $operations, SORT_ASC);
break; break;
} }
$i=0; $i=0;
foreach ($data_res as $d) { foreach ($data_res as $d) {
$data = array(); $data = array();
@ -4014,7 +4027,8 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
$data[3] = '--'; $data[3] = '--';
} }
else { else {
$data[3] = format_for_graph($d, 2) . " " . $units[$i]; $data[3] = format_for_graph($d, 2) . " " .
$units[$i];
} }
array_push ($table1->data, $data); array_push ($table1->data, $data);
$i++; $i++;
@ -4022,7 +4036,10 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
} }
//Order by agent name //Order by agent name
elseif ($order_uptodown == 3) { elseif ($order_uptodown == 3) {
array_multisort($agent_name, SORT_ASC, $data_res, SORT_ASC, $module_name, SORT_ASC, $id_agent_module, SORT_ASC, $operations, SORT_ASC); array_multisort($agent_name, SORT_ASC,
$data_res, SORT_ASC, $module_name, SORT_ASC,
$id_agent_module, SORT_ASC, $operations,
SORT_ASC);
$i=0; $i=0;
foreach ($agent_name as $a) { foreach ($agent_name as $a) {
$data = array(); $data = array();
@ -4051,7 +4068,9 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
$data[3] = '--'; $data[3] = '--';
} }
else { else {
$data[3] = format_for_graph($data_res[$i], 2) . " " . $units[$i]; $data[3] =
format_for_graph($data_res[$i], 2)
. " " . $units[$i];
} }
array_push ($table1->data, $data); array_push ($table1->data, $data);
$i++; $i++;
@ -4066,10 +4085,13 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
//1 means group by agent //1 means group by agent
case 1: case 1:
//Get the data //Get the data
$sql_data = sprintf("SELECT id_agent_module, server_name, operation $sql_data = sprintf("SELECT id_agent_module,
server_name, operation
FROM treport_content_item FROM treport_content_item
where id_report_content = %d", $content['id_rc']); where id_report_content = %d",
$content['id_rc']);
$generals = db_process_sql ($sql_data); $generals = db_process_sql ($sql_data);
//html_debug_print($generals);
if ($generals === false) { if ($generals === false) {
$data = array (); $data = array ();
@ -4093,17 +4115,21 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
} }
} }
$ag_name = modules_get_agentmodule_agent_name ($general ['id_agent_module']); $ag_name = modules_get_agentmodule_agent_name(
$general ['id_agent_module']);
if (!in_array ($ag_name, $agent_list)) { if (!in_array ($ag_name, $agent_list)) {
array_push ($agent_list, $ag_name); array_push ($agent_list, $ag_name);
} }
$mod_name = modules_get_agentmodule_name ($general ['id_agent_module']);
$mod_name = modules_get_agentmodule_name(
$general ['id_agent_module'])
. ' (' . $general['operation'] . ')';
if (!in_array ($mod_name, $modules_list)) { if (!in_array ($mod_name, $modules_list)) {
array_push ($modules_list, $mod_name); array_push ($modules_list, $mod_name);
} }
//if (!in_array ($general['operation'], $operation_list)) {
array_push ($operation_list, $general['operation']); array_push($operation_list, $general['operation']);
//}
//Restore dbconnection //Restore dbconnection
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) {
metaconsole_restore_db(); metaconsole_restore_db();
@ -4116,12 +4142,11 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
$table2->head[0] = __('Agent'); $table2->head[0] = __('Agent');
$table2->style[0] = 'text-align: left'; $table2->style[0] = 'text-align: left';
$i = 1; $i = 1;
$x = 0;
foreach ($modules_list as $m) { foreach ($modules_list as $m) {
$table2->head[$i] = ui_print_truncate_text($m, 20, false).' ('.$operation_list[$x].')'; $table2->head[$i] =
ui_print_truncate_text($m, 20, false);
$table2->style[$i] = 'text-align: center'; $table2->style[$i] = 'text-align: center';
$i++; $i++;
$x++;
} }
foreach ($agent_list as $a) { foreach ($agent_list as $a) {
@ -4144,7 +4169,8 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
$module_name = modules_get_agentmodule_name ($g['id_agent_module']); $module_name = modules_get_agentmodule_name ($g['id_agent_module']);
$unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $g['id_agent_module']); $unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $g['id_agent_module']);
$found = false; $found = false;
if (strcmp($a, $agent_name) == 0 && strcmp($m, $module_name) == 0) { if (strcmp($a, $agent_name) == 0
&& strcmp($m, $module_name . ' (' . $g['operation'] . ')') == 0) {
switch ($g['operation']) { switch ($g['operation']) {
case 'sum': case 'sum':
$value_res = reporting_get_agentmodule_data_sum ($g['id_agent_module'], $content['period'], $report["datetime"]); $value_res = reporting_get_agentmodule_data_sum ($g['id_agent_module'], $content['period'], $report["datetime"]);
@ -4178,10 +4204,9 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
//Restore dbconnection //Restore dbconnection
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
break; break;
} }
//Restore dbconnection //Restore dbconnection
@ -4200,10 +4225,15 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
array_push ($table->data, $data); array_push ($table->data, $data);
break; break;
} }
if ($content['show_resume'] && count($generals) > 0) { if ($content['show_resume'] && count($generals) > 0) {
//Get the first valid value and assign it to $min & $max //Get the first valid value and assign it to $min & $max
$min = false; $min = false;
$min_name_agent_module = '';
$max_name_agent_module = '';
$min_unit = '';
$max_unit = '';
$i=0; $i=0;
do { do {
//Metaconsole connection //Metaconsole connection
@ -4217,14 +4247,14 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
} }
switch ($generals[$i]['operation']) { switch ($generals[$i]['operation']) {
case 'sum': case 'sum':
$min = reporting_get_agentmodule_data_sum ($generals[$i]['id_agent_module'], $content['period'], $report["datetime"]); $min = reporting_get_agentmodule_data_sum ($generals[$i]['id_agent_module'], $content['period'], $report["datetime"]);
break; break;
case 'max': case 'max':
$min = reporting_get_agentmodule_data_max ($generals[$i]['id_agent_module'], $content['period']); $min = reporting_get_agentmodule_data_max ($generals[$i]['id_agent_module'], $content['period']);
break; break;
case 'min': case 'min':
$min = reporting_get_agentmodule_data_min ($generals[$i]['id_agent_module'], $content['period']); $min = reporting_get_agentmodule_data_min ($generals[$i]['id_agent_module'], $content['period']);
break; break;
case 'avg': case 'avg':
default: default:
$min = reporting_get_agentmodule_data_average ($generals[$i]['id_agent_module'], $content['period']); $min = reporting_get_agentmodule_data_average ($generals[$i]['id_agent_module'], $content['period']);
@ -4232,13 +4262,24 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
} }
$i++; $i++;
$min_name_agent_module =
modules_get_agentmodule_name($generals[$i]['id_agent_module']) .
" - " .
modules_get_agentmodule_agent_name($generals[$i]['id_agent_module']) .
" (" . $generals[$i]['operation'] . ")";
$min_unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $generals[$i]['id_agent_module']);
//Restore dbconnection //Restore dbconnection
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
} }
while ($min === false && $i < count($generals)); while ($min === false && $i < count($generals));
$max = $min; $max = $min;
$max_name_agent_module = $min_name_agent_module;
$max_unit = $min_unit;
$avg = 0; $avg = 0;
$length = 0; $length = 0;
@ -4275,16 +4316,30 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
if ($value !== false) { if ($value !== false) {
if ($value > $max) { if ($value > $max) {
$max = $value; $max = $value;
$max_name_agent_module =
modules_get_agentmodule_name($g['id_agent_module']) .
" - " .
modules_get_agentmodule_agent_name($g['id_agent_module']) .
" (" . $g['operation'] . ")";
$max_unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $g['id_agent_module']);
} }
if ($value < $min ) { if ($value < $min ) {
$min = $value; $min = $value;
$min_name_agent_module =
modules_get_agentmodule_name($g['id_agent_module']) .
" - " .
modules_get_agentmodule_agent_name($g['id_agent_module']) .
" (" . $g['operation'] . ")";
$min_unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $g['id_agent_module']);
} }
$avg += $value; $avg += $value;
$length++; $length++;
} }
//Restore dbconnection //Restore dbconnection
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { if (($config ['metaconsole'] == 1)
&& $server_name != ''
&& defined('METACONSOLE')) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
} }
@ -4295,27 +4350,42 @@ $moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($c
$avg = $avg / $length; $avg = $avg / $length;
} }
unset($table_summary); unset($table_summary);
$table_summary->width = '99%'; $table_summary->width = '99%';
$table_summary->data = array (); $table_summary->data = array ();
$table_summary->head = array (); $table_summary->head = array ();
$table_summary->head_colspan = array ();
$table_summary->align = array();
$table_summary->align[0] = 'left';
$table_summary->align[1] = 'right';
$table_summary->align[2] = 'right';
$table_summary->align[3] = 'left';
$table_summary->align[4] = 'right';
$table_summary->head_colspan[0] = 2;
$table_summary->head[0] = __('Min Value'); $table_summary->head[0] = __('Min Value');
$table_summary->head[1] = __('Average Value'); $table_summary->head[1] = __('Average Value');
$table_summary->head_colspan[2] = 2;
$table_summary->head[2] = __('Max Value'); $table_summary->head[2] = __('Max Value');
$table_summary->data[0][0] = format_for_graph($min,2); $table_summary->data[0][0] = $min_name_agent_module;
$table_summary->data[0][1] = format_for_graph($avg,2); $table_summary->data[0][1] = format_for_graph($min,2) . ' ' . $min_unit;
$table_summary->data[0][2] = format_for_graph($max,2); $table_summary->data[0][2] = format_for_graph($avg,2);
$table_summary->data[0][3] = $max_name_agent_module;
$table_summary->data[0][4] = format_for_graph($max,2) . ' ' . $max_unit;
$table->colspan[3][0] = 3; $table->colspan[3][0] = 3;
array_push ($table->data, array('<b>'.__('Summary').'</b>')); array_push ($table->data,
array('<b>' . __('Summary') . '</b>'));
$table->colspan[4][0] = 3; $table->colspan[4][0] = 3;
array_push ($table->data, array(html_print_table($table_summary, true))); array_push ($table->data,
array(html_print_table($table_summary, true)));
} }
break; break;
case 'top_n': case 'top_n':
$top_n = $content['top_n']; $top_n = $content['top_n'];