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

Merge branch 'revert-65ae5ed2' into 'develop'

Browse Source 
Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"

See merge request artica/pandorafms!993
This commit is contained in:
nramon 2017-10-30 16:15:28 +01:00
commit 0897bbea28
6 changed files with 31 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -725,9 +725,6 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
`module_free_text` TEXT, `module_free_text` TEXT,
`each_agent` tinyint(1) default 1, `each_agent` tinyint(1) default 1,
`historical_db` tinyint(1) UNSIGNED NOT NULL default 0, `historical_db` tinyint(1) UNSIGNED NOT NULL default 0,
`lapse_calc` tinyint(1) UNSIGNED NOT NULL default '0',
`lapse` int(11) UNSIGNED NOT NULL default '300',
`visual_format` UNSIGNED NOT NULL tinyint(1) default '0',
PRIMARY KEY(`id_rc`) PRIMARY KEY(`id_rc`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8; ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
@ -1273,9 +1270,6 @@ UPDATE treport_custom_sql SET `sql` = 'select t1.alias as agent_n
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
ALTER TABLE treport_content ADD COLUMN `historical_db` tinyint(1) NOT NULL DEFAULT '0'; ALTER TABLE treport_content ADD COLUMN `historical_db` tinyint(1) NOT NULL DEFAULT '0';
ALTER TABLE treport_content ADD COLUMN `lapse_calc` tinyint(1) default '0';
ALTER TABLE treport_content ADD COLUMN `lapse` int(11) default '300';
ALTER TABLE treport_content ADD COLUMN `visual_format` tinyint(1) default '0';
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table `tmodule_relationship` -- Table `tmodule_relationship`

116
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -112,10 +112,6 @@ $netflow_filter = 0;
$max_values = 0; $max_values = 0;
$resolution = 0; $resolution = 0;
$lapse_calc = 0;
$lapse = 300;
$visual_format = 0;
//Others //Others
$filter_search = ""; $filter_search = "";
@ -199,6 +195,12 @@ switch ($action) {
$name = $item['name']; $name = $item['name'];
switch ($type) { switch ($type) {
case 'avg_value':
$period = $item['period'];
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule));
break;
case 'event_report_log': case 'event_report_log':
$period = $item['period']; $period = $item['period'];
$description = $item['description']; $description = $item['description'];
@ -310,9 +312,6 @@ switch ($action) {
$idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule)); $idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule));
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$period = $item['period']; $period = $item['period'];
$lapse = $item['lapse'];
$lapse_calc = $item['lapse_calc'];
$visual_format = $item['visual_format'];
break; break;
case 'max_value': case 'max_value':
$description = $item['description']; $description = $item['description'];
@ -320,9 +319,6 @@ switch ($action) {
$idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule)); $idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule));
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$period = $item['period']; $period = $item['period'];
$lapse = $item['lapse'];
$lapse_calc = $item['lapse_calc'];
$visual_format = $item['visual_format'];
break; break;
case 'min_value': case 'min_value':
$description = $item['description']; $description = $item['description'];
@ -330,9 +326,6 @@ switch ($action) {
$idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule)); $idAgent = db_get_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule));
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$period = $item['period']; $period = $item['period'];
$lapse = $item['lapse'];
$lapse_calc = $item['lapse_calc'];
$visual_format = $item['visual_format'];
break; break;
case 'sumatory': case 'sumatory':
$description = $item['description']; $description = $item['description'];
@ -1587,78 +1580,6 @@ You can of course remove the warnings, that's why we include the source and do n
?> ?>
</td> </td>
</tr> </tr>
<!-- advanced elements -->
<!-- <tr id="advanced_expansion">
<td colspan="2" style="cursor:pointer;" onclick="if($('.advanced_elements').css('display') == 'none'){$('.advanced_elements').css('display','table-row');}else{$('.advanced_elements').css('display','none');}">
+ ADVANCED
</td>
</tr> -->
<tr id="row_lapse_calc" style="" class="datos advanced_elements">
<td style="font-weight:bold;">
<?php echo __('Calculate for custom intervals'); ?>
</td>
<td style="">
<?php
html_print_checkbox('lapse_calc',1,$lapse_calc);?>
</td>
</tr>
<tr id="row_lapse" style="" class="datos advanced_elements">
<td style="font-weight:bold;">
<?php
echo __('Time lapse intervals');
ui_print_help_tip(__('Lapses of time in which the period is divided to make more precise calculations
'));
?>
</td>
<td style="">
<?php
html_print_extended_select_for_time('lapse', $lapse,
'', '', '0', 10,'','','','',!$lapse_calc);
?>
</td>
</tr>
<tr id="row_visual_format" style="" class="datos advanced_elements">
<td style="font-weight:bold;" colspan="2">
<?php
if($visual_format == 1){
$visual_format_table = true;
$visual_format_graph = false;
$visual_format_both = false;
}
elseif ($visual_format == 2) {
$visual_format_table = false;
$visual_format_graph = true;
$visual_format_both = false;
}
elseif ($visual_format == 3) {
$visual_format_table = false;
$visual_format_graph = false;
$visual_format_both = true;
}
echo __('Table only').'<span style="margin-left:10px;"></span>';
html_print_radio_button ('visual_format', 1, '', $visual_format_table,'',!$lapse_calc);
echo ('<span style="margin:30px;"></span>');
echo __('Graph only').'<span style="margin-left:10px;"></span>';
html_print_radio_button ('visual_format', 2, '', $visual_format_graph,'',!$lapse_calc);
echo ('<span style="margin:30px;"></span>');
echo __('Graph and table').'<span style="margin-left:10px;"></span>';
html_print_radio_button ('visual_format', 3, '', $visual_format_both,'',!$lapse_calc);
?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
@ -2290,19 +2211,6 @@ $(document).ready (function () {
} }
}); });
$("#checkbox-lapse_calc").change(function () {
if($(this).is(":checked")){
$( "#lapse_select" ).prop( "disabled", false );
$("[name=visual_format]").prop( "disabled", false );
}
else{
$( "#lapse_select" ).prop( "disabled", true );
$("[name=visual_format]").prop( "disabled", true );
}
});
}); });
function create_custom_graph() { function create_custom_graph() {
@ -2784,9 +2692,6 @@ function chooseType() {
$("#row_show_in_two_columns").hide(); $("#row_show_in_two_columns").hide();
$("#row_show_in_same_row").hide(); $("#row_show_in_same_row").hide();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
$("#row_lapse_calc").hide();
$("#row_lapse").hide();
$("#row_visual_format").hide();
$("#row_show_in_landscape").hide(); $("#row_show_in_landscape").hide();
$('#row_hide_notinit_agents').hide(); $('#row_hide_notinit_agents').hide();
$("#row_module_group").hide(); $("#row_module_group").hide();
@ -2979,9 +2884,6 @@ function chooseType() {
$("#row_module").show(); $("#row_module").show();
$("#row_period").show(); $("#row_period").show();
$("#row_show_in_two_columns").show(); $("#row_show_in_two_columns").show();
$("#row_lapse_calc").show();
$("#row_lapse").show();
$("#row_visual_format").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;
@ -2991,9 +2893,6 @@ function chooseType() {
$("#row_module").show(); $("#row_module").show();
$("#row_period").show(); $("#row_period").show();
$("#row_show_in_two_columns").show(); $("#row_show_in_two_columns").show();
$("#row_lapse_calc").show();
$("#row_lapse").show();
$("#row_visual_format").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;
@ -3003,9 +2902,6 @@ function chooseType() {
$("#row_module").show(); $("#row_module").show();
$("#row_period").show(); $("#row_period").show();
$("#row_show_in_two_columns").show(); $("#row_show_in_two_columns").show();
$("#row_lapse_calc").show();
$("#row_lapse").show();
$("#row_visual_format").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;

18
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1069,15 +1069,6 @@ switch ($action) {
$values['period'] = get_parameter('period'); $values['period'] = get_parameter('period');
$good_format = true; $good_format = true;
break; break;
case 'min_value':
case 'max_value':
case 'avg_value':
$values['period'] = get_parameter('period');
$values['lapse_calc'] = get_parameter('lapse_calc');
$values['lapse'] = get_parameter('lapse');
$values['visual_format'] = get_parameter('visual_format');
$good_format = true;
break;
default: default:
$values['period'] = get_parameter('period'); $values['period'] = get_parameter('period');
$values['top_n'] = get_parameter('radiobutton_max_min_avg',0); $values['top_n'] = get_parameter('radiobutton_max_min_avg',0);
@ -1413,15 +1404,6 @@ switch ($action) {
$values['period'] = get_parameter('period'); $values['period'] = get_parameter('period');
$good_format = true; $good_format = true;
break; break;
case 'min_value':
case 'max_value':
case 'avg_value':
$values['period'] = get_parameter('period');
$values['lapse_calc'] = get_parameter('lapse_calc');
$values['lapse'] = get_parameter('lapse');
$values['visual_format'] = get_parameter('visual_format');
$good_format = true;
break;
default: default:
$values['period'] = get_parameter('period'); $values['period'] = get_parameter('period');
$values['top_n'] = get_parameter('radiobutton_max_min_avg',0); $values['top_n'] = get_parameter('radiobutton_max_min_avg',0);

79
pandora_console/include/functions_graph.php
View File

@ -232,8 +232,8 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$projection, $avg_only = false, $uncompressed_module = false, $projection, $avg_only = false, $uncompressed_module = false,
$show_events = false, $show_alerts = false, $show_unknown = false, $baseline = false, $show_events = false, $show_alerts = false, $show_unknown = false, $baseline = false,
$baseline_data = array(), $events = array(), $series_suffix = '', $start_unknown = false, $baseline_data = array(), $events = array(), $series_suffix = '', $start_unknown = false,
$percentil = null, $fullscale = false, $force_interval = false,$time_interval = 300, $percentil = null, $fullscale = false) {
$max_only = 0, $min_only = 0) {
global $config; global $config;
global $chart_extra_data; global $chart_extra_data;
global $series_type; global $series_type;
@ -413,17 +413,10 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
} }
if ($count > 0) { if ($count > 0) {
if ($avg_only) { if ($avg_only) {
$chart[$timestamp]['sum'.$series_suffix] = $total; $chart[$timestamp]['sum'.$series_suffix] = $total;
} }
else if($max_only){ else {
$chart[$timestamp]['max'.$series_suffix] = $interval_max;
}
else if($min_only){
$chart[$timestamp]['min'.$series_suffix] = $interval_min;
}
else{
$chart[$timestamp]['max'.$series_suffix] = $interval_max; $chart[$timestamp]['max'.$series_suffix] = $interval_max;
$chart[$timestamp]['sum'.$series_suffix] = $total; $chart[$timestamp]['sum'.$series_suffix] = $total;
$chart[$timestamp]['min'.$series_suffix] = $interval_min; $chart[$timestamp]['min'.$series_suffix] = $interval_min;
@ -435,13 +428,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
if ($avg_only) { if ($avg_only) {
$chart[$timestamp]['sum'.$series_suffix] = 0; $chart[$timestamp]['sum'.$series_suffix] = 0;
} }
else if($max_only){ else {
$chart[$timestamp]['max'.$series_suffix] = 0;
}
else if($min_only){
$chart[$timestamp]['min'.$series_suffix] = 0;
}
else{
$chart[$timestamp]['max'.$series_suffix] = 0; $chart[$timestamp]['max'.$series_suffix] = 0;
$chart[$timestamp]['sum'.$series_suffix] = 0; $chart[$timestamp]['sum'.$series_suffix] = 0;
$chart[$timestamp]['min'.$series_suffix] = 0; $chart[$timestamp]['min'.$series_suffix] = 0;
@ -451,12 +438,6 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
if ($avg_only) { if ($avg_only) {
$chart[$timestamp]['sum'.$series_suffix] = $last_known; $chart[$timestamp]['sum'.$series_suffix] = $last_known;
} }
else if ($max_only) {
$chart[$timestamp]['max'.$series_suffix] = $last_known;
}
else if ($min_only) {
$chart[$timestamp]['min'.$series_suffix] = $last_known;
}
else { else {
$chart[$timestamp]['max'.$series_suffix] = $last_known; $chart[$timestamp]['max'.$series_suffix] = $last_known;
$chart[$timestamp]['sum'.$series_suffix] = $last_known; $chart[$timestamp]['sum'.$series_suffix] = $last_known;
@ -521,9 +502,8 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$baseline = 0, $return_data = 0, $show_title = true, $projection = false, $baseline = 0, $return_data = 0, $show_title = true, $projection = false,
$adapt_key = '', $compare = false, $series_suffix = '', $series_suffix_str = '', $adapt_key = '', $compare = false, $series_suffix = '', $series_suffix_str = '',
$show_unknown = false, $percentil = null, $dashboard = false, $vconsole = false, $show_unknown = false, $percentil = null, $dashboard = false, $vconsole = false,
$type_graph='area', $fullscale = false, $flash_chart = false, $force_interval = false,$time_interval = 300, $type_graph='area', $fullscale = false, $flash_chart = false) {
$max_only = 0, $min_only = 0) {
global $config; global $config;
global $chart; global $chart;
global $color; global $color;
@ -549,23 +529,8 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
if ($date == 0) $date = get_system_time(); if ($date == 0) $date = get_system_time();
$datelimit = $date - $period; $datelimit = $date - $period;
$search_in_history_db = db_search_in_history_db($datelimit); $search_in_history_db = db_search_in_history_db($datelimit);
$resolution = $config['graph_res'] * 50; //Number of points of the graph
$interval = (int) ($period / $resolution);
if($force_interval){
$resolution = $period/$time_interval;
}
else{
$resolution = $config['graph_res'] * 50; //Number of points of the graph
}
if($force_interval){
$interval = $time_interval;
}
else{
$interval = (int) ($period / $resolution);
}
$agent_name = modules_get_agentmodule_agent_name ($agent_module_id); $agent_name = modules_get_agentmodule_agent_name ($agent_module_id);
$agent_id = agents_get_agent_id ($agent_name); $agent_id = agents_get_agent_id ($agent_name);
$module_name = modules_get_agentmodule_name ($agent_module_id); $module_name = modules_get_agentmodule_name ($agent_module_id);
@ -753,8 +718,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$projection, $avg_only, $uncompressed_module, $projection, $avg_only, $uncompressed_module,
$show_events, $show_alerts, $show_unknown, $baseline, $show_events, $show_alerts, $show_unknown, $baseline,
$baseline_data, $events, $series_suffix, $start_unknown, $baseline_data, $events, $series_suffix, $start_unknown,
$percentil, $fullscale, $force_interval, $time_interval, $percentil, $fullscale);
$max_only, $min_only);
} }
// Return chart data and don't draw // Return chart data and don't draw
@ -879,19 +843,6 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$legend['percentil'.$series_suffix] = __('Percentile %dº', $percentil) .$series_suffix_str . " (" . $percentil_value . " " . $unit . ") "; $legend['percentil'.$series_suffix] = __('Percentile %dº', $percentil) .$series_suffix_str . " (" . $percentil_value . " " . $unit . ") ";
$chart_extra_data['legend_percentil'] = $legend['percentil'.$series_suffix_str]; $chart_extra_data['legend_percentil'] = $legend['percentil'.$series_suffix_str];
} }
if($force_interval){
$legend = array();
if($avg_only){
$legend['sum'.$series_suffix] = __('Avg');
}
elseif ($max_only) {
$legend['min'.$series_suffix] = __('Max');
}
elseif ($min_only) {
$legend['max'.$series_suffix] = __('Min');
}
}
} }
function grafico_modulo_sparse ($agent_module_id, $period, $show_events, function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
@ -902,10 +853,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$adapt_key = '', $compare = false, $show_unknown = false, $adapt_key = '', $compare = false, $show_unknown = false,
$menu = true, $backgroundColor = 'white', $percentil = null, $menu = true, $backgroundColor = 'white', $percentil = null,
$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false, $dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false,
$id_widget_dashboard = false,$force_interval = 0,$time_interval = 300, $id_widget_dashboard = false) {
$max_only = 0, $min_only = 0) {
global $config; global $config;
global $graphic_type; global $graphic_type;
@ -935,7 +884,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$return_data, $show_title, $projection, $adapt_key, $return_data, $show_title, $projection, $adapt_key,
$compare, $series_suffix, $series_suffix_str, $compare, $series_suffix, $series_suffix_str,
$show_unknown, $percentil, $dashboard, $vconsole,$type_graph, $show_unknown, $percentil, $dashboard, $vconsole,$type_graph,
$fullscale, $flash_chart,$force_interval,$time_interval,$max_only,$min_only); $fullscale, $flash_chart);
switch ($compare) { switch ($compare) {
case 'separated': case 'separated':
@ -968,9 +917,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$show_alerts, $avg_only, $show_alerts, $avg_only,
$date, $unit, $baseline, $return_data, $show_title, $date, $unit, $baseline, $return_data, $show_title,
$projection, $adapt_key, $compare, '', '', $show_unknown, $projection, $adapt_key, $compare, '', '', $show_unknown,
$percentil, $dashboard, $vconsole, $type_graph, $fullscale,$flash_chart, $percentil, $dashboard, $vconsole, $type_graph, $fullscale, $flash_chart);
$force_interval,$time_interval,$max_only,$min_only);
if ($return_data) { if ($return_data) {
return $data_returned; return $data_returned;
} }

435
pandora_console/include/functions_reporting.php
View File

@ -190,9 +190,6 @@ function reporting_make_reporting_data($report = null, $id_report,
$items_label['id_agent_module'] = $content['id_agent_module']; $items_label['id_agent_module'] = $content['id_agent_module'];
$items_label['modules'] = $modules_to_macro; $items_label['modules'] = $modules_to_macro;
$items_label['agents'] = $agents_to_macro; $items_label['agents'] = $agents_to_macro;
$items_label['visual_format'] = $visual_format;
$metaconsole_on = is_metaconsole();
$server_name = $content['server_name'];
//Metaconsole connection //Metaconsole connection
if ($metaconsole_on && $server_name != '') { if ($metaconsole_on && $server_name != '') {
@ -293,19 +290,19 @@ function reporting_make_reporting_data($report = null, $id_report,
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'max',$pdf); 'max');
break; break;
case 'avg_value': case 'avg_value':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'avg',$pdf); 'avg');
break; break;
case 'min_value': case 'min_value':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'min',$pdf); 'min');
break; break;
case 'sumatory': case 'sumatory':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
@ -3755,7 +3752,7 @@ function reporting_agent_configuration($report, $content) {
return reporting_check_structure_content($return); return reporting_check_structure_content($return);
} }
function reporting_value($report, $content, $type,$pdf) { function reporting_value($report, $content, $type) {
global $config; global $config;
$return = array(); $return = array();
@ -3840,17 +3837,8 @@ function reporting_value($report, $content, $type,$pdf) {
$return['agent_name'] = $agent_name; $return['agent_name'] = $agent_name;
$return['module_name'] = $module_name; $return['module_name'] = $module_name;
html_debug($pdf,true);
html_debug($only_image,true);
if($pdf){
$only_image = 1;
}
switch ($type) { switch ($type) {
case 'max': case 'max':
if($content['lapse_calc'] == 0){
$value = reporting_get_agentmodule_data_max( $value = reporting_get_agentmodule_data_max(
$content['id_agent_module'], $content['period'], $report["datetime"]); $content['id_agent_module'], $content['period'], $report["datetime"]);
if (!$config['simple_module_value']) { if (!$config['simple_module_value']) {
@ -3859,286 +3847,18 @@ function reporting_value($report, $content, $type,$pdf) {
else { else {
$formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit; $formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit;
} }
break;
}
else{
$value = '
<table border="0" style="margin:0 auto;text-align:center;">
<tr>
<td width="400px;" height="20%;">';
if($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3){
$value .= '
<table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
<tr>
<th style="padding:5px;background-color:#82b92e;">
'.__("Agent").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Module").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Maximum").'
</th>
<tr>
<td style="padding:5px;">
'.$agent_name.'
</td>
<td style="padding:5px;">
'.$module_name.'
</td>
<td style="padding:5px;">
'.format_for_graph(reporting_get_agentmodule_data_max(
$content['id_agent_module'], $content['period'], $report["datetime"]), $config['graph_precision']) . ' ' . $unit.'
</td>
</tr>
</table>';
}
$value .= '
</td>
<td rowspan="2" width="150px">
</td>
<td rowspan="2">';
if($content['visual_format'] == 2 || $content['visual_format'] == 3){
$value .=
grafico_modulo_sparse(
$content['id_agent_module'],
$content['period'],
false,
600,
300,
'',
'',
false,
0,
true,
$report["datetime"],
'',
0,
0,
true,
$only_image,
ui_get_full_url(false, false, false, false),
2,
false,
'',
$time_compare_overlapped,
true,
true,
'white',
($content['style']['percentil'] == 1) ? $config['percentil'] : null,
false,
false,
$config['type_module_charts'],
false,
false,
$content['lapse_calc'],
$content['lapse'],
1);
}
$value .= '
</td>
</tr>
<tr>
<td>';
if($content['visual_format'] == 1 || $content['visual_format'] == 3){
$value .= '
<table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
<tr>
<th style="padding:5px;background-color:#82b92e;">
'.__("Lapse").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Maximum").'
</th>
</tr>
<tr>';
$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
$date_reference = getdate();
for ($i=$date_reference[0]; $i > ($date_reference[0]-$content["period"]); $i -= $content["lapse"]) {
$value .= '<tr><td style="padding:5px;">'. date("Y-m-d H:i:s", ($i-$content["lapse"]+1)).' to '.date("Y-m-d H:i:s",$i).'</td><td>';
if($i>$time_begin['utimestamp']){
$value .= format_for_graph(reporting_get_agentmodule_data_min(
$content['id_agent_module'], $content["lapse"], $i), $config['graph_precision']) . ' ' . $unit.'</td></tr>';
}
else{
$value .= 'N/A</td></tr>';
}
}
$value .='</table>';
}
$value .= '
</td>
</tr>
</table>';
$formated_value = $value;
}
break;
case 'min': case 'min':
if($content['lapse_calc'] == 0){ $value = reporting_get_agentmodule_data_min(
$value = reporting_get_agentmodule_data_min( $content['id_agent_module'], $content['period'], $report["datetime"]);
$content['id_agent_module'], $content['period'], $report["datetime"]); if (!$config['simple_module_value']) {
if (!$config['simple_module_value']) {
$formated_value = $value;
}
else {
$formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit;
}
}
else{
$value = '
<table border="0" style="margin:0 auto;text-align:center;">
<tr>
<td width="400px;" height="20%;">';
if($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3){
$value .= '
<table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
<tr>
<th style="padding:5px;background-color:#82b92e;">
'.__("Agent").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Module").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Minimum").'
</th>
<tr>
<td style="padding:5px;">
'.$agent_name.'
</td>
<td style="padding:5px;">
'.$module_name.'
</td>
<td style="padding:5px;">
'.format_for_graph(reporting_get_agentmodule_data_min(
$content['id_agent_module'], $content['period'], $report["datetime"]), $config['graph_precision']) . ' ' . $unit.'
</td>
</tr>
</table>';
}
$value .= '
</td>
<td rowspan="2" width="150px">
</td>
<td rowspan="2">';
if($content['visual_format'] == 2 || $content['visual_format'] == 3){
$value .=
grafico_modulo_sparse(
$content['id_agent_module'],
$content['period'],
false,
600,
300,
'',
'',
false,
0,
true,
$report["datetime"],
'',
0,
0,
true,
$only_image,
ui_get_full_url(false, false, false, false),
2,
false,
'',
$time_compare_overlapped,
true,
true,
'white',
($content['style']['percentil'] == 1) ? $config['percentil'] : null,
false,
false,
$config['type_module_charts'],
false,
false,
$content['lapse_calc'],
$content['lapse'],
0,
1);
}
$value .= '
</td>
</tr>
<tr>
<td>';
if($content['visual_format'] == 1 || $content['visual_format'] == 3){
$value .= '
<table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
<tr>
<th style="padding:5px;background-color:#82b92e;">
'.__("Lapse").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Minimum").'
</th>
</tr>
<tr>';
$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
$date_reference = getdate();
for ($i=$date_reference[0]; $i > ($date_reference[0]-$content["period"]); $i -= $content["lapse"]) {
$value .= '<tr><td style="padding:5px;">'. date("Y-m-d H:i:s", ($i-$content["lapse"]+1)).' to '.date("Y-m-d H:i:s",$i).'</td><td>';
if($i>$time_begin['utimestamp']){
$value .= format_for_graph(reporting_get_agentmodule_data_min(
$content['id_agent_module'], $content["lapse"], $i), $config['graph_precision']) . ' ' . $unit.'</td></tr>';
}
else{
$value .= 'N/A</td></tr>';
}
}
$value .='</table>';
}
$value .= '
</td>
</tr>
</table>';
$formated_value = $value; $formated_value = $value;
} }
else {
$formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit;
}
break; break;
case 'avg': case 'avg':
if($content['lapse_calc'] == 0){
$value = reporting_get_agentmodule_data_average( $value = reporting_get_agentmodule_data_average(
$content['id_agent_module'], $content['period'], $report["datetime"]); $content['id_agent_module'], $content['period'], $report["datetime"]);
if (!$config['simple_module_value']) { if (!$config['simple_module_value']) {
@ -4147,138 +3867,7 @@ function reporting_value($report, $content, $type,$pdf) {
else { else {
$formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit; $formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit;
} }
} break;
else{
$value = '
<table border="0" style="margin:0 auto;text-align:center;">
<tr>
<td width="400px;" height="20%;">';
if($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3){
$value .= '
<table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
<tr>
<th style="padding:5px;background-color:#82b92e;">
'.__("Agent").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Module").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Average").'
</th>
<tr>
<td style="padding:5px;">
'.$agent_name.'
</td>
<td style="padding:5px;">
'.$module_name.'
</td>
<td style="padding:5px;">
'.format_for_graph(reporting_get_agentmodule_data_average(
$content['id_agent_module'], $content['period'], $report["datetime"]), $config['graph_precision']) . ' ' . $unit.'
</td>
</tr>
</table>';
}
$value .= '
</td>
<td rowspan="2" width="150px">
</td>
<td rowspan="2">';
if($content['visual_format'] == 2 || $content['visual_format'] == 3){
$value .=
grafico_modulo_sparse(
$content['id_agent_module'],
$content['period'],
false,
600,
300,
'',
'',
false,
1,
true,
$report["datetime"],
'',
0,
0,
true,
$only_image,
ui_get_full_url(false, false, false, false),
2,
false,
'',
$time_compare_overlapped,
true,
true,
'white',
($content['style']['percentil'] == 1) ? $config['percentil'] : null,
false,
false,
$config['type_module_charts'],
false,
false,
$content['lapse_calc'],
$content['lapse']
);
}
$value .= '
</td>
</tr>
<tr>
<td>';
if($content['visual_format'] == 1 || $content['visual_format'] == 3){
$value .= '
<table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
<tr>
<th style="padding:5px;background-color:#82b92e;">
'.__("Lapse").'
</th>
<th style="padding:5px;background-color:#82b92e;">
'.__("Average").'
</th>
</tr>
<tr>';
$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
$date_reference = getdate();
for ($i=$date_reference[0]; $i > ($date_reference[0]-$content["period"]); $i -= $content["lapse"]) {
$value .= '<tr><td style="padding:5px;">'. date("Y-m-d H:i:s", ($i-$content["lapse"]+1)).' to '.date("Y-m-d H:i:s",$i).'</td><td>';
if($i>$time_begin['utimestamp']){
$value .= format_for_graph(reporting_get_agentmodule_data_average(
$content['id_agent_module'], $content["lapse"], $i), $config['graph_precision']) . ' ' . $unit.'</td></tr>';
}
else{
$value .= 'N/A</td></tr>';
}
}
$value .='</table>';
}
$value .= '
</td>
</tr>
</table>';
$formated_value = $value;
}
break;
case 'sum': case 'sum':
$value = reporting_get_agentmodule_data_sum( $value = reporting_get_agentmodule_data_sum(
$content['id_agent_module'], $content['period'], $report["datetime"]); $content['id_agent_module'], $content['period'], $report["datetime"]);

6
pandora_console/pandoradb.sql
View File

@ -1270,9 +1270,6 @@ CREATE TABLE IF NOT EXISTS `treport_content` (
`id_module_group` INT (10) unsigned NOT NULL DEFAULT 0, `id_module_group` INT (10) unsigned NOT NULL DEFAULT 0,
`server_name` text, `server_name` text,
`historical_db` tinyint(1) UNSIGNED NOT NULL default 0, `historical_db` tinyint(1) UNSIGNED NOT NULL default 0,
`lapse_calc` tinyint(1) UNSIGNED NOT NULL default '0',
`lapse` int(11) UNSIGNED NOT NULL default '300',
`visual_format` UNSIGNED NOT NULL tinyint(1) default '0',
PRIMARY KEY(`id_rc`), PRIMARY KEY(`id_rc`),
FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`) FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`)
ON UPDATE CASCADE ON DELETE CASCADE ON UPDATE CASCADE ON DELETE CASCADE
@ -2730,9 +2727,6 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
`module_free_text` TEXT, `module_free_text` TEXT,
`each_agent` tinyint(1) default 1, `each_agent` tinyint(1) default 1,
`historical_db` tinyint(1) UNSIGNED NOT NULL default 0, `historical_db` tinyint(1) UNSIGNED NOT NULL default 0,
`lapse_calc` tinyint(1) UNSIGNED NOT NULL default '0',
`lapse` int(11) UNSIGNED NOT NULL default '300',
`visual_format` UNSIGNED NOT NULL tinyint(1) default '0',
PRIMARY KEY(`id_rc`) PRIMARY KEY(`id_rc`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8; ) ENGINE = InnoDB DEFAULT CHARSET=utf8;