From 942ee05e8b5ce80c248b76e56e1028c0567c6340 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Fri, 7 May 2010 18:18:23 +0000
Subject: [PATCH] 2010-05-07  Ramon Novoa  <rnovoa@artica.es>

	* include/functions_reporting.php, include/fgraph.php,
          include/functions_db.php, include/functions_fsgraph.php: Fixed
          a lot of chart and report code related to Pandora FMS's data
          compression algorithm.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2678 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |    7 +
 pandora_console/include/fgraph.php            | 1058 ++++++++++-------
 pandora_console/include/functions_db.php      |   28 +-
 pandora_console/include/functions_fsgraph.php |   24 +-
 .../include/functions_reporting.php           |  312 +++--
 5 files changed, 850 insertions(+), 579 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c2fe023fd2..5202ba53e9 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-07  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/functions_reporting.php, include/fgraph.php,
+          include/functions_db.php, include/functions_fsgraph.php: Fixed
+          a lot of chart and report code related to Pandora FMS's data
+          compression algorithm.
+
 2010-05-07 Sergio Martin  <sergio.martin@artica.es>
 
 	* godmode/servers/manage_recontask_form.php: Included
diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php
index 00144a7b26..8f88d2f8b7 100644
--- a/pandora_console/include/fgraph.php
+++ b/pandora_console/include/fgraph.php
@@ -108,156 +108,177 @@ function dame_fecha_grafico_timestamp ($timestamp) {
  * @return Mixed 
  */
 function graphic_combined_module ($module_list, $weight_list, $period, $width, $height,
-				$title, $unit_name, $show_event = 0, $show_alert = 0, $pure = 0, $stacked = 0, $date = 0) {
-
+				$title, $unit_name, $show_events = 0, $show_alerts = 0, $pure = 0, $stacked = 0, $date = 0) {
 	global $config;
 	global $graphic_type;
-	
-	$resolution = $config['graph_res'] * 50; // Number of "slices" we want in graph
-	
-	if (! $date)
-		$date = get_system_time ();
-	
-	$datelimit = $date - $period; // limit date
-	$interval = (int) ($period / $resolution); // Each interval is $interval seconds length
+
+	// Set variables
+	if ($date == 0) $date = get_system_time();
+	$datelimit = $date - $period;
+	$resolution = $config['graph_res'] * 50; //Number of points of the graph
+	$interval = (int) ($period / $resolution);
 	$module_number = count ($module_list);
 
 	// interval - This is the number of "rows" we are divided the time to fill data.
 	//	     more interval, more resolution, and slower.
 	// periodo - Gap of time, in seconds. This is now to (now-periodo) secs
 	
-	// Init tables
+	// Init weights
 	for ($i = 0; $i < $module_number; $i++) {
-		$real_data[$i] = array();
-		$mod_data[$i] = 1; // Data multiplier to get the same scale on all modules
-		if ($show_event == 1)
-			$real_event[$i] = array ();
-		if (isset ($weight_list[$i])) {
-			if ($weight_list[$i] == 0)
-				$weight_list[$i] = 1;
-		} else
+		if (! isset ($weight_list[$i])) {
 			$weight_list[$i] = 1;
+		} else if ($weight_list[$i] == 0) {
+				$weight_list[$i] = 1;
+		}
 	}
 
-	$max_value = 0;
-	$min_value = 0;
-	// FOR EACH MODULE IN module_list....
+	// Set data containers
+	for ($iterator = 0; $iterator < $resolution; $iterator++) {
+			$timestamp = $datelimit + ($interval * $iterator);
+			
+			$graph[$timestamp]['count'] = 0;
+			$graph[$timestamp]['timestamp_bottom'] = $timestamp;
+			$graph[$timestamp]['timestamp_top'] = $timestamp + $interval;
+			$graph[$timestamp]['min'] = 0;
+			$graph[$timestamp]['max'] = 0;
+			$graph[$timestamp]['last'] = 1;
+			$graph[$timestamp]['event'] = 0;
+			$graph[$timestamp]['alert'] = 0;
+	}
+
+	// Calculate data for each module
 	for ($i = 0; $i < $module_number; $i++) {
-		$id_agente_modulo = $module_list[$i];
-		$agent_name = get_agentmodule_agent_name ($id_agente_modulo);
-		$module_name = get_agentmodule_name ($id_agente_modulo);
-		$module_list_name[$i] = $agent_name." / ".substr ($module_name, 0, 20);
-		for ($j = 0; $j <= $resolution; $j++) {
-			$data[$j]['sum'] = 0; // SUM of all values for this interval
-			$data[$j]['count'] = 0; // counter
-			$data[$j]['timestamp_bottom'] = $datelimit + ($interval * $j); // [2] Top limit for this range
-			$data[$j]['timestamp_top'] = $datelimit + ($interval*($j+1)); // [3] Botom limit
-			$data[$j]['min'] = 0; // MIN
-			$data[$j]['max'] = 0; // MAX
-			$data[$j]['events'] = 0; // Event
-		}
-		
-		// Init other general variables
-		if ($show_event == 1) {
-			// If we want to show events in graphs
-			$sql = "SELECT utimestamp FROM tevento WHERE id_agentmodule = $id_agente_modulo AND utimestamp > $datelimit";
-			$result = get_db_all_rows_sql ($sql);
-			if ($result === false)
-				$result = array ();
-			foreach ($result as $row) {
-				$utimestamp = $row['utimestamp'];
-				for ($i = 0; $i <= $resolution; $i++) {
-					if ($utimestamp <= $data[$i]['timestamp_top'] && $utimestamp >= $data[$i]['timestamp_bottom']) {
-						$real_event[$i] = 1;
-					}
-				}
+
+		$agent_module_id = $module_list[$i];
+		$agent_name = get_agentmodule_agent_name ($agent_module_id);
+		$agent_id = get_agent_id ($agent_name);
+		$module_name = get_agentmodule_name ($agent_module_id);
+		$module_name_list[$i] = $agent_name." / ".substr ($module_name, 0, 20);
+
+		// Get event data (contains alert data too)
+		if ($show_events == 1 || $show_alerts == 1) {
+			$events = get_db_all_rows_filter ('tevento',
+				array ('id_agentmodule' => $agent_module_id,
+					"utimestamp > $datelimit",
+					"utimestamp < $date",
+					'order' => 'utimestamp ASC'),
+				array ('evento', 'utimestamp'));
+			if ($events === false) {
+				$events = array ();
 			}
 		}
-		
-		if ($show_alert == 1) {
-			$alert_high = false;
-			$alert_low = false;
-			// If we want to show alerts limits
-		
-			$alert_high = get_db_value ('MAX(max_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo);
-			$alert_low = get_db_value ('MIN(min_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo);
-		
-			// if no valid alert defined to render limits, disable it
-			if (($alert_low === false || $alert_low === NULL) &&
-				($alert_high === false || $alert_high === NULL)) {
-				$show_alert = 0;
-			}
-		}
-		
-		// Get the first data outsite (to the left---more old) of the interval given
-		$previous = (float) get_previous_data ($id_agente_modulo, $datelimit);
-		
-		$result = get_db_all_rows_filter ('tagente_datos',
-			array ('id_agente_modulo' => $id_agente_modulo,
+	
+		// Get module data
+		$data = get_db_all_rows_filter ('tagente_datos',
+			array ('id_agente_modulo' => $agent_module_id,
 				"utimestamp > $datelimit",
 				"utimestamp < $date",
 				'order' => 'utimestamp ASC'),
-			array ('datos', 'utimestamp'), 'AND', true);
-		
-		if ($result === false) {
-			if (! $graphic_type) {
+			array ('datos', 'utimestamp'));
+		if ($data === false) {
+			$data = array ();
+		}
+	
+		// Get previous data
+		$previous_data = get_previous_data ($agent_module_id, $datelimit);
+		if ($previous_data !== false) {
+			$previous_data['utimestamp'] = $datelimit;
+			array_unshift ($data, $previous_data);
+		}
+	
+		// Get next data
+		$nextData = get_next_data ($agent_module_id, $date);
+		if ($nextData !== false) {
+			array_push ($data, $nextData);
+		} else if (count ($data) > 0) {
+			// Propagate the last known data to the end of the interval
+			$nextData = array_pop ($data);
+			array_push ($data, $nextData);
+			$nextData['utimestamp'] = $date;
+			array_push ($data, $nextData);
+		}
+	
+		// Check available data
+		if (count ($data) < 2) {
+			if (!$graphic_type) {
 				return fs_error_image ();
 			}
 			graphic_error ();
 		}
-		
-		foreach ($result as $row) {
-			$datos = $row["datos"];
-			$utimestamp = $row["utimestamp"];
-			for ($j = 0; $j <= $resolution; $j++) {
-				if ($utimestamp <= $data[$j]['timestamp_top'] && $utimestamp > $data[$j]['timestamp_bottom']) {
-					$data[$j]['sum']=$data[$j]['sum']+$datos;
-					$data[$j]['count']++;
-					// Init min value
-					if ($data[$j]['min'] == 0)
-						$data[$j]['min'] = $datos;
-					else {
-						// Check min value
-						if ($datos < $data[$j]['min'])
-						$data[$j]['min'] = $datos;
-					}
-					// Check max value
-					if ($datos > $data[$j]['max'])
-						$data[$j]['max'] = $datos;
-					break;
-				}
-			}
+	
+		// Calculate chart data
+		$graph_values[$i] = array();
+		$module_data = array_shift ($data);
+		$event_data = array_shift ($events);
+		if ($module_data['utimestamp'] == $datelimit) {
+			$previous_data = $module_data['datos'];
+			$min_value = $module_data['datos'];
+			$max_value = $module_data['datos'];
+		} else {
+			$previous_data = 0;
+			$min_value = 0;
+			$max_value = 0;
 		}
-		
-		// Calculate Average value for $data[][0]
-		for ($j = 0; $j <= $resolution; $j++) {
-			if ($data[$j]['count'] > 0){
-				$real_data[$i][$j] =  $weight_list[$i] * ($data[$j]['sum']/$data[$j]['count']);
-				$data[$j]['sum'] = $data[$j]['sum']/$data[$j]['count'];
+
+		for ($iterator = 0; $iterator < $resolution; $iterator++) {
+			$timestamp = $datelimit + ($interval * $iterator);
+	
+			$total = 0;
+			$count = 0;
+			
+			// Read data that falls in the current interval
+			$interval_min = $previous_data;
+			$interval_max = $previous_data;
+			while ($module_data !== null && $module_data ['utimestamp'] >= $timestamp && $module_data ['utimestamp'] < ($timestamp + $interval)) {
+				if ($module_data['datos'] > $interval_max) {
+					$interval_max = $module_data['datos'];
+				} else if ($module_data['datos'] < $interval_max) {
+					$interval_min = $module_data['datos'];
+				}
+				$total += $module_data['datos'];
+				$count++;
+				$module_data = array_shift ($data);
+			}
+	
+			// Average
+			if ($count > 0) {
+				$total /= $count;
+			}
+	
+			// Min and max
+			if ($interval_max > $max_value) {
+				$max_value = $interval_max;
+			} else if ($interval_min < $min_value) {
+				$min_value = $interval_min;
+			}
+	
+			// Read events and alerts that fall in the current interval
+			$event_value = 0;
+			$alert_value = 0;
+			while ($event_data !== null && $event_data ['utimestamp'] >= $timestamp && $event_data ['utimestamp'] <= ($timestamp + $interval)) {
+				if ($show_events == 1) {
+					$event_value++;
+				}
+				if ($show_alerts == 1 && substr ($event_data['event_type'], 0, 5) == 'alert') {
+					$alert_value++;
+				}
+				$event_data = array_shift ($events);
+			}
+
+			// Data
+			if ($count > 0) {
+				$graph_values[$i][$timestamp] = $total * $weight_list[$i];
+				$previous_data = $total;
+			// Compressed data
 			} else {
-				$data[$j]['sum'] = $previous;
-				$real_data[$i][$j] = $previous * $weight_list[$i];
-				$data[$j]['min'] = $previous;
-				$data[$j]['max'] = $previous;
+				$graph_values[$i][$timestamp] = $previous_data * $weight_list[$i];
 			}
-			// Get max value for all graph
-			if ($data[$j]['max'] > $max_value) {
-				$max_value = $data[$j]['max'];
-			}
-			// This stores in mod_data max values for each module
-			if ($mod_data[$i] < $data[$j]['max']) {
-				$mod_data[$i] = $data[$j]['max'];
-			}
-			// Take prev. value
-			// TODO: CHeck if there are more than 24hours between
-			// data, if there are > 24h, module down.
-			$previous = $data[$j]['sum'];
 		}
 	}
 
 	for ($i = 0; $i < $module_number; $i++) {
 		if ($weight_list[$i] != 1)
-			$module_list_name[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
+			$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
 	}
 	
 	if ($period <= 3600) {
@@ -285,24 +306,24 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
 	}
 	
 	if (! $graphic_type) {
-		return fs_combined_chart ($real_data, $data, $module_list_name, $width, $height, $stacked, $resolution / 10, $time_format);
+		return fs_combined_chart ($graph_values, $graph, $module_name_list, $width, $height, $stacked, $resolution / 10, $time_format);
 	}
 
 	$engine = get_graph_engine ($period);
 	
 	$engine->width = $width;
 	$engine->height = $height;
-	$engine->data = &$real_data;
-	$engine->legend = $module_list_name;
+	$engine->data = &$graph_values;
+	$engine->legend = $module_name_list;
 	$engine->fontpath = $config['fontpath'];
 	$engine->title = "";
 	$engine->subtitle = '     '.__('Period').': '.$title_period;
 	$engine->show_title = !$pure;
 	$engine->stacked = $stacked;
 	$engine->xaxis_interval = $resolution;
-	$events = $show_event ? $real_event : false;
-	$alerts = $show_alert ? array ('low' => $alert_low, 'high' => $alert_high) : false;
-	$engine->combined_graph ($data, $events, $alerts, $unit_name, $max_value, $stacked);
+	$events = false;
+	$alerts = false;
+	$engine->combined_graph ($graph, $events, $alerts, $unit_name, $max_value, $stacked);
 }
 
 function grafico_modulo_sparseOLD ($id_agente_modulo, $period, $show_event,
@@ -535,7 +556,7 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0) {
 	$engine->width = $width;
 	$engine->height = $height;
 	$engine->data = $data;
-	$engine->max_value = $engine->max_value = max ($data);
+	$engine->max_value = max ($data);
 	$engine->show_title = false;
 	$engine->fontpath = $config['fontpath'];
 	$engine->xaxis_interval = floor ($width / 72);
@@ -1236,258 +1257,152 @@ function progress_bar ($progress, $width, $height, $mode = 1) {
 	$engine->progress_bar ($progress, $color);
 }
 
-function grafico_modulo_sparse ($id_agente_modulo, $period, $show_event,
+function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$width, $height , $title, $unit_name,
-				$show_alert, $avg_only = 0, $pure = false,
+				$show_alerts, $avg_only = 0, $pure = false,
 				$date = 0) {
 	global $config;
 	global $graphic_type;
 	
-	if (empty ($date))
-		$date = get_system_time ();
-	
-	$resolution = $config["graph_res"] * 50; // Number of "slices" we want in graph
-	$datelimit = $date - $period;
-	$real_event = array ();
-	
-	$interval = (int) ($period / $resolution); // Each interval is $interval seconds length
-	$nombre_agente = get_agentmodule_agent_name ($id_agente_modulo);
-	$id_agente = get_agent_id ($nombre_agente);
-	$nombre_modulo = get_agentmodule_name ($id_agente_modulo);
-	
-	// Init tables
-	for ($i = 0; $i <= $resolution; $i++) {
-		$data[$i]['sum'] = 0;
-		$data[$i]['count'] = 0;
-		$data[$i]['timestamp_bottom'] = $datelimit + ($interval * $i);
-		$data[$i]['timestamp_top'] = $datelimit + ($interval * ($i + 1));
-		$data[$i]['min'] = 0;
-		$data[$i]['max'] = 0;
-		$data[$i]['last'] = 0;
-		$data[$i]['events'] = 0;
-	}
-	
-	$all_data = get_db_all_rows_filter ('tagente_datos',
-		array ('id_agente_modulo' => (int) $id_agente_modulo,
-			"utimestamp > $datelimit",
-			"utimestamp < $date",
-			'order' => 'utimestamp ASC'),
-		array ('datos', 'utimestamp'), 'AND', true);
-	
-	if ($all_data === false) {
-		if (! $graphic_type) {
-			return fs_error_image ();
-		}
-		graphic_error ();
-	}
-	$max_value = 0;
-	$min_value = 0;
-	$start = 0;
-	
-	foreach ($all_data as $module_data) {
-		$utimestamp = $module_data['utimestamp'];
-		$real_data = $module_data['datos'];
-		for ($i = $start; $i <= $resolution; $i++) {
-			if ($utimestamp <= $data[$i]['timestamp_top'] && $utimestamp >= $data[$i]['timestamp_bottom']) {
-				$start = $i;
-				$data[$i]['sum'] += $real_data;
-				$data[$i]['count']++;
-				$data[$i]['last'] = $real_data; //The last value to insert in any of several iteration of maze of for
-				
-				// Init min value
-				if ($data[$i]['min'] == 0 || $real_data < $data[$i]['min'])
-					$data[$i]['min'] = $real_data;
-				
-				// Check max value
-				if ($real_data > $data[$i]['max'])
-					$data[$i]['max'] = $real_data;
-				
-				// Get max value for all graph
-				if ($data[$i]['max'] > $max_value)
-					$max_value = $data[$i]['max'];
-				
-				// Get min value for all graph
-				$max_value = max ($max_value, $data[$i]['max']);
-				$min_value = min ($min_value, $data[$i]['min']);
-				
-				if ($show_alert == 1) {
-					$alert_high = false;
-					$alert_low = false;
-					// If we want to show alerts limits
-		
-					$alert_high = get_db_value ('MAX(max_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo);
-					$alert_low = get_db_value ('MIN(min_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo);
-		
-					// if no valid alert defined to render limits, disable it
-					if (($alert_low === false || $alert_low === NULL) &&
-						($alert_high === false || $alert_high === NULL)) {
-						$show_alert = 0;
-					}
-				}
-			}
-			
-			if ($show_event) {
-				// If we want to show events in graphs
-				$events = get_db_value_filter ('COUNT(*)', 'tevento',
-					array ('id_agentmodule' => $id_agente_modulo,
-						'utimestamp >= '.$data[$i]['timestamp_bottom'],
-						'utimestamp < '.$data[$i]['timestamp_top']));
-				
-				if ($events)
-					$data[$i]['events']++;
-			}
-		}
-	}
-	
-	// Get the first data outsite (to the left---more old) of the interval given
-	$previous = (float) get_previous_data ($id_agente_modulo, $datelimit);
-	for ($i = 0; $i <= $resolution; $i++) {
-		if ($data[$i]['count']) {
-			/*
-			 * This division is for clean the value
-			 *  $data[$i]['sum'] += $real_data;
-			 *  $data[$i]['count']++;
-			 * because ['sum'] contents $real_data multiplied iterations in for
-			 */
-			$data[$i]['sum'] = $data[$i]['sum'] / $data[$i]['count'];
-			
-			$previous = $data[$i]['last'];
-		}
-		else {
-			$data[$i]['sum'] = $previous;
-			$data[$i]['min'] = $previous;
-			$data[$i]['max'] = $previous;
-			/* Previous does not change here*/
-		}
-	}
-	
-	if ($period <= 3600) {
-		$title_period = __('Last hour');
-		$time_format = 'G:i:s';
-	} elseif ($period <= 86400) {
-		$title_period = __('Last day');
-		$time_format = 'G:i';
-	} elseif ($period <= 604800) {
-		$title_period = __('Last week');
-		$time_format = 'M j';
-	} elseif ($period <= 2419200) {
-		$title_period = __('Last month');
-		$time_format = 'M j';
-	} else {
-		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
-		$time_format = 'M j';
-	}
-
-	if (! $graphic_type) {
-		return fs_module_chart ($data, $width, $height, $avg_only, $resolution / 10, $time_format);
-	}
-	
-	$engine = get_graph_engine ($period);
-	$engine->width = $width;
-	$engine->height = $height;
-	$engine->data = &$data;
-	$engine->xaxis_interval = $resolution;
-	if ($title == '')
-		$title = get_agentmodule_name ($id_agente_modulo);
-	$engine->title = '   '.strtoupper ($nombre_agente)." - ".__('Module').' '.$title;
-	$engine->subtitle = '     '.__('Period').': '.$title_period;
-	$engine->show_title = !$pure;
-	$engine->max_value = $max_value;
-	$engine->min_value = $min_value;
-	$engine->events = (bool) $show_event;
-	$engine->alert_top = $show_alert ? $alert_high : false;
-	$engine->alert_bottom = $show_alert ? $alert_low : false;;
-	if (! $pure) {
-		$engine->legend = &$legend;
-	}
-	$engine->fontpath = $config['fontpath'];
-	
-	$engine->sparse_graph ($period, $avg_only, $min_value, $max_value, $unit_name);
-}
-
-function grafico_modulo_boolean ($idModuleAgent, $period, $show_event,
-	 $width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
-	 $date = 0 ) {
-	global $config;
-	global $graphic_type;
-	
-	$nameAgent = get_agentmodule_agent_name ($idModuleAgent);
-	$idAgent = get_agent_id ($nameAgent);
-	$nameModule = get_agentmodule_name ($idModuleAgent);
-	
-	$resolution = $config['graph_res'] * 50; //Number of points of the graph
-	
+	// Set variables
 	if ($date == 0) $date = get_system_time();
 	$datelimit = $date - $period;
+	$resolution = $config['graph_res'] * 50; //Number of points of the graph
 	$interval = (int) ($period / $resolution);
-	
-	
-	if ($show_event == 1)
-		$real_event = array ();
+	$agent_name = get_agentmodule_agent_name ($agent_module_id);
+	$agent_id = get_agent_id ($agent_name);
+	$module_name = get_agentmodule_name ($agent_module_id);
 
-	if ($show_alert == 1) {
-		$alert_high = false;
-		$alert_low = false;
-		// If we want to show alerts limits
-		
-		$alert_high = get_db_value ('MAX(max_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo, true);
-		$alert_low = get_db_value ('MIN(min_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo, true);
-		
-		// if no valid alert defined to render limits, disable it
-		if (($alert_low === false || $alert_low === NULL) &&
-			($alert_high === false || $alert_high === NULL)) {
-			$show_alert = 0;
+	// Get event data (contains alert data too)
+	if ($show_events == 1 || $show_alerts == 1) {
+		$events = get_db_all_rows_filter ('tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp > $datelimit",
+				"utimestamp < $date",
+				'order' => 'utimestamp ASC'),
+			array ('evento', 'utimestamp'));
+		if ($events === false) {
+			$events = array ();
 		}
 	}
-	
+
+	// Get module data
 	$data = get_db_all_rows_filter ('tagente_datos',
-		array ('id_agente_modulo' => $idModuleAgent,
+		array ('id_agente_modulo' => $agent_module_id,
 			"utimestamp > $datelimit",
 			"utimestamp < $date",
 			'order' => 'utimestamp ASC'),
 		array ('datos', 'utimestamp'));
-	
-	$previousData = get_db_value_sql("SELECT datos FROM tagente_datos 
-		WHERE id_agente_modulo = " . $idModuleAgent . "
-			AND utimestamp < " . $datelimit . " 
-		ORDER BY utimestamp
-		DESC");
-	
-	if (($data === false) && ($previousData === false)) {
+	if ($data === false) {
+		$data = array ();
+	}
+
+	// Get previous data
+	$previous_data = get_previous_data ($agent_module_id, $datelimit);
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($data, $previous_data);
+	}
+
+	// Get next data
+	$nextData = get_next_data ($agent_module_id, $date);
+	if ($nextData !== false) {
+		array_push ($data, $nextData);
+	} else if (count ($data) > 0) {
+		// Propagate the last known data to the end of the interval
+		$nextData = array_pop ($data);
+		array_push ($data, $nextData);
+		$nextData['utimestamp'] = $date;
+		array_push ($data, $nextData);
+	}
+
+	// Check available data
+	if (count ($data) < 2) {
 		if (!$graphic_type) {
 			return fs_error_image ();
 		}
 		graphic_error ();
 	}
-	
-	$moduleData = array_shift($data);
-	
-	$graphPoints = array();
-	
-	//Fill all data in graph point
+
+	// Calculate chart data
+	$chart = array();
+	$module_data = array_shift ($data);
+	$event_data = array_shift ($events);
+	if ($module_data['utimestamp'] == $datelimit) {
+		$previous_data = $module_data['datos'];
+		$min_value = $module_data['datos'];
+		$max_value = $module_data['datos'];
+	} else {
+		$previous_data = 0;
+		$min_value = 0;
+		$max_value = 0;
+	}
+
 	for ($iterator = 0; $iterator < $resolution; $iterator++) {
 		$timestamp = $datelimit + ($interval * $iterator);
+
+		$total = 0;
+		$count = 0;
 		
-		if (($timestamp <= $moduleData['utimestamp']) && (($timestamp + $interval) > $moduleData['utimestamp'])) {
-			if ($moduleData["datos"] > 0) $value = 1;
-			else $value = 0;
-			
-			$graphPoints[$timestamp] = $value;
-			$graphPoints[$timestamp + 1] = (int)(!$value);
-			
-			$moduleData = array_shift($data);
-			if ($moduleData !== null)
-				$previousData = $moduleData['datos'];
+		// Read data that falls in the current interval
+		$interval_min = $previous_data;
+		$interval_max = $previous_data;
+		while ($module_data !== null && $module_data ['utimestamp'] >= $timestamp && $module_data ['utimestamp'] < ($timestamp + $interval)) {
+			if ($module_data['datos'] > $interval_max) {
+				$interval_max = $module_data['datos'];
+			} else if ($module_data['datos'] < $interval_max) {
+				$interval_min = $module_data['datos'];
+			}
+			$total += $module_data['datos'];
+			$count++;
+			$module_data = array_shift ($data);
 		}
-		else {
-			if ($previousData > 0) $value = 1;
-			else $value = 0;
-				
-			$graphPoints[$timestamp] = $value;
+
+		// Average
+		if ($count > 0) {
+			$total /= $count;
 		}
+
+		// Min and max
+		if ($interval_max > $max_value) {
+			$max_value = $interval_max;
+		} else if ($interval_min < $min_value) {
+			$min_value = $interval_min;
+		}
+
+		// Read events and alerts that fall in the current interval
+		$event_value = 0;
+		$alert_value = 0;
+		while ($event_data !== null && $event_data ['utimestamp'] >= $timestamp && $event_data ['utimestamp'] <= ($timestamp + $interval)) {
+			if ($show_events == 1) {
+				$event_value++;
+			}
+			if ($show_alerts == 1 && substr ($event_data['event_type'], 0, 5) == 'alert') {
+				$alert_value++;
+			}
+			$event_data = array_shift ($events);
+		}
+
+		// Data
+		if ($count > 0) {
+			$chart[$timestamp]['sum'] = $total;
+			$previous_data = $total;
+		// Compressed data
+		} else {
+			$chart[$timestamp]['sum'] = $previous_data;
+		}
+
+		$chart[$timestamp]['count'] = 0;
+		$chart[$timestamp]['timestamp_bottom'] = $timestamp;
+		$chart[$timestamp]['timestamp_top'] = $timestamp + $interval;
+		$chart[$timestamp]['min'] = $interval_min;
+		$chart[$timestamp]['max'] = $interval_max;
+		$chart[$timestamp]['last'] = 1;
+		$chart[$timestamp]['event'] = $event_value;
+		$chart[$timestamp]['alert'] = $alert_value;
 	}
 	
-	//And the last make the graph
+	// Set the title and time format
 	if ($period <= 3600) {
 		$title_period = __('Last hour');
 		$time_format = 'G:i:s';
@@ -1509,40 +1424,230 @@ function grafico_modulo_boolean ($idModuleAgent, $period, $show_event,
 		$time_format = 'M j';
 	}
 
-	$max_value = 1;
-	
-    //if flash graph
-	if (! $graphic_type) {
-		$graphPoints2 = array();
-	    foreach($graphPoints as $time => $value) {
-			$graphPoints2[] = array(
-				'sum' => $value,
-				'count' => 0,
-				'timestamp_bottom' => $time,
-				'timestamp_top' => ($time + $interval),
-				'min' => 1,
-				'max' => 1,
-				'last' => 1,
-				'events' => 0);
-	    }
-		
-		return fs_module_chart ($graphPoints2, $width, $height, $avg_only, $resolution / 10, $time_format);
+    // Flash chart
+	if (! $graphic_type) {	
+		return fs_module_chart ($chart, $width, $height, $avg_only, $resolution / 10, $time_format, $show_events, $show_alerts);
 	}
 	
+	$engine = get_graph_engine ($period);
+	$engine->width = $width;
+	$engine->height = $height;
+	$engine->data = &$chart;
+	$engine->xaxis_interval = $resolution;
+	if ($title == '')
+		$title = get_agentmodule_name ($id_agente_modulo);
+	$engine->title = '   '.strtoupper ($nombre_agente)." - ".__('Module').' '.$title;
+	$engine->subtitle = '     '.__('Period').': '.$title_period;
+	$engine->show_title = !$pure;
+	$engine->max_value = $max_value;
+	$engine->min_value = $min_value;
+	$engine->events = (bool) $show_event;
+	$engine->alert_top = false;
+	$engine->alert_bottom = false;;
+	if (! $pure) {
+		$engine->legend = &$legend;
+	}
+	$engine->fontpath = $config['fontpath'];
+	
+	$engine->sparse_graph ($period, $avg_only, $min_value, $max_value, $unit_name);
+}
+
+function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
+	 $width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure=0,
+	 $date = 0 ) {
+	global $config;
+	global $graphic_type;
+
+	// Set variables
+	if ($date == 0) $date = get_system_time();
+	$datelimit = $date - $period;
+	$resolution = $config['graph_res'] * 50; //Number of points of the graph
+	$interval = (int) ($period / $resolution);
+	$agent_name = get_agentmodule_agent_name ($agent_module_id);
+	$agent_id = get_agent_id ($agent_name);
+	$module_name = get_agentmodule_name ($agent_module_id);
+	
+	// Get event data (contains alert data too)
+	if ($show_events == 1 || $show_alerts == 1) {
+		$events = get_db_all_rows_filter ('tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp > $datelimit",
+				"utimestamp < $date",
+				'order' => 'utimestamp ASC'),
+			array ('evento', 'utimestamp'));
+		if ($events === false) {
+			$events = array ();
+		}
+	}
+
+	// Get module data
+	$data = get_db_all_rows_filter ('tagente_datos',
+		array ('id_agente_modulo' => $agent_module_id,
+			"utimestamp > $datelimit",
+			"utimestamp < $date",
+			'order' => 'utimestamp ASC'),
+		array ('datos', 'utimestamp'));
+	if ($data === false) {
+		$data = array ();
+	}
+
+	// Get previous data
+	$previous_data = get_previous_data ($agent_module_id, $datelimit);
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($data, $previous_data);
+	}
+
+	// Get next data
+	$nextData = get_next_data ($agent_module_id, $date);
+	if ($nextData !== false) {
+		array_push ($data, $nextData);
+	} else if (count ($data) > 0) {
+		// Propagate the last known data to the end of the interval
+		$nextData = array_pop ($data);
+		array_push ($data, $nextData);
+		$nextData['utimestamp'] = $date;
+		array_push ($data, $nextData);
+	}
+
+	// Check available data
+	if (count ($data) < 2) {
+		if (!$graphic_type) {
+			return fs_error_image ();
+		}
+		graphic_error ();
+	}
+
+	// Calculate chart data
+	$chart = array();
+	$module_data = array_shift ($data);
+	$event_data = array_shift ($events);
+	if ($module_data['utimestamp'] == $datelimit) {
+		$previous_data = $module_data['datos'];
+	} else {
+		$previous_data = 0;
+	}
+
+	for ($iterator = 0; $iterator < $resolution; $iterator++) {
+		$timestamp = $datelimit + ($interval * $iterator);
+
+		$zero = 0;
+		$total = 0;
+		$count = 0;
+		
+		// Read data that falls in the current interval
+		while ($module_data !== null && $module_data ['utimestamp'] >= $timestamp && $module_data ['utimestamp'] <= ($timestamp + $interval)) {
+			if ($module_data['datos'] == 0) {
+				$zero = 1;
+			} else {
+				$total += $module_data['datos'];
+				$count++;
+			}
+
+			$module_data = array_shift ($data);
+		}
+
+		// Average
+		if ($count > 0) {
+			$total /= $count;
+		}
+
+		// Read events and alerts that fall in the current interval
+		$event_value = 0;
+		$alert_value = 0;
+		while ($event_data !== null && $event_data ['utimestamp'] >= $timestamp && $event_data ['utimestamp'] < ($timestamp + $interval)) {
+			if ($show_events == 1) {
+				$event_value++;
+			}
+			if ($show_alerts == 1 && substr ($event_data['event_type'], 0, 5) == 'alert') {
+				$alert_value++;
+			}
+			$event_data = array_shift ($events);
+		}
+
+		// Data and zeroes (draw a step)
+		if ($zero == 1 && $count > 0) {
+			$chart[$timestamp]['sum'] = $total;
+			$chart[$timestamp + 1] = array ('sum' => $value,
+			                                'count' => 0,
+			                                'timestamp_bottom' => $timestamp,
+			                                'timestamp_top' => $timestamp + $interval,
+			                                'min' => 0,
+			                                'max' => 0,
+			                                'last' => 1,
+			                                'event' => $event_value,
+			                                'alert' => $alert_value);
+			$previous_data = 0;
+		// Just zeros
+		} else if ($zero == 1) {
+			$chart[$timestamp]['sum'] = 0;
+			$previous_data = 0;
+		// No zeros
+		} else if ($count > 0) {
+			$chart[$timestamp]['sum'] = $total;
+			$previous_data = $total;
+		// Compressed data
+		} else {
+			$chart[$timestamp]['sum'] = $previous_data;
+		}
+
+		$chart[$timestamp]['count'] = 0;
+		$chart[$timestamp]['timestamp_bottom'] = $timestamp;
+		$chart[$timestamp]['timestamp_top'] = $timestamp + $interval;
+		$chart[$timestamp]['min'] = 0;
+		$chart[$timestamp]['max'] = 0;
+		$chart[$timestamp]['last'] = 1;
+		$chart[$timestamp]['event'] = $event_value;
+		$chart[$timestamp]['alert'] = $alert_value;
+	}
+	
+	// Set the title and time format
+	if ($period <= 3600) {
+		$title_period = __('Last hour');
+		$time_format = 'G:i:s';
+	}
+	elseif ($period <= 86400) {
+		$title_period = __('Last day');
+		$time_format = 'G:i';
+	}
+	elseif ($period <= 604800) {
+		$title_period = __('Last week');
+		$time_format = 'M j';
+	}
+	elseif ($period <= 2419200) {
+		$title_period = __('Last month');
+		$time_format = 'M j';
+	} 
+	else {
+		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
+		$time_format = 'M j';
+	}
+
+    // Flash chart
+	if (! $graphic_type) {	
+		return fs_module_chart ($chart, $width, $height, $avg_only, $resolution / 10, $time_format, $show_events, $show_alerts);
+	}
+
+	$chart_data = array ();
+	foreach ($chart as $chart_element) {
+		$chart_data[$chart_element['timestamp_bottom']] = $chart_element['sum'];
+	}
+
+	// Image chart
 	$engine = get_graph_engine ($period);
 	
 	$engine->width = $width;
 	$engine->height = $height;
-	$engine->data = &$graphPoints;
-	$engine->max_value = $max_value;
-	$engine->legend = array ($nameModule);
-	$engine->title = '   '.strtoupper ($nameAgent)." - ".__('Module').' '.$title;
+	$engine->data = &$chart_data;
+	$engine->max_value = 1;
+	$engine->legend = array ($module_name);
+	$engine->title = '   '.strtoupper ($agent_name)." - ".__('Module').' '.$title;
 	$engine->subtitle = '     '.__('Period').': '.$title_period;
 	$engine->show_title = !$pure;
-	$engine->events = $show_event ? $real_event : false;
+	$engine->events = false;
 	$engine->fontpath = $config['fontpath'];
-	$engine->alert_top = $show_alert ? $alert_high : false;
-	$engine->alert_bottom = $show_alert ? $alert_low : false;;
+	$engine->alert_top = false;
+	$engine->alert_bottom = false;;
 
 	$engine->xaxis_interval = $resolution / 10; // Fixed to 10 ticks
 	$engine->xaxis_format = 'date';
@@ -1566,110 +1671,167 @@ function grafico_modulo_boolean ($idModuleAgent, $period, $show_event,
  * @param integer pure Fullscreen (1 or 0)
  * @param integer date date
  */
-function grafico_modulo_string ($id_agente_modulo, $period, $show_event,
-	 $width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
+function grafico_modulo_string ($agent_module_id, $period, $show_events,
+	 $width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure=0,
 	 $date = 0) {
 	global $config;
 	global $graphic_type;
 
-	// This code has been rewritten, taking code from 2.x and adjusted to work
-	// with new code for flash and new pchart functions. (slerena/ago09)
-
-	if ($date == "")
-		$date = time ();
-	$resolution = $config["graph_res"] * 5; // Number of "slices" we want in graph
-	$fechatope = $date - $period;
-	$horasint = $period / $resolution; // Each intervalo is $horasint seconds length
-
-	// Creamos la tabla (array) con los valores para el grafico. Inicializacion
-	for ($i = 0; $i <$resolution; $i++) {
-		$valores[$i][0] = 0; // [0] Valor (contador)
-		$valores[$i][1] = $fechatope + ($horasint * $i);
-		$valores[$i][2] = $fechatope + ($horasint * $i); // [2] Top limit for this range
-		$valores[$i][3] = $fechatope + ($horasint * ($i + 1)); // [3] Botom limit
+	// Set variables
+	if ($date == 0) $date = get_system_time();
+	$datelimit = $date - $period;
+	$resolution = $config['graph_res'] * 50; //Number of points of the graph
+	$interval = (int) ($period / $resolution);
+	$agent_name = get_agentmodule_agent_name ($agent_module_id);
+	$agent_id = get_agent_id ($agent_name);
+	$module_name = get_agentmodule_name ($agent_module_id);
+	
+	// Get event data (contains alert data too)
+	if ($show_events == 1 || $show_alerts == 1) {
+		$events = get_db_all_rows_filter ('tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp > $datelimit",
+				"utimestamp < $date",
+				'order' => 'utimestamp ASC'),
+			array ('evento', 'utimestamp'));
+		if ($events === false) {
+			$events = array ();
+		}
 	}
-	
-	
-	$sql1="SELECT utimestamp FROM tagente_datos_string WHERE id_agente_modulo = ".$id_agente_modulo." and utimestamp > '".$fechatope."'";
-	$result = get_db_all_rows_sql ($sql1, true);
-	if ($result === false)
-		$result = array ();
 
-	foreach ($result as $row){
-		for ($i = 0; $i < $resolution; $i++){
-			if (($row['utimestamp'] < $valores[$i][3]) and ($row['utimestamp'] >= $valores[$i][2]) ){ 
-				// entra en esta fila
-				$valores[$i][0]++;
+	// Get module data
+	$data = get_db_all_rows_filter ('tagente_datos_string',
+		array ('id_agente_modulo' => $agent_module_id,
+			"utimestamp > $datelimit",
+			"utimestamp < $date",
+			'order' => 'utimestamp ASC'),
+		array ('datos', 'utimestamp'));
+	if ($data === false) {
+		$data = array ();
+	}
+
+	// Get previous data
+	$previous_data = get_previous_data ($agent_module_id, $datelimit, 1);
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($data, $previous_data);
+	}
+
+	// Get next data
+	$nextData = get_next_data ($agent_module_id, $date, 1);
+	if ($nextData !== false) {
+		array_push ($data, $nextData);
+	} else if (count ($data) > 0) {
+		// Propagate the last known data to the end of the interval
+		$nextData = array_pop ($data);
+		array_push ($data, $nextData);
+		$nextData['utimestamp'] = $date;
+		array_push ($data, $nextData);
+	}
+
+	// Check available data
+	if (count ($data) < 2) {
+		if (!$graphic_type) {
+			return fs_error_image ();
+		}
+		graphic_error ();
+	}
+
+	// Calculate chart data
+	$chart = array();
+	$module_data = array_shift ($data);
+	$event_data = array_shift ($events);
+	$previous_data = 0;
+	for ($iterator = 0; $iterator < $resolution; $iterator++) {
+		$timestamp = $datelimit + ($interval * $iterator);
+
+		$count = 0;		
+		// Read data that falls in the current interval
+		while ($module_data !== null && $module_data ['utimestamp'] >= $timestamp && $module_data ['utimestamp'] <= ($timestamp + $interval)) {
+			$count++;
+			$module_data = array_shift ($data);
+		}
+
+		// Read events and alerts that fall in the current interval
+		$event_value = 0;
+		$alert_value = 0;
+		while ($event_data !== null && $event_data ['utimestamp'] >= $timestamp && $event_data ['utimestamp'] <= ($timestamp + $interval)) {
+			if ($show_events == 1) {
+				$event_value++;
 			}
-		} 
-		
-	}
-	$valor_maximo = 0;
-	for ($i = 0; $i < $resolution; $i++) { // 30 entries in graph, one by day
-		$grafica[$valores[$i][1]]=$valores[$i][0];
-		if ($valores[$i][0] > $valor_maximo)
-			$valor_maximo = $valores[$i][0];
-	}
+			if ($show_alerts == 1 && substr ($event_data['event_type'], 0, 5) == 'alert') {
+				$alert_value++;
+			}
+			$event_data = array_shift ($events);
+		}
 
-	// Rewrite data in format understable by flash charts
+		// Data in the interval
+		if ($count > 0) {
+			$chart[$timestamp]['sum'] = $count;
+			$previous_data = $total;
+		// Compressed data
+		} else {
+			$chart[$timestamp]['sum'] = $previous_data;
+		}
+
+		$chart[$timestamp]['count'] = 0;
+		$chart[$timestamp]['timestamp_bottom'] = $timestamp;
+		$chart[$timestamp]['timestamp_top'] = $timestamp + $interval;
+		$chart[$timestamp]['min'] = 0;
+		$chart[$timestamp]['max'] = 0;
+		$chart[$timestamp]['last'] = 1;
+		$chart[$timestamp]['event'] = $event_value;
+		$chart[$timestamp]['alert'] = $alert_value;
+	}
 	
-	for ($i = 0; $i < $resolution; $i++) { // 30 entries in graph, one by day
-		$data[$i]['sum'] = $valores[$i][0];
-		$data[$i]['count'] = $valores[$i][0];
-		$data[$i]['timestamp_bottom'] = $valores[$i][2];
-		$data[$i]['timestamp_top'] = $valores[$i][3];
-		$data[$i]['min'] = 0; // MIN
-		$data[$i]['max'] = $valores[$i][0];
-		$data[$i]['events'] = 0; // Event
-	}
-
-	if ($valor_maximo <= 0) {
-		$image = "../../include/fgraph.php?tipo=graphic_error";
-		print_image ($image, false, array ("border" => 0));
-		
-		return;
-	}
-		
+	// Set the title and time format
 	if ($period <= 3600) {
 		$title_period = __('Last hour');
 		$time_format = 'G:i:s';
-	} elseif ($period <= 86400) {
+	}
+	elseif ($period <= 86400) {
 		$title_period = __('Last day');
 		$time_format = 'G:i';
-	} elseif ($period <= 604800) {
+	}
+	elseif ($period <= 604800) {
 		$title_period = __('Last week');
 		$time_format = 'M j';
-	} elseif ($period <= 2419200) {
+	}
+	elseif ($period <= 2419200) {
 		$title_period = __('Last month');
 		$time_format = 'M j';
-	} else {
+	} 
+	else {
 		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
 		$time_format = 'M j';
 	}
 
-	if (! $graphic_type) {
-		return fs_module_chart ($data, $width, $height, $avg_only, $resolution / 10, $time_format);
+    // Flash chart
+	if (! $graphic_type) {	
+		return fs_module_chart ($chart, $width, $height, $avg_only, $resolution / 10, $time_format, $show_events, $show_alerts);
 	}
 	
+
+	$chart_data = array ();
+	foreach ($chart as $chart_element) {
+		$chart_data[$chart_element['timestamp_bottom']] = $chart_element['sum'];
+	}
+
 	$engine = get_graph_engine ($period);
 	
 	$engine->width = $width;
 	$engine->height = $height;
-	$engine->data = &$grafica;
-	$engine->max_value = $valor_maximo;
+	$engine->data = &$chart_data;
+	$engine->max_value = max ($chart_data);
 	
-	$nombre_agente = get_agentmodule_agent_name ($id_agente_modulo);
-	$nombre_modulo = get_agentmodule_name ($id_agente_modulo);
-	$id_agente = get_agent_id ($nombre_agente);
-
-	$engine->legend = array ($nombre_modulo);
-	$engine->title = '   '.strtoupper ($nombre_agente)." - ".__('Module').' '.$title;
+	$engine->legend = array ($module_name);
+	$engine->title = '   '.strtoupper ($agent_name)." - ".__('Module').' '.$title;
 	$engine->subtitle = '     '.__('Period').': '.$title_period;
 	$engine->show_title = !$pure;
-	$engine->events = $show_event ? $real_event : false;
+	$engine->events = false;
 	$engine->fontpath = $config['fontpath'];
-	$engine->alert_top = $show_alert ? $alert_high : false;
-	$engine->alert_bottom = $show_alert ? $alert_low : false;;
+	$engine->alert_top = false;
+	$engine->alert_bottom = false;;
 	
 	$engine->xaxis_interval = $resolution/5;		
 	$engine->yaxis_interval = 1;
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index cff2c6901a..29fcc1fad9 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -2508,22 +2508,27 @@ function get_layoutdata_y ($id_layoutdata){
  *
  * @param int Agent module id
  * @param int The timestamp to look backwards from and get the data.
+ * @param int 1 if the module has a string type.
  *
  * @return mixed The row of tagente_datos of the last period. False if there were no data.
  */
-function get_previous_data ($id_agent_module, $utimestamp = 0) {
+function get_previous_data ($id_agent_module, $utimestamp = 0, $string = 0) {
 	if (empty ($utimestamp))
 		$utimestamp = time ();
 	
+	if ($string == 1) {
+		$table = 'tagente_datos_string';
+	} else {
+		$table = 'tagente_datos';
+	}
+
 	// 172800 = 60×60×24*2 Search up to 2 days before utimestamp 
-	$interval = get_module_interval ($id_agent_module);
-	$sql = sprintf ('SELECT * FROM tagente_datos 
-			WHERE id_agente_modulo = %d 
+	$sql = sprintf ('SELECT * FROM ' . $table . ' WHERE id_agente_modulo = %d 
 			AND utimestamp <= %d 
-			AND utimestamp >= %d
+			AND utimestamp >= %d 
 			ORDER BY utimestamp DESC',
 			$id_agent_module, $utimestamp, $utimestamp - 172800);
-	
+
 	return get_db_row_sql ($sql, true);
 }
 
@@ -2532,12 +2537,19 @@ function get_previous_data ($id_agent_module, $utimestamp = 0) {
  *
  * @param int Agent module id
  * @param int The timestamp to look backwards from and get the data.
- *
+ * @param int 1 if the module has a string type.
+ * 
  * @return mixed The row of tagente_datos of the last period. False if there were no data.
  */
-function get_next_data ($id_agent_module, $utimestamp = 0) {
+function get_next_data ($id_agent_module, $utimestamp = 0, $string = 0) {
 	if (empty ($utimestamp))
 		$utimestamp = time ();
+
+	if ($string == 1) {
+		$table = 'tagente_datos_string';
+	} else {
+		$table = 'tagente_datos';
+	}
 	
 	$interval = get_module_interval ($id_agent_module);
 	$sql = sprintf ('SELECT * FROM tagente_datos 
diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php
index dec2f37f55..42cf654d64 100644
--- a/pandora_console/include/functions_fsgraph.php
+++ b/pandora_console/include/functions_fsgraph.php
@@ -131,7 +131,7 @@ function fs_2d_area_chart ($data, $width, $height, $step = 1, $params = '') {
 }
 
 // Returns a Pandora FMS module chart
-function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $time_format = 'G:i') {
+function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $time_format = 'G:i', $show_events = 0, $show_alerts = 0) {
 	global $config;
 
 	// Generate the XML
@@ -150,9 +150,25 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti
 		$chart->addCategory(date($time_format, $value['timestamp_bottom']), 'hoverText=' . date ($config['date_format'], $value['timestamp_bottom']) . ';showName=' . $show_name);
 	}
 
+	// Event chart
+	if ($show_events == 1) {
+		$chart->addDataSet(__('Events'), 'alpha=50;showAreaBorder=1;areaBorderColor=#ff7f00;color=#ff7f00');
+		foreach ($data as $value) {
+			$chart->addChartData($value['event']);
+		}
+	}
+
+	// Alert chart
+	if ($show_alerts == 1) {
+		$chart->addDataSet(__('Alerts'), 'alpha=50;showAreaBorder=1;areaBorderColor=#ff0000;color=#ff0000');
+		foreach ($data as $value) {
+			$chart->addChartData($value['alert']);
+		}
+	}
+
 	// Max chart
 	if ($avg_only == 0) {
-		$chart->addDataSet('Max', 'color=' . $config['graph_color3']);
+		$chart->addDataSet(__('Max'), 'color=' . $config['graph_color3']);
 		foreach ($data as $value) {
 			$chart->addChartData($value['max']);
 		}
@@ -160,7 +176,7 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti
 
 	// Avg chart
 	$empty = 1;
-	$chart->addDataSet('Avg', 'color=' . $config['graph_color2']);
+	$chart->addDataSet(__('Avg'), 'color=' . $config['graph_color2']);
 	foreach ($data as $value) {
 		if ($value['sum'] > 0) {
 			$empty = 0;
@@ -170,7 +186,7 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti
 
 	// Min chart
 	if ($avg_only == 0) {
-		$chart->addDataSet('Min', 'color=' . $config['graph_color1']);
+		$chart->addDataSet(__('Min'), 'color=' . $config['graph_color1']);
 		foreach ($data as $value) {
 			$chart->addChartData($value['min']);
 		}
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index dfc4457b53..d1b5bbf370 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -37,50 +37,58 @@ require_once ($config["homedir"]."/include/functions_agents.php");
  * @return float The average module value in the interval.
  */
 function get_agentmodule_data_average ($id_agent_module, $period, $date = 0) {
-	if ($date < 1) {
-		$date = get_system_time ();
-	}
+	global $config;
 	
-	$datelimit = $date - $period;
-	
-	$sql = sprintf ("SELECT * FROM tagente_datos 
-			WHERE id_agente_modulo = %d 
-			AND utimestamp > %d AND utimestamp <= %d 
-			ORDER BY utimestamp ASC",
-			$id_agent_module, $datelimit, $date);
-	
-	$values = get_db_all_rows_sql ($sql, true);
-	if ($values === false) {
-		$values = array ();
-	}
+	// Initialize variables
+	if (empty ($date)) $date = get_system_time ();
+	if ((empty ($period)) OR ($period == 0)) $period = $config["sla_period"];
+	$datelimit = $date - $period;	
 
-	/* Get also the previous data before the selected interval. */
-	$sum = 0;
-	$total = 0;
-	$module_interval = get_module_interval ($id_agent_module);
+	// Get module data
+	$interval_data = get_db_all_rows_sql ('SELECT * FROM tagente_datos 
+			WHERE id_agente_modulo = ' . (int) $id_agent_module .
+			' AND utimestamp > ' . (int) $datelimit .
+			' AND utimestamp < ' . (int) $date .
+			' ORDER BY utimestamp ASC', true);
+	if ($interval_data === false) $interval_data = array ();
+
+	// Get previous data
 	$previous_data = get_previous_data ($id_agent_module, $datelimit);
-	if (($previous_data !== false) && (isset($interval_data))) {
-		array_unshift ($interval_data, $values);
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($interval_data, $previous_data);
 	}
 
-	foreach ($values as $data) {
-		$interval_total = 1;
-		$interval_sum = $data['datos'];
-		if ($previous_data !== false && $data['utimestamp'] - $previous_data['utimestamp'] > $module_interval) {
-			$interval_total = round (($data['utimestamp'] - $previous_data['utimestamp']) / $module_interval, 0);
-			$interval_sum *= $interval_total;
-			
-		}
-		$total += $interval_total;
-		$sum += $interval_sum;
+	// Get next data
+	$next_data = get_next_data ($id_agent_module, $date);
+	if ($next_data !== false) {
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	} else {
+		// Propagate the last known data to the end of the interval
+		$next_data = array_pop ($interval_data);
+		array_push ($interval_data, $next_data);
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	}
+
+	if (count ($interval_data) < 2) {
+		return -1;
+	}
+
+	// Set initial conditions
+	$total = 0;
+	$previous_data = array_shift ($interval_data);
+	foreach ($interval_data as $data) {
+		$total += $previous_data['datos'] * ($data['utimestamp'] -  $previous_data['utimestamp']);
 		$previous_data = $data;
 	}
 
-	if ($total == 0) {
+	if ($period == 0) {
 		return 0;
 	}
 
-	return $sum / $total;
+	return $total / $period;
 }
 
 /** 
@@ -93,22 +101,59 @@ function get_agentmodule_data_average ($id_agent_module, $period, $date = 0) {
  * @return float The maximum module value in the interval.
  */
 function get_agentmodule_data_max ($id_agent_module, $period, $date = 0) {
-	if (! $date)
-		$date = get_system_time ();
-	$datelimit = $date - $period;
+	global $config;
 	
-	$sql = sprintf ("SELECT MAX(datos) FROM tagente_datos 
-			WHERE id_agente_modulo = %d 
-			AND utimestamp > %d  AND utimestamp <= %d",
-			$id_agent_module, $datelimit, $date);
-	$max = (float) get_db_sql ($sql, 0, true);
-	
-	/* Get also the previous report before the selected interval. */
+	// Initialize variables
+	if (empty ($date)) $date = get_system_time ();
+	if ((empty ($period)) OR ($period == 0)) $period = $config["sla_period"];
+	$datelimit = $date - $period;	
+
+	// Get module data
+	$interval_data = get_db_all_rows_sql ('SELECT * FROM tagente_datos 
+			WHERE id_agente_modulo = ' . (int) $id_agent_module .
+			' AND utimestamp > ' . (int) $datelimit .
+			' AND utimestamp < ' . (int) $date .
+			' ORDER BY utimestamp ASC', true);
+	if ($interval_data === false) $interval_data = array ();
+
+	// Get previous data
 	$previous_data = get_previous_data ($id_agent_module, $datelimit);
-	if ($previous_data !== false)
-		return max ($previous_data['datos'], $max);
-	
-	return max ((float) $previous_data, $max);
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($interval_data, $previous_data);
+	}
+
+	// Get next data
+	$next_data = get_next_data ($id_agent_module, $date);
+	if ($next_data !== false) {
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	} else {
+		// Propagate the last known data to the end of the interval
+		$next_data = array_pop ($interval_data);
+		array_push ($interval_data, $next_data);
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	}
+
+	if (count ($interval_data) < 2) {
+		return -1;
+	}
+
+	// Set initial conditions
+	$previous_data = array_shift ($interval_data);
+	if ($previous_data['utimestamp'] == $datelimit) {
+		$max = $previous_data['datos'];
+	} else {
+		$max = 0;
+	}
+	foreach ($interval_data as $data) {
+		if ($data['datos'] > $max) {
+			$max = $data['datos'];
+		}
+	}
+
+	return $max;
 }
 
 /** 
@@ -121,20 +166,58 @@ function get_agentmodule_data_max ($id_agent_module, $period, $date = 0) {
  * @return float The minimum module value of the module
  */
 function get_agentmodule_data_min ($id_agent_module, $period, $date = 0) {
-	if (! $date)
-		$date = get_system_time ();
-	$datelimit = $date - $period;
+	global $config;
 	
-	$sql = sprintf ("SELECT MIN(datos) FROM tagente_datos 
-			WHERE id_agente_modulo = %d 
-			AND utimestamp > %d AND utimestamp <= %d",
-			$id_agent_module, $datelimit, $date);
-	$min = (float) get_db_sql ($sql, 0, true);
-	
-	/* Get also the previous data before the selected interval. */
+	// Initialize variables
+	if (empty ($date)) $date = get_system_time ();
+	if ((empty ($period)) OR ($period == 0)) $period = $config["sla_period"];
+	$datelimit = $date - $period;	
+
+	// Get module data
+	$interval_data = get_db_all_rows_sql ('SELECT * FROM tagente_datos 
+			WHERE id_agente_modulo = ' . (int) $id_agent_module .
+			' AND utimestamp > ' . (int) $datelimit .
+			' AND utimestamp < ' . (int) $date .
+			' ORDER BY utimestamp ASC', true);
+	if ($interval_data === false) $interval_data = array ();
+
+	// Get previous data
 	$previous_data = get_previous_data ($id_agent_module, $datelimit);
-	if ($previous_data)
-		return min ($previous_data['datos'], $min);
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($interval_data, $previous_data);
+	}
+
+	// Get next data
+	$next_data = get_next_data ($id_agent_module, $date);
+	if ($next_data !== false) {
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	} else {
+		// Propagate the last known data to the end of the interval
+		$next_data = array_pop ($interval_data);
+		array_push ($interval_data, $next_data);
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	}
+
+	if (count ($interval_data) < 2) {
+		return -1;
+	}
+
+	// Set initial conditions
+	$previous_data = array_shift ($interval_data);
+	if ($previous_data['utimestamp'] == $datelimit) {
+		$min = $previous_data['datos'];
+	} else {
+		$min = 0;
+	}
+	foreach ($interval_data as $data) {
+		if ($data['datos'] < $min) {
+			$min = $data['datos'];
+		}
+	}
+
 	return $min;
 }
 
@@ -149,77 +232,68 @@ function get_agentmodule_data_min ($id_agent_module, $period, $date = 0) {
  */
 function get_agentmodule_data_sum ($id_agent_module, $period, $date = 0) {
 
-	if (! $date)
-		$date = get_system_time ();
-
-	$datelimit = $date - $period; // limit date
+	// Initialize variables
+	if (empty ($date)) $date = get_system_time ();
+	if ((empty ($period)) OR ($period == 0)) $period = $config["sla_period"];
+	$datelimit = $date - $period;
+	
 	$id_module_type = get_db_value ('id_tipo_modulo', 'tagente_modulo','id_agente_modulo', $id_agent_module);
 	$module_name = get_db_value ('nombre', 'ttipo_modulo', 'id_tipo', $id_module_type);
+	$module_interval = get_module_interval ($id_agent_module);
 
+    // Wrong module type
 	if (is_module_data_string ($module_name)) {
 		return 0;
-        // Wrong module type, we cannot sum alphanumerical data !
 	}
 
-	// Get the whole interval of data
-	$sql = sprintf ('SELECT utimestamp, datos FROM tagente_datos 
-			WHERE id_agente_modulo = %d 
-			AND utimestamp > %d AND utimestamp <= %d 
-			ORDER BY utimestamp ASC',
-			$id_agent_module, $datelimit, $date);
-	$datas = get_db_all_rows_sql ($sql, true);
-	
-	/* Get also the previous data before the selected interval. */
+	// Incremental modules are treated differently
+	$module_inc = is_module_inc ($module_name);
+
+	// Get module data
+	$interval_data = get_db_all_rows_sql ('SELECT * FROM tagente_datos 
+			WHERE id_agente_modulo = ' . (int) $id_agent_module .
+			' AND utimestamp > ' . (int) $datelimit .
+			' AND utimestamp < ' . (int) $date .
+			' ORDER BY utimestamp ASC', true);
+	if ($interval_data === false) $interval_data = array ();
+
+	// Get previous data
 	$previous_data = get_previous_data ($id_agent_module, $datelimit);
-	if ($previous_data) {
-		/* Add data to the beginning */
-		array_unshift ($datas, $previous_data);
-	}
-	if ($datas === false) {
-		return 0;
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $datelimit;
+		array_unshift ($interval_data, $previous_data);
 	}
 
-	$last_data = "";
-	$total_badtime = 0;
-	$module_interval = get_module_interval ($id_agent_module);
-	$timestamp_begin = $datelimit + $module_interval;
-	$timestamp_end = 0;
-	$sum = 0;
-	$data_value = 0;
-    $elapsed = 1;
-	
-	foreach ($datas as $data) {
-		$timestamp_end = $data["utimestamp"];
-        if ($timestamp_begin < $timestamp_end)
-    		$elapsed = $timestamp_end - $timestamp_begin;
-		$times =  $elapsed / $module_interval;
+	// Get next data
+	$next_data = get_next_data ($id_agent_module, $date);
+	if ($next_data !== false) {
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	} else {
+		// Propagate the last known data to the end of the interval
+		$next_data = array_pop ($interval_data);
+		array_push ($interval_data, $next_data);
+		$next_data['utimestamp'] = $date;
+		array_push ($interval_data, $next_data);
+	}
 
-		if (is_module_inc ($module_name)) {
-			$data_value = $data['datos'] * $module_interval;
+	if (count ($interval_data) < 2) {
+		return -1;
+	}
+
+	// Set initial conditions
+	$total = 0;
+	$previous_data = array_shift ($interval_data);
+	foreach ($interval_data as $data) {
+		if ($module_inc) {
+			$total += $previous_data['datos'] * ($data['utimestamp'] -  $previous_data['utimestamp']);
 		} else {
-			$data_value = $data['datos'];
+			$total += $previous_data['datos'] * ($data['utimestamp'] -  $previous_data['utimestamp']) / $module_interval;
 		}
-
-		$sum += $times * $data_value;
-		$timestamp_begin = $data["utimestamp"];
+		$previous_data = $data;
 	}
 
-	/* The last value must be get from tagente_estado, but
-	   it will count only if it's not older than date demanded
-	*/
-	$timestamp_end = get_db_value ('utimestamp', 'tagente_estado', 'id_agente_modulo', $id_agent_module);
-	if ($timestamp_end <= $datelimit) {
-		$elapsed = $timestamp_end - $timestamp_begin;
-		$times = intval ($elapsed / $module_interval);
-		if (is_module_inc ($module_name)) {
-			$data_value = $data['datos'] * $module_interval;
-		} else {
-			$data_value = $data['datos'];
-		}
-		$sum += $times * $data_value;
-	}
-	
-	return (float) $sum;
+	return $total;
 }
 
 /** 
@@ -235,7 +309,7 @@ function get_agentmodule_data_sum ($id_agent_module, $period, $date = 0) {
  * @return float SLA percentage of the requested module. False if no data were
  * found
  */
-function get_agentmodule_sla ($id_agentmodule, $period = 0, $min_value = 1, $max_value = false, $date = 0) {
+function get_agentmodule_sla ($id_agent_module, $period = 0, $min_value = 1, $max_value = false, $date = 0) {
 	global $config;
 	
 	// Initialize variables
@@ -249,19 +323,19 @@ function get_agentmodule_sla ($id_agentmodule, $period = 0, $min_value = 1, $max
 	$sql = sprintf ('SELECT * FROM tagente_datos
 	                 WHERE id_agente_modulo = %d
 	                 AND utimestamp > %d AND utimestamp <= %d',
-	                 $id_agentmodule, $datelimit, $date);
+	                 $id_agent_module, $datelimit, $date);
 	$interval_data = get_db_all_rows_sql ($sql, true);
 	if ($interval_data === false) $interval_data = array ();
 	
 	// Get previous data
-	$previous_data = get_previous_data ($id_agentmodule, $datelimit);
+	$previous_data = get_previous_data ($id_agent_module, $datelimit);
 	if ($previous_data !== false) {
 		$previous_data['utimestamp'] = $datelimit;
 		array_unshift ($interval_data, $previous_data);
 	}
 
 	// Get next data
-	$next_data = get_next_data ($id_agentmodule, $date);
+	$next_data = get_next_data ($id_agent_module, $date);
 	if ($next_data !== false) {
 		$next_data['utimestamp'] = $date;
 		array_push ($interval_data, $next_data);