Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'

1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1252,6 +1252,8 @@ UPDATE tagente_modulo SET cron_interval = '' WHERE cron_interval LIKE '%    %';
 -- Table `tgraph`
 -- ---------------------------------------------------------------------
 ALTER TABLE tgraph ADD COLUMN `percentil` int(4) unsigned default '0';
+ALTER TABLE tgraph ADD COLUMN `summatory_series` tinyint(1) UNSIGNED NOT NULL default '0';
+ALTER TABLE tgraph ADD COLUMN `average_series`  tinyint(1) UNSIGNED NOT NULL default '0';
 
 -- ---------------------------------------------------------------------
 -- Table `tnetflow_filter`

pandora_console/godmode/reporting/graph_builder.main.php

@@ -66,6 +66,8 @@ if ($edit_graph) {
 	$height = $graphInTgraph['height'];
 	$check = false;
 	$percentil = $graphInTgraph['percentil'];
+	$summatory_series = $graphInTgraph['summatory_series'];
+	$average_series = $graphInTgraph['average_series'];
 
 	if ($stacked == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
 		$stacked = CUSTOM_GRAPH_BULLET_CHART;
@@ -84,6 +86,8 @@ else {
 	$stacked = 4;
 	$check = false;
 	$percentil = 0;
+	$summatory_series = 0;
+	$average_series = 0;
 }
 
 
@@ -174,6 +178,15 @@ echo "</div>";
 
 echo "</div></td>";
 
+echo "<tr><td class='datos2'><b>".__('Add summatory series')."</b>" .
+	ui_print_help_tip (__("This will add a synthetic series to the graph, 
+	using all series to give a SUM or an average of all present series values 
+	in each interval. This feature could be used instead synthetic modules 
+	if you only want to see a graph"), true)."</td>";
+echo "<td class='datos2'>" . html_print_checkbox ("summatory_series", 1, $summatory_series, true) . "</td>
+<td class='datos2'><b>".__('Add average series')."</b></td>";
+echo "<td class='datos2'>" . html_print_checkbox ("average_series", 1, $average_series, true) . "</td></tr>";
+
 echo "<tr><td class='datos2'><b>".__('Percentil')."</b></td>";
 echo "<td class='datos2'>" . html_print_checkbox ("percentil", 1, $percentil, true) . "</td></tr>";
 

pandora_console/godmode/reporting/graph_builder.php

@@ -87,6 +87,8 @@ if ($add_graph) {
 	$period = get_parameter_post ("period");
 	$threshold = get_parameter('threshold');
 	$percentil = get_parameter ("percentil", 0);
+	$summatory_series = get_parameter ("summatory_series", 0);
+	$average_series = get_parameter ("average_series", 0);
 
 	if ($threshold == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
 		$stacked = $threshold;
@@ -103,7 +105,9 @@ if ($add_graph) {
 		'private' => 0,
 		'id_group' => $idGroup,
 		'stacked' => $stacked,
-		'percentil' => $percentil
+		'percentil' => $percentil,
+		'summatory_series' => $summatory_series,
+		'average_series' => $average_series
 		);
 	
 	if (trim($name) != "") {
@@ -131,6 +135,8 @@ if ($update_graph) {
 	$period = get_parameter('period');
 	$stacked = get_parameter('stacked');
 	$percentil = get_parameter('percentil');
+	$summatory_series = get_parameter ("summatory_series");
+	$average_series = get_parameter ("average_series");
 	$alerts = get_parameter('alerts');
 	$threshold = get_parameter('threshold');
 
@@ -141,7 +147,9 @@ if ($update_graph) {
 	if (trim($name) != "") {
 		
 		$success = db_process_sql_update('tgraph', 
-			array('name' => $name, 'id_group' => $id_group, 'description' => $description, 'width' => $width, 'height' => $height, 'period' => $period, 'stacked' => $stacked, 'percentil' => $percentil ),
+			array('name' => $name, 'id_group' => $id_group, 'description' => $description, 
+			'width' => $width, 'height' => $height, 'period' => $period, 'stacked' => $stacked, 
+			'percentil' => $percentil, 'summatory_series' => $summatory_series, 'average_series' => $average_series),
 			array('id_graph' => $id_graph));
 		if ($success !== false)
 			db_pandora_audit("Report management", "Update graph #$id_graph");

pandora_console/include/functions_custom_graphs.php

@@ -202,6 +202,10 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 		$sources = db_get_all_rows_field_filter('tgraph_source', 'id_graph',
 			$id_graph);
 		
+		$series = db_get_all_rows_sql('SELECT summatory_series,average_series FROM tgraph WHERE id_graph = '.$id_graph);
+		$summatory = $series[0]['summatory_series'];
+		$average = $series[0]['average_series'];
+		
 		$modules = array ();
 		$weights = array ();
 		$labels = array ();
@@ -262,7 +266,9 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 		$percentil,
 		$from_interface,
 		$id_widget_dashboard,
-		$fullscale);
+		$fullscale,
+		$summatory,
+		$average);	
 	
 	if ($return)
 		return $output;

pandora_console/include/functions_events.php

@@ -2080,7 +2080,7 @@ function events_page_details ($event, $server = "") {
 		}
 		else {
 			$module_group = db_get_value('name', 'tmodule_group', 'id_mg', $id_module_group);
-			$data[1] = '<a href="'.$serverstring . 'index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;status=-1&amp;modulegroup=' . $id_module_group . $hashstring.'">';
+			$data[1] = '<a href="'.$serverstring . 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;status=-1&amp;modulegroup=' . $id_module_group . $hashstring.'">';
 			$data[1] .= $module_group;
 			$data[1] .= '</a>';
 		}

pandora_console/include/functions_graph.php

@@ -1114,11 +1114,11 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 	$name_list = array(), $unit_list = array(), $show_last = true, $show_max = true,
 	$show_min = true, $show_avg = true, $labels = array(), $dashboard = false,
 	$vconsole = false, $percentil = null, $from_interface = false, 
-	$id_widget_dashboard=false, $fullscale = false) {
+	$id_widget_dashboard=false, $fullscale = false, $summatory = 0, $average = 0) {
 	
 	global $config;
 	global $graphic_type;
-
+	
 	if(!$fullscale){
 		$time_format_2 = '';
 		$temp_range = $period;
@@ -1204,7 +1204,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				$weight_list[$i] = 1;
 			}
 		}
-		
+
+		$aux_array = array();
 		// Set data containers
 		for ($i = 0; $i < $resolution; $i++) {
 			$timestamp = $datelimit + ($interval * $i);/*
@@ -1256,12 +1257,12 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			
 			// If its a projection graph,
 			// first module will be data and second will be the projection
+			
 			if ($projection != false && $i != 0) {
 				if ($automatic_custom_graph_meta)
 					$agent_module_id = $module_list[0]['module'];
 				else
 					$agent_module_id = $module_list[0];
-				
 				$id_module_type = modules_get_agentmodule_type ($agent_module_id);
 				$module_type = modules_get_moduletype_name ($id_module_type);
 				$uncompressed_module = is_module_uncompressed ($module_type);
@@ -1272,7 +1273,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				else
 					$agent_module_id = $module_list[$i];
 				
-				
 				$id_module_type = modules_get_agentmodule_type ($agent_module_id);
 				$module_type = modules_get_moduletype_name ($id_module_type);
 				$uncompressed_module = is_module_uncompressed ($module_type);
@@ -1345,6 +1345,21 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				continue;
 			}
 			
+			// if(empty($aux_array)){
+			// 	foreach ($data as $key => $value) {
+			// 		$aux_array[$value['utimestamp']] = $value['datos'];
+			// 	}
+			// } else {
+				// foreach ($data as $key => $value) {
+				// 	if(array_key_exists($value['utimestamp'],$aux_array)){
+				// 		$aux_array[$value['utimestamp']] = $aux_array[$value['utimestamp']] + $value['datos'];
+				// 	} else {
+				// 		$aux_array[$value['utimestamp']] = $value['datos'];
+				// 	}
+				// }
+			// }
+			
+			// html_debug($aux_array);
 			if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) {
 				if ($labels[$agent_module_id] != '')
 					$module_name_list[$i] = $labels[$agent_module_id];
@@ -2107,7 +2122,37 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			$threshold_data['red_inverse'] = (bool)$red_inverse;
 		}
 	}
-
+	
+	//summatory and average series
+	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
+		if($summatory && $average){
+			foreach ($graph_values as $key => $value) {
+				$cont = count($value);
+				$summ = array_sum($value);
+				array_push($value,$summ);
+				array_push($value,$summ/$cont);
+				$graph_values[$key] = $value;
+			}
+			array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
+			array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
+			
+		} elseif($summatory) {
+			foreach ($graph_values as $key => $value) {
+				array_push($value,array_sum($value));
+				$graph_values[$key] = $value;
+			}
+			array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
+			
+		} elseif($average) {
+			foreach ($graph_values as $key => $value) {
+				$summ = array_sum($value) / count($value);
+				array_push($value,$summ);
+				$graph_values[$key] = $value;
+			}
+			array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
+		}
+	}
+	
 	switch ($stacked) {
 		case CUSTOM_GRAPH_AREA:
 			return area_graph($flash_charts, $graph_values, $width,

pandora_console/include/functions_reporting.php

@@ -785,8 +785,8 @@ function reporting_SLA($report, $content, $type = 'dinamic',
 			}
 
 			$data = array();
-			$data['agent']        = modules_get_agentmodule_agent_alias($sla['id_agent_module']);
+			$data['agent']        = io_safe_output(modules_get_agentmodule_agent_alias($sla['id_agent_module']));
-			$data['module']       = modules_get_agentmodule_name($sla['id_agent_module']);
+			$data['module']       = io_safe_output(modules_get_agentmodule_name($sla['id_agent_module']));
 			$data['max']          = $sla['sla_max'];
 			$data['min']          = $sla['sla_min'];
 			$data['sla_limit']    = $sla['sla_limit'];
@@ -895,8 +895,8 @@ function reporting_SLA($report, $content, $type = 'dinamic',
 			// Slice graphs calculation
 			if ($show_graphs) {
 				$dataslice = array();
-				$dataslice['agent'] = modules_get_agentmodule_agent_alias ($sla['id_agent_module']);
+				$dataslice['agent'] = io_safe_output(modules_get_agentmodule_agent_alias ($sla['id_agent_module']));
-				$dataslice['module'] = modules_get_agentmodule_name ($sla['id_agent_module']);
+				$dataslice['module'] = io_safe_output(modules_get_agentmodule_name ($sla['id_agent_module']));
 				$dataslice['sla_value'] = $data['sla_value'];
 				$dataslice['order'] = $data['sla_value'];
 
@@ -7761,19 +7761,19 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
 	if ($links === false) {
 		$urls = array();
 		$urls['monitor_critical'] = "index.php?" .
-			"sec=estado&sec2=operation/agentes/status_monitor&" .
+			"sec=view&sec2=operation/agentes/status_monitor&" .
 			"refr=60&status=" . AGENT_MODULE_STATUS_CRITICAL_BAD . "&pure=" . $config['pure'];
 		$urls['monitor_warning'] = "index.php?" .
-			"sec=estado&sec2=operation/agentes/status_monitor&" .
+			"sec=view&sec2=operation/agentes/status_monitor&" .
 			"refr=60&status=" . AGENT_MODULE_STATUS_WARNING . "&pure=" . $config['pure'];
 		$urls['monitor_ok'] = "index.php?" .
-			"sec=estado&sec2=operation/agentes/status_monitor&" .
+			"sec=view&sec2=operation/agentes/status_monitor&" .
 			"refr=60&status=" . AGENT_MODULE_STATUS_NORMAL . "&pure=" . $config['pure'];
 		$urls['monitor_unknown'] = "index.php?" .
-			"sec=estado&sec2=operation/agentes/status_monitor&" .
+			"sec=view&sec2=operation/agentes/status_monitor&" .
 			"refr=60&status=" . AGENT_MODULE_STATUS_UNKNOWN . "&pure=" . $config['pure'];
 		$urls['monitor_not_init'] = "index.php?" .
-			"sec=estado&sec2=operation/agentes/status_monitor&" .
+			"sec=view&sec2=operation/agentes/status_monitor&" .
 			"refr=60&status=" . AGENT_MODULE_STATUS_NOT_INIT . "&pure=" . $config['pure'];
 	}
 	else {
@@ -7873,7 +7873,7 @@ function reporting_get_stats_agents_monitors($data) {
 	else {
 		$urls = array();
 		$urls['total_agents'] = "index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60";
-		$urls['monitor_checks'] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=-1";
+		$urls['monitor_checks'] = "index.php?sec=view&sec2=operation/agentes/status_monitor&refr=60&status=-1";
 	}
 	
 	// Agents and modules table

pandora_console/include/functions_visual_map.php

@@ -442,7 +442,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						// Link to an module
 						if (empty($layoutData['id_metaconsole'])) {
 							$url = $config['homeurl'] .
-								'index.php?sec=estado&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
+								'index.php?sec=view&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
 						}
 						else {
 							$url = ui_meta_get_url_console_child(
@@ -613,7 +613,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						// Link to an module
 						if (empty($layoutData['id_metaconsole'])) {
 							$url = $config['homeurl'] .
-								'index.php?sec=estado&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
+								'index.php?sec=view&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
 						}
 						else {
 							$url = ui_meta_get_url_console_child(
@@ -662,11 +662,11 @@ function visual_map_print_item($mode = "read", $layoutData,
 							
 							$url =
 								$server["server_url"] .
-								'/index.php?sec=estado&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
+								'/index.php?sec=view&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
 						}
 						else {
 							$url =
-								$config['homeurl'].'/index.php?sec=estado&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
+								$config['homeurl'].'/index.php?sec=view&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
 						}
 					}
 					else {
@@ -730,7 +730,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						else {
 							if (empty($layoutData['id_metaconsole'])) {
 								$url = $config['homeurl'] .
-									'/index.php?sec=estado&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
+									'/index.php?sec=view&sec2=operation/agentes/status_monitor&id_module=' . $layoutData['id_agente_modulo'];
 							}
 							else {
 								$url = ui_meta_get_url_console_child(

pandora_console/include/graphs/functions_flot.php

@@ -185,7 +185,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	include_javascript_dependencies_flot_graph();
 
 	$menu = (int)$menu;
-	
+	html_debug($legend);
 	// Get a unique identifier to graph
 	$graph_id = uniqid('graph_');
 	
@@ -500,6 +500,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 		$short_data = false;
 	}
 	
+	
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
 	$return .= "$(document).ready( function () {";

pandora_console/pandoradb.sql

@@ -1189,6 +1189,8 @@ CREATE TABLE IF NOT EXISTS `tgraph` (
 	`id_group` mediumint(8) unsigned NULL default 0,
 	`id_graph_template` int(11) NOT NULL default 0,
 	`percentil` tinyint(1) UNSIGNED NOT NULL default 0,
+	`summatory_series` tinyint(1) UNSIGNED NOT NULL default 0,
+	`average_series` tinyint(1) UNSIGNED NOT NULL default 0,
 	PRIMARY KEY(`id_graph`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;