tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-09-19 Sergio Martin <sergio.martin@artica.es> 

* include/functions_graph.php
	include/graphs/functions_flot.php
	include/graphs/flot/pandora.flot.js
	include/graphs/fgraph.php
	operation/agentes/stat_win.php: Fix several bugs of the 
	event graph and event special features on flot graphs when
	compare periods



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6989 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-09-19 14:59:31 +00:00
parent 31b78d9121
commit f848544e6f
6 changed files with 250 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2012-09-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php
include/graphs/functions_flot.php
include/graphs/flot/pandora.flot.js
include/graphs/fgraph.php
operation/agentes/stat_win.php: Fix several bugs of the
event graph and event special features on flot graphs when
compare periods
2012-09-19 Miguel de Dios <miguel.dedios@artica.es>
* extensions/resource_registration.php, extensions/system_info.php,

290
pandora_console/include/functions_graph.php
View File

@ -29,7 +29,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$data, $data_i, $previous_data, $resolution, $interval, $period, $datelimit,
$projection, $avg_only = false, $uncompressed_module = false,
$show_events = false, $show_alerts = false, $show_unknown = false, $baseline = false,
$baseline_data = array(), $events = array(), $series_suffix = '') {
$baseline_data = array(), $events = array(), $series_suffix = '', $start_unknown = false) {
global $config;
global $chart_extra_data;
@ -41,7 +41,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$event_i = 0;
// Is unknown flag
$is_unknown = false;
$is_unknown = $start_unknown;
// Calculate chart data
for ($i = 0; $i < $resolution; $i++) {
@ -103,6 +103,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
}
$event_i++;
}
if($is_unknown) {
$unknown_value++;
}
@ -150,16 +151,29 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
if (!$projection){
$timestamp = $timestamp_short;
}
// Data
if($show_events) {
$chart[$timestamp]['event'.$series_suffix] = $event_value;
if(!isset($chart[$timestamp]['event'.$series_suffix])) {
$chart[$timestamp]['event'.$series_suffix] = 0;
}
$chart[$timestamp]['event'.$series_suffix] += $event_value;
$series_type['event'.$series_suffix] = 'points';
}
if($show_alerts) {
$chart[$timestamp]['alert'.$series_suffix] = $alert_value;
if(!isset($chart[$timestamp]['alert'.$series_suffix])) {
$chart[$timestamp]['alert'.$series_suffix] = 0;
}
$chart[$timestamp]['alert'.$series_suffix] += $alert_value;
$series_type['alert'.$series_suffix] = 'points';
}
if($show_unknown) {
if(!isset($chart[$timestamp]['unknown'.$series_suffix])) {
$chart[$timestamp]['unknown'.$series_suffix] = 0;
}
$chart[$timestamp]['unknown'.$series_suffix] = $unknown_value;
$series_type['unknown'.$series_suffix] = 'area';
}
@ -217,12 +231,12 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
}
if(!empty($event_ids)) {
$chart_extra_data[count($chart)-1]['events'.$series_suffix] = implode(',',$event_ids);
$chart_extra_data[count($chart)-1]['events'] = implode(',',$event_ids);
}
if(!empty($alert_ids)) {
$chart_extra_data[count($chart)-1]['alerts'.$series_suffix] = implode(',',$alert_ids);
$chart_extra_data[count($chart)-1]['alerts'] = implode(',',$alert_ids);
}
}
}
}
@ -248,11 +262,10 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$color = array();
$legend = array();
$long_index = array();
$series_type = array();
$chart_extra_data = array();
$warning_min = 0;
$critical_min = 0;
$start_unknown = false;
// Set variables
if ($date == 0) $date = get_system_time();
$datelimit = $date - $period;
@ -279,6 +292,16 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
"utimestamp < $date",
'order' => 'utimestamp ASC'),
array ('id_evento', 'evento', 'utimestamp', 'event_type'));
// Get the last event after inverval to know if graph start on unknown
$prev_event = db_get_row_filter ('tevento',
array ('id_agentmodule' => $agent_module_id,
"utimestamp <= $datelimit",
'order' => 'utimestamp DESC'));
if(isset($prev_event['event_type']) && $prev_event['event_type'] == 'going_unknown') {
$start_unknown = true;
}
if ($events === false) {
$events = array ();
}
@ -376,8 +399,8 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$data, $data_i, $previous_data, $resolution, $interval, $period, $datelimit,
$projection, $avg_only, $uncompressed_module,
$show_events, $show_alerts, $show_unknown, $baseline,
$baseline_data, $events, $series_suffix);
$baseline_data, $events, $series_suffix, $start_unknown);
// Return chart data and don't draw
if ($return_data == 1) {
return $chart;
@ -387,17 +410,16 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$min_value = round(reporting_get_agentmodule_data_min ($agent_module_id, $period, $date), 2);
$max_value = round(reporting_get_agentmodule_data_max ($agent_module_id, $period, $date), 2);
$avg_value = round(reporting_get_agentmodule_data_average ($agent_module_id, $period, $date), 2);
// Fix event and alert scale
$event_max = $max_value * 1.05;
foreach ($chart as $timestamp => $chart_data) {
if ($show_events && $chart_data['event'.$series_suffix] > 0) {
$chart[$timestamp]['event'.$series_suffix] = $event_max * 1.2;
}
if ($show_alerts && $chart_data['alert'] > 0) {
if ($show_alerts && $chart_data['alert'.$series_suffix] > 0) {
$chart[$timestamp]['alert'.$series_suffix] = $event_max * 1.10;
}
if ($show_unknown && $chart_data['unknown'] > 0) {
if ($show_unknown && $chart_data['unknown'.$series_suffix] > 0) {
$chart[$timestamp]['unknown'.$series_suffix] = $event_max * 1.05;
}
}
@ -427,16 +449,16 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$color['unit'.$series_suffix] = array('border' => null, 'color' => '#0097BC', 'alpha' => 10);
if($show_events) {
$legend['event'.$series_suffix] = __('Events');
$chart_extra_data['legend_events'] = $legend['event'];
$legend['event'.$series_suffix_str] = __('Events').$series_suffix_str;
$chart_extra_data['legend_events'] = $legend['event'].$series_suffix_str;
}
if($show_alerts) {
$legend['alert'.$series_suffix] = __('Alerts');
$chart_extra_data['legend_alerts'] = $legend['alert'];
$legend['alert'.$series_suffix] = __('Alerts').$series_suffix_str;
$chart_extra_data['legend_alerts'] = $legend['alert'.$series_suffix_str];
}
if($show_unknown) {
$legend['unknown'.$series_suffix] = __('Unknown').$series_suffix_str;
$chart_extra_data['legend_unknown'] = $legend['unknown'];
$chart_extra_data['legend_unknown'] = $legend['unknown'.$series_suffix_str];
}
if (!$avg_only){
@ -475,28 +497,32 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
global $warning_min;
global $critical_min;
$series_suffix_str = '';
if($compare !== false) {
$series_suffix = '2';
$series_suffix_str = ' ('.__('Previous').')';
// Build the data of the previous period
grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$width, $height , $title, $unit_name,
$width, $height, $title, $unit_name,
$show_alerts, $avg_only, $date-$period, $unit, $baseline, $return_data,
$show_title, $projection, $adapt_key, $compare,
$series_suffix, $series_suffix_str, $show_unknown);
switch($compare) {
case 'separated':
// Store the chart calculated
$chart_prev = $chart;
$legend_prev = $legend;
$long_index_prev = $long_index;
$series_type_prev = $series_type;
$color_prev = $color;
break;
case 'overlapped':
// Store the chart calculated deleting index, because will be over the current period
$chart_prev = array_values($chart);
$legend_prev = $legend;
$series_type_prev = $series_type;
break;
}
}
@ -506,7 +532,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$width, $height , $title, $unit_name,
$show_alerts, $avg_only, $date, $unit, $baseline,
$return_data, $show_title, $projection, $adapt_key, $compare, '', '', $show_unknown);
if ($return_data) {
return $data_returned;
}
@ -535,19 +561,19 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl,
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key).
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false, $series_suffix_str).
'<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, $color, $legend_prev,
area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
$long_index_prev, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl,
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key);
$series_type_prev, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false, $series_suffix_str);
}
else {
// Color commented not to restrict serie colors
return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl,
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key);
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false, $series_suffix_str);
}
}
@ -1968,18 +1994,21 @@ function fs_error_image () {
function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$unit_name, $show_alerts, $avg_only = 0, $date = 0, $series_suffix = '',
$series_suffix_str = '') {
$series_suffix_str = '', $show_unknown = false) {
global $config;
global $chart;
global $color;
global $legend;
global $long_index;
global $series_type;
global $chart_extra_data;
$chart = array();
$color = array();
$legend = array();
$long_index = array();
$start_unknown = false;
// Set variables
if ($date == 0) $date = get_system_time();
@ -1997,13 +2026,23 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
// Get event data (contains alert data too)
if ($show_events == 1 || $show_alerts == 1) {
if ($show_unknown == 1 || $show_events == 1 || $show_alerts == 1) {
$events = db_get_all_rows_filter('tevento',
array ('id_agentmodule' => $agent_module_id,
"utimestamp > $datelimit",
"utimestamp < $date",
'order' => 'utimestamp ASC'),
array ('evento', 'utimestamp', 'event_type'));
array ('evento', 'utimestamp', 'event_type', 'id_evento'));
// Get the last event after inverval to know if graph start on unknown
$prev_event = db_get_row_filter ('tevento',
array ('id_agentmodule' => $agent_module_id,
"utimestamp <= $datelimit",
'order' => 'utimestamp DESC'));
if(isset($prev_event['event_type']) && $prev_event['event_type'] == 'going_unknown') {
$start_unknown = true;
}
if ($events === false) {
$events = array ();
}
@ -2110,17 +2149,35 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
// Read events and alerts that fall in the current interval
$event_value = 0;
$alert_value = 0;
$unknown_value = 0;
$event_ids = array();
$alert_ids = array();
while (isset ($events[$k]) &&
$events[$k]['utimestamp'] >= $timestamp &&
$events[$k]['utimestamp'] < ($timestamp + $interval)) {
if ($show_events == 1) {
$event_value++;
$event_ids[] = $events[$k]['id_evento'];
}
if ($show_alerts == 1 && substr ($events[$k]['event_type'], 0, 5) == 'alert') {
$alert_value++;
$alert_ids[] = $events[$k]['id_evento'];
}
if ($show_unknown) {
if($events[$k]['event_type'] == 'going_unknown') {
$is_unknown = true;
}
else if(substr ($events[$k]['event_type'], 0, 5) == 'going') {
$is_unknown = false;
}
}
$k++;
}
if($is_unknown) {
$unknown_value++;
}
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
@ -2144,6 +2201,10 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
$timestamp = $timestamp_short;
/////////////////////////////////////////////////////////////////
if($is_unknown) {
$total = 0;
}
// Data and zeroes (draw a step)
if ($zero == 1 && $count > 0) {
@ -2172,7 +2233,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$previous_data = $total;
}
else { // Compressed data
if ($uncompressed_module || ($timestamp > time ())) {
if ($uncompressed_module || ($timestamp > time ()) || $is_unknown) {
$chart[$timestamp]['sum'.$series_suffix] = 0;
}
else {
@ -2185,38 +2246,63 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$chart[$timestamp]['max'.$series_suffix] = 0;
}
if($show_events) {
$chart[$timestamp]['event'.$series_suffix] = $event_value;
if(!isset($chart[$timestamp]['event'.$series_suffix])) {
$chart[$timestamp]['event'.$series_suffix] = 0;
}
$chart[$timestamp]['event'.$series_suffix] += $event_value;
$series_type['event'.$series_suffix] = 'points';
}
else {
unset($chart[$timestamp]['event'.$series_suffix]);
if($show_alerts) {
if(!isset($chart[$timestamp]['alert'.$series_suffix])) {
$chart[$timestamp]['alert'.$series_suffix] = 0;
}
$chart[$timestamp]['alert'.$series_suffix] += $alert_value;
$series_type['alert'.$series_suffix] = 'points';
}
if ($show_alerts) {
$chart[$timestamp]['alert'.$series_suffix] = $alert_value;
if($show_unknown) {
if(!isset($chart[$timestamp]['unknown'.$series_suffix])) {
$chart[$timestamp]['unknown'.$series_suffix] = 0;
}
$chart[$timestamp]['unknown'.$series_suffix] = $unknown_value;
$series_type['unknown'.$series_suffix] = 'area';
}
else {
unset($chart[$timestamp]['alert'.$series_suffix]);
}
}
if(!empty($event_ids)) {
$chart_extra_data[count($chart)-1]['events'] = implode(',',$event_ids);
}
if(!empty($alert_ids)) {
$chart_extra_data[count($chart)-1]['alerts'] = implode(',',$alert_ids);
}
}
// Get min, max and avg (less efficient but centralized for all modules and reports)
$min_value = round(reporting_get_agentmodule_data_min ($agent_module_id, $period, $date), 2);
$max_value = round(reporting_get_agentmodule_data_max ($agent_module_id, $period, $date), 2);
$avg_value = round(reporting_get_agentmodule_data_average ($agent_module_id, $period, $date), 2);
// Fix event and alert scale
$event_max = $max_value * 1.05;
foreach ($chart as $timestamp => $chart_data) {
if ($show_events) {
if ($chart_data['event'] > 0) {
$chart[$timestamp]['event'.$series_suffix] = $event_max;
if ($chart_data['event'.$series_suffix] > 0) {
$chart[$timestamp]['event'.$series_suffix] = $max_value * 1.2;
}
}
if ($show_alerts) {
if ($chart_data['alert'] > 0) {
$chart[$timestamp]['alert'.$series_suffix] = $event_max;
if ($chart_data['alert'.$series_suffix] > 0) {
$chart[$timestamp]['alert'.$series_suffix] = $max_value * 1.10;
}
}
if ($show_unknown) {
if ($chart_data['unknown'.$series_suffix] > 0) {
$chart[$timestamp]['unknown'.$series_suffix] = $max_value * 1.05;
}
}
}
///////////////////////////////////////////////////
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
@ -2241,12 +2327,20 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
/////////////////////////////////////////////////////////////////////////////////////////
$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str . ' (' . $avg_value . ') ' . $unit;
if($show_events) {
$legend['event'.$series_suffix] = __('Events').$series_suffix_str;
$chart_extra_data['legend_events'] = $legend['event'.$series_suffix];
}
if($show_alerts) {
$legend['alert'.$series_suffix] = __('Alerts').$series_suffix_str;
$chart_extra_data['legend_alerts'] = $legend['alert'.$series_suffix];
}
if($show_unknown) {
$legend['unknown'.$series_suffix] = __('Unknown').$series_suffix_str;
$chart_extra_data['legend_unknown'] = $legend['unknown'.$series_suffix];
}
if (!$avg_only) {
$legend['max'.$series_suffix] = __('Max').$series_suffix_str . ' (' .format_for_graph($max_value) . ') ' . $unit;
$legend['min'.$series_suffix] = __('Min').$series_suffix_str . ' (' . format_for_graph($min_value) . ') ' . $unit;
@ -2260,6 +2354,9 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
if($show_alerts) {
$color['alert'.$series_suffix] = array('border' => '#ff0000', 'color' => '#ff0000', 'alpha' => 50);
}
if($show_unknown) {
$color['unknown'.$series_suffix] = array('border' => '#999999', 'color' => '#999999', 'alpha' => 50);
}
$color['max'.$series_suffix] = array('border' => '#000000', 'color' => $config['graph_color3'], 'alpha' => 50);
$color['min'.$series_suffix] = array('border' => '#000000', 'color' => $config['graph_color1'], 'alpha' => 50);
//$color['baseline'.$series_suffix] = array('border' => null, 'color' => '#0097BD', 'alpha' => 10);
@ -2268,7 +2365,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
$width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure=0,
$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $compare = false) {
$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $compare = false, $show_unknown = false) {
global $config;
global $graphic_type;
@ -2279,31 +2376,38 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
global $color;
global $legend;
global $long_index;
global $series_type;
global $chart_extra_data;
$series_suffix_str = '';
if ($compare !== false) {
$series_suffix = '2';
$series_suffix_str = ' ('.__('Previous').')';
// Build the data of the previous period
grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$unit_name, $show_alerts, $avg_only, $date-$period, $series_suffix, $series_suffix_str);
$unit_name, $show_alerts, $avg_only, $date-$period, $series_suffix,
$series_suffix_str, $show_unknown);
switch($compare) {
case 'separated':
// Store the chart calculated
$chart_prev = $chart;
$legend_prev = $legend;
$long_index_prev = $long_index;
$series_type_prev = $series_type;
$chart_extra_data_prev = $chart_extra_data;
$chart_extra_data = array();
$color_prev = $color;
break;
case 'overlapped':
// Store the chart calculated deleting index, because will be over the current period
$chart_prev = array_values($chart);
$legend_prev = $legend;
$series_type_prev = $series_type;
break;
}
}
grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$unit_name, $show_alerts, $avg_only, $date);
$unit_name, $show_alerts, $avg_only, $date, '', '', $show_unknown);
if ($compare === 'overlapped') {
$i = 0;
@ -2321,26 +2425,26 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png"));
if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, array(),
array(), 0, 0, $adapt_key).
$config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str).
'<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, $color, $legend_prev,
area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
$long_index_prev, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, array(),
array(), 0, 0, $adapt_key);
$config['fontpath'], $config['font_size'], $unit, 1, $series_type_prev,
$chart_extra_data_prev, 0, 0, $adapt_key, false, $series_suffix_str);
}
else {
return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, array(),
array(), 0, 0, $adapt_key);
$config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str);
}
}
@ -2411,10 +2515,10 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $only_im
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png"));
return stacked_area_graph($flash_chart, $chart, $width, $height, null, $sources,
null, ui_get_full_url("images/image_problem.opaque.png"), "", "",
$water_mark,
$config['fontpath'], $config['font_size'], "");
return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, "images/image_problem.opaque.png", "", $unit, $homeurl,
$config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], $unit);
}
@ -2744,8 +2848,9 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
* @param string homeurl Home url if the complete path is needed
* @param int Zoom factor over the graph
* @param string adaptation width and margin left key (could be adapter_[something] or adapted_[something])
* @param int date limit of the period
*/
function graphic_module_events ($id_module, $width, $height, $period = 0, $homeurl = '', $zoom = 0, $adapt_key = '') {
function graphic_module_events ($id_module, $width, $height, $period = 0, $homeurl = '', $zoom = 0, $adapt_key = '', $date = false) {
global $config;
global $graphic_type;
@ -2754,7 +2859,9 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
$resolution = $config['graph_res'] * ($period * 2 / $width); // Number of "slices" we want in graph
$interval = (int) ($period / $resolution);
$date = get_system_time ();
if($date === false) {
$date = get_system_time ();
}
$datelimit = $date - $period;
$periodtime = floor ($period / $interval);
$time = array ();
@ -2789,33 +2896,64 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
}
$top = $datelimit + ($periodtime * ($i + 1));
$event = db_get_row_filter ('tevento',
$events = db_get_all_rows_filter ('tevento',
array ('id_agentmodule' => $id_module,
'utimestamp > '.$bottom,
'utimestamp < '.$top), 'criticity, utimestamp');
'utimestamp < '.$top), 'event_type, utimestamp');
$status = 'normal';
foreach($events as $event) {
if(empty($event['utimestamp'])) {
continue;
}
switch($event['event_type']) {
case 'going_down_normal':
case 'going_up_normal':
// The default status is normal. Do nothing
break;
case 'going_unknown':
if($status == 'normal') {
$status = 'unknown';
}
break;
case 'going_up_warning':
case 'going_down_warning':
if($status == 'normal' || $status == 'unknown') {
$status = 'warning';
}
break;
case 'going_up_critical':
case 'going_down_critical':
$status = 'critical';
break;
}
}
$data[$cont]['utimestamp'] = $periodtime;
if (!empty($event['utimestamp'])){
$data[$cont]['utimestamp'] = $periodtime;
switch ($event['criticity']) {
case 3:
if (!empty($events)){
switch ($status) {
case 'warning':
$data[$cont]['data'] = 2;
break;
case 4:
case 'critical':
$data[$cont]['data'] = 3;
break;
case 'unknown':
$data[$cont]['data'] = 4;
break;
default:
$data[$cont]['data'] = 1;
break;
}
$current_timestamp = $event['utimestamp'];
}
else{
$data[$cont]['utimestamp'] = $periodtime;
$data[$cont]['data'] = 1;
$current_timestamp = $bottom;
}
$legend[] = date($time_format, $current_timestamp);
$cont++;
}

7
pandora_console/include/graphs/fgraph.php
View File

@ -233,8 +233,9 @@ function threshold_graph($flash_chart, $chart_data, $width, $height, $ttl = 1) {
function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
$long_index, $no_data_image, $xaxisname = "", $yaxisname = "", $homeurl="",
$water_mark = "", $font = '', $font_size = '', $unit = '', $ttl = 1, $series_type = array(),
$chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key = '', $force_integer = false) {
$chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key = '', $force_integer = false,
$series_suffix_str = '') {
setup_watermark($water_mark, $water_mark_file, $water_mark_url);
// ATTENTION: The min size is 130x150
@ -251,7 +252,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
}
if ($flash_chart) {
return flot_area_simple_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark_url, $series_type, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer);
return flot_area_simple_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark_url, $series_type, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer, $series_suffix_str);
}
else {
$graph = array();

6
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -442,7 +442,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
}
}
function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors, type, serie_types, water_mark, width, max_x, homeurl, unit, font_size, menu, events, event_ids, legend_events, alerts, alert_ids, legend_alerts, yellow_threshold, red_threshold, force_integer, separator, separator2) {
function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors, type, serie_types, water_mark, width, max_x, homeurl, unit, font_size, menu, events, event_ids, legend_events, alerts, alert_ids, legend_alerts, yellow_threshold, red_threshold, force_integer, separator, separator2, series_suffix_str) {
var threshold = true;
var thresholded = false;
@ -793,7 +793,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
$('#'+graph_id).bind("plotclick", function (event, pos, item) {
plot.unhighlight();
if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_alerts)) {
if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_events+series_suffix_str || item.series.label == legend_alerts || item.series.label == legend_alerts+series_suffix_str)) {
plot.unhighlight();
var canvaslimit = parseInt(plot.offset().left + plot.width());
var dataset = plot.getData();
@ -815,10 +815,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
$('#extra_'+graph_id).css('top',plot.offset().top + 25);
switch(item.series.label) {
case legend_alerts+series_suffix_str:
case legend_alerts:
extra_info = '<b>'+legend_alerts+' - '+labels_long[item.dataIndex]+'</b>'+get_event_details(alertsz[item.dataIndex]);
extra_show = true;
break;
case legend_events+series_suffix_str:
case legend_events:
extra_info = '<b>'+legend_events+' - '+labels_long[item.dataIndex]+'</b>'+get_event_details(eventsz[item.dataIndex]);
extra_show = true;

20
pandora_console/include/graphs/functions_flot.php
View File

@ -77,31 +77,31 @@ function include_javascript_dependencies_flot_graph($return = false) {
///////////////////////////////
////////// AREA GRAPHS ////////
///////////////////////////////
function flot_area_stacked_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false) {
function flot_area_stacked_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false, $series_suffix_str = '') {
global $config;
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'area_stacked', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer);
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'area_stacked', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer, $series_suffix_str);
}
function flot_area_simple_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false) {
function flot_area_simple_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false, $series_suffix_str = '') {
global $config;
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'area_simple', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer);
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'area_simple', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer, $series_suffix_str);
}
function flot_line_stacked_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false) {
function flot_line_stacked_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false, $series_suffix_str = '') {
global $config;
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'line_stacked', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer);
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'line_stacked', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer, $series_suffix_str);
}
function flot_line_simple_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false) {
function flot_line_simple_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '', $unit = '', $water_mark = '', $serie_types = array(), $chart_extra_data = array(), $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $force_integer = false, $series_suffix_str = '') {
global $config;
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'line_simple', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer);
return flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, 'line_simple', $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer, $series_suffix_str);
}
function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $type, $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer) {
function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $type, $water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $force_integer, $series_suffix_str = '') {
global $config;
include_javascript_dependencies_flot_graph();
@ -285,7 +285,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
// Javascript code
$return .= "<script type='text/javascript'>";
$return .= "//<![CDATA[\n";
$return .= "pandoraFlotArea('$graph_id', '$values', '$labels', '$labels_long', '$legend', '$colors', '$type', '$serie_types', $watermark, $width, $max_x, '".$config['homeurl']."', '$unit', $font_size, $menu, '$events', '$event_ids', '$legend_events', '$alerts', '$alert_ids', '$legend_alerts', '$yellow_threshold', '$red_threshold', $force_integer, '$separator', '$separator2');";
$return .= "pandoraFlotArea('$graph_id', '$values', '$labels', '$labels_long', '$legend', '$colors', '$type', '$serie_types', $watermark, $width, $max_x, '".$config['homeurl']."', '$unit', $font_size, $menu, '$events', '$event_ids', '$legend_events', '$alerts', '$alert_ids', '$legend_alerts', '$yellow_threshold', '$red_threshold', $force_integer, '$separator', '$separator2', '$series_suffix_str');";
$return .= "\n//]]>";
$return .= "</script>";

16
pandora_console/operation/agentes/stat_win.php
View File

@ -238,31 +238,31 @@ $label = base64_decode(get_parameter('label', ''));
case 'boolean':
echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height,
$label, null, $draw_alerts, $avg_only, false, $date, false, $urlImage, 'adapter_'.$graph_type, $time_compare, $unknown_graph);
echo '<br><br><br>';
echo '<br>';
if ($show_events_graph)
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, 'adapted_'.$graph_type);
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, 'adapted_'.$graph_type, $date);
break;
case 'sparse':
echo grafico_modulo_sparse ($id, $period, $draw_events, $width, $height,
$label, null, $draw_alerts, $avg_only, false, $date, '', $baseline,
0, true, false, $urlImage, 1, false, 'adapter_'.$graph_type, $time_compare, $unknown_graph);
echo '<br><br><br>';
echo '<br>';
if ($show_events_graph)
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, 'adapted_'.$graph_type);
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, 'adapted_'.$graph_type, $date);
break;
case 'string':
echo grafico_modulo_string ($id, $period, $draw_events, $width, $height,
$label, null, $draw_alerts, 1, false, $date, false, $urlImage, 'adapter_'.$graph_type);
echo '<br><br><br>';
echo '<br>';
if ($show_events_graph)
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, 'adapted_'.$graph_type);
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, 'adapted_'.$graph_type, $date);
break;
case 'log4x':
echo grafico_modulo_log4x ($id, $period, $draw_events, $width, $height,
$label, $unit_name, $draw_alerts, 1, $pure, $date);
echo '<br><br><br>';
echo '<br>';
if ($show_events_graph)
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom);
echo graphic_module_events($id, $width, $height, $period, $config['homeurl'] . '/', $zoom, '', $date);
break;
default:
echo fs_error_image ('../images');