From 5c4b2ab31b41142ded3427d999303ff3e66661e8 Mon Sep 17 00:00:00 2001 From: darode Date: Tue, 2 Oct 2012 15:54:22 +0000 Subject: [PATCH] 2012-10-02 Dario Rodriguez * include/functions_graph.php, operation/agentes/stat_win.php: Fixed a problem with max and min in boolean graph. This graphs don't have max and min series. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7031 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 ++++++ pandora_console/include/functions_graph.php | 19 ++++++++++------ .../operation/agentes/stat_win.php | 22 +++++++++++-------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 16fb0fc92f..6531c6da23 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-10-02 Dario Rodriguez + + * include/functions_graph.php, + operation/agentes/stat_win.php: Fixed a problem with + max and min in boolean graph. This graphs don't have + max and min series. + 2012-10-02 Dario Rodriguez * include/styles/pandora.css: Fixed a wrong change diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 369931f9a3..0fda778d51 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2427,9 +2427,10 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events, //The order filling the array is very important to get the same colors //in legends and graphs!!! - if (!$avg_only) { + //Boolean graph doesn't have max!!! + /*if (!$avg_only) { $chart[$timestamp]['max'.$series_suffix] = 0; - } + }*/ // Data and zeroes (draw a step) if ($zero == 1 && $count > 0) { @@ -2466,9 +2467,11 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events, } } - if (!$avg_only) { + + //Boolean graph doesn't have min!!! + /*if (!$avg_only) { $chart[$timestamp]['min'.$series_suffix] = 0; - } + }*/ if(!empty($event_ids)) { $chart_extra_data[count($chart)-1]['events'] = implode(',',$event_ids); @@ -2538,9 +2541,11 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events, } if (!$avg_only) { - $legend['max'.$series_suffix] = __('Max').$series_suffix_str .': '.__('Last').': '.$graph_stats['max']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['max']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['max']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['max']['min'].' '.$unit; + //Boolean graph doesn't have max!!! + //$legend['max'.$series_suffix] = __('Max').$series_suffix_str .': '.__('Last').': '.$graph_stats['max']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['max']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['max']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['max']['min'].' '.$unit; $legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit; - $legend['min'.$series_suffix] = __('Min').$series_suffix_str .': '.__('Last').': '.$graph_stats['min']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['min']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['min']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['min']['min'].' '.$unit; + //Boolean graph doesn't have min!!! + //$legend['min'.$series_suffix] = __('Min').$series_suffix_str .': '.__('Last').': '.$graph_stats['min']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['min']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['min']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['min']['min'].' '.$unit; } else { $legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit; @@ -2608,7 +2613,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events, } grafico_modulo_boolean_data ($agent_module_id, $period, $show_events, $unit_name, $show_alerts, $avg_only, $date, '', '', $show_unknown); - + if ($compare === 'overlapped') { $i = 0; foreach($chart as $k=>$v) { diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 453b9a9040..2b24a18987 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -315,15 +315,19 @@ $label = base64_decode(get_parameter('label', '')); ?> - - - - - - + + '. + __('Avg. Only'). + ' + '; + html_print_checkbox ("avg_only", 1, (bool) $avg_only, false, false, 'show_others()'); + html_print_input_hidden('show_other', 0); + echo ' + '; + } + ?>