Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev

pandora_console/godmode/agentes/module_manager.php

@@ -45,10 +45,10 @@ echo "<tr><td class='datos' style='width:20%; font-weight: bold;'>";
 echo __('Search') . ' ' .
 	html_print_input_text ('search_string', $search_string, '', 15, 255, true);
 echo "</td>";
-echo "<td class='datos' style='width:20%'>";
+echo "<td class='datos' style='width:10%'>";
 html_print_submit_button (__('Filter'), 'filter', false, 'class="sub search"');
 echo "</td>";
-echo "<td class='datos' style='width:20%'></td>";
+echo "<td class='datos' style='width:10%'></td>";
 echo '</form>';
 // Check if there is at least one server of each type available to assign that
 // kind of modules. If not, do not show server type in combo
@@ -119,7 +119,7 @@ if (($policy_page) || (isset($agent))) {
 		// Create module/type combo
 		echo '<form id="create_module_type" method="post" action="'.$url.'">';
 		if (!$policy_page) {
-			echo '<td class="datos" style="font-weight: bold;">';
+			echo '<td class="datos" style="font-weight: bold; width:20%;">';
 			echo __('Show in hierachy mode');
 			if ($checked == "true") {
 				$checked = true;
@@ -130,12 +130,12 @@ if (($policy_page) || (isset($agent))) {
 			html_print_checkbox ('status_hierachy_mode', "", $checked, false, false, "onChange=change_mod_filter();");
 			echo '</td>';
 		}
-		echo '<td class="datos" style="font-weight: bold;">';
+		echo '<td class="datos" style="font-weight: bold; width:20%;">';
 		echo __("Type");
 		html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false, '', false, 'max-width:300px;' );
 		html_print_input_hidden ('edit_module', 1);
 		echo '</td>';
-		echo '<td class="datos">';
+		echo '<td class="datos" style="width:10%;">';
 		echo '<input align="right" name="updbutton" type="submit" class="sub next" value="'.__('Create').'">';
 		echo '</td>';
 		echo '</tr>';

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -291,7 +291,7 @@ if (modules_is_string_type($id_module_type) || $edit) {
 	$table_simple->data[4][1] .= '<br /><em>'.__('Inverse interval').'</em>';
 	$table_simple->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true, $disabledBecauseInPolicy);
 if (!modules_is_string_type($id_module_type) || $edit) {
-	$table_simple->data[4][2] = '<svg id="svg_dinamic" width="350" height="200" style="padding:40px; padding-left: 100px; margin-bottom: 60px;"> </svg>';
+	$table_simple->data[4][2] = '<svg id="svg_dinamic" width="350px" height="200px" style="padding:40px; padding-left: 100px; margin-bottom: 60px;"></svg>';
 	$table_simple->colspan[4][2] = 2;
 	$table_simple->rowspan[4][2] = 3;
 }
@@ -1323,8 +1323,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "legend_normal")
 	       	.attr("x", 72)
 	       	.attr("y", -30)
-	       	.attr("width", 10)
+	       	.attr("width", '10px')
-	       	.attr("height", 10)
+	       	.attr("height", '10px')
 	  		.style("fill", "#82B92E");
 
 	  	//legend Warning text
@@ -1343,8 +1343,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "legend_warning")
 	       	.attr("x", 168)
 	       	.attr("y", -30)
-	       	.attr("width", 10)
+	       	.attr("width", '10px')
-	       	.attr("height", 10)
+	       	.attr("height", '10px')
 	  		.style("fill", "#ffd731");
 
 	  	//legend Critical text
@@ -1363,8 +1363,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "legend_critical")
 	       	.attr("x", 258)
 	       	.attr("y", -30)
-	       	.attr("width", 10)
+	       	.attr("width", '10px')
-	       	.attr("height", 10)
+	       	.attr("height", '10px')
 	  		.style("fill", "#fc4444");
 
 		//styles for number and axes
@@ -1382,8 +1382,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "warning_rect")
 	       	.attr("x", 3)
 	       	.attr("y", 0)
-	       	.attr("width", 300)
+	       	.attr("width", '300px')
-	       	.attr("height", 200)
+	       	.attr("height", '200px')
 	  		.style("fill", "#82B92E");
 	  	
 	  	//controls the inverse warning

pandora_console/godmode/modules/manage_network_components_form_common.php

@@ -473,8 +473,8 @@ $next_row++;
 				.attr("id", "legend_normal")
 		       	.attr("x", 72)
 		       	.attr("y", -30)
-		       	.attr("width", 10)
+		       	.attr("width", '10px')
-		       	.attr("height", 10)
+		       	.attr("height", '10px')
 		  		.style("fill", "#82B92E");
 
 		  	//legend Warning text

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -388,6 +388,7 @@ function update_button_palette_callback() {
 			else {
 				setPercentileBar(idItem, values);
 			}
+			
 			break;
 		case 'module_graph':
 			if($('#dir_items').html() == 'horizontal'){
@@ -1292,7 +1293,14 @@ function loadFieldsFromDB(item) {
 				}
 
 				if (key == 'value_show') {
-					$("select[name=value_show]").val(val);
+					if (val == 'percent') {
+						$("input[name=value_show][value=percent]")
+							.attr("checked", "checked");
+					}
+					else {
+						$("input[name=value_show][value=value]")
+							.attr("checked", "checked");
+					}
 				}
 
 				if (key == 'id_group') {

pandora_console/godmode/reporting/visual_console_builder.editor.php

@@ -196,11 +196,18 @@ ui_require_javascript_file ('encode_decode_base64');
 			"10pt=.visual_font_size_10pt, " +
 			"12pt=.visual_font_size_12pt, " +
 			"14pt=.visual_font_size_14pt, " +
+			"18pt=.visual_font_size_18pt, " +
 			"24pt=.visual_font_size_24pt, " +
+			"28pt=.visual_font_size_28pt, " +
 			"36pt=.visual_font_size_36pt, " +
+			"48pt=.visual_font_size_48pt, " +
+			"60pt=.visual_font_size_60pt, " +
 			"72pt=.visual_font_size_72pt, " +
+			"84pt=.visual_font_size_84pt, " +
 			"96pt=.visual_font_size_96pt, " +
+			"116pt=.visual_font_size_116pt, " +
 			"128pt=.visual_font_size_128pt, " +
+			"140pt=.visual_font_size_140pt, " +
 			"154pt=.visual_font_size_154pt, " +
 			"196pt=.visual_font_size_196pt",
 		theme_advanced_toolbar_location : "top",

pandora_console/godmode/reporting/visual_console_builder.elements.php

@@ -602,11 +602,18 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
 				"10pt=.visual_font_size_10pt, " +
 				"12pt=.visual_font_size_12pt, " +
 				"14pt=.visual_font_size_14pt, " +
+				"18pt=.visual_font_size_18pt, " +
 				"24pt=.visual_font_size_24pt, " +
+				"28pt=.visual_font_size_28pt, " +
 				"36pt=.visual_font_size_36pt, " +
+				"48pt=.visual_font_size_48pt, " +
+				"60pt=.visual_font_size_60pt, " +
 				"72pt=.visual_font_size_72pt, " +
+				"84pt=.visual_font_size_84pt, " +
 				"96pt=.visual_font_size_96pt, " +
+				"116pt=.visual_font_size_116pt, " +
 				"128pt=.visual_font_size_128pt, " +
+				"140pt=.visual_font_size_140pt, " +
 				"154pt=.visual_font_size_154pt, " +
 				"196pt=.visual_font_size_196pt",
 			theme_advanced_toolbar_location : "top",

pandora_console/godmode/reporting/visual_console_builder.wizard.php

@@ -144,7 +144,7 @@ $table->data["staticgraph_modulegraph"][1] .= '   ' .
 			 'leaguegothic' => 'League Gothic'
 	 	 );
 		 
-		 $fonts = array('4pt' => '4pt','6pt' => '6pt','8pt' => '8pt','10pt' => '10pt','12pt' => '12pt','14pt' => '14pt','24pt' => '24pt','36pt' => '36pt','72pt' => '72pt','96pt' => '96pt','128pt' => '128pt','154pt' => '154pt','196pt' => '196pt');
+		 $fonts = array('4pt' => '4pt','6pt' => '6pt','8pt' => '8pt','10pt' => '10pt','12pt' => '12pt','14pt' => '14pt','18pt' => '18pt','24pt' => '24pt','28pt' => '28pt','36pt' => '36pt','48pt' => '48pt','60pt' => '60pt','72pt' => '72pt','84pt' => '84pt','96pt' => '96pt','116pt' => '116pt','128pt' => '128pt','140pt' => '140pt','154pt' => '154pt','196pt' => '196pt');
 		 
 	/*	 
 		 $fontf = array('andale mono,times' => 'Andale Mono',

pandora_console/godmode/setup/setup_visuals.php

@@ -934,6 +934,23 @@ tinyMCE.init({
 });
 
 $(document).ready (function () {
+	
+	var comfort = 0;
+	
+	if(comfort == 0){
+		$(':input,:radio,:checkbox,:file').change(function(){
+			$('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
+			var comfort = 1;
+		});
+		
+		$("*").keydown(function(){
+			$('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
+			var comfort = 1;
+		});
+		
+		$('#form_setup').after('<br>');	
+		}
+	
 	$("#form_setup #text-graph_color1").attachColorPicker();
 	$("#form_setup #text-graph_color2").attachColorPicker();
 	$("#form_setup #text-graph_color3").attachColorPicker();

pandora_console/godmode/update_manager/update_manager.offline.php

@@ -58,7 +58,14 @@ $baseurl = ui_get_full_url(false, false, false, false);
 	var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
 	var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
 	var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
-	var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
+	var text4_mr_file = "<?php 
+	if($config['language'] == 'es'){
+		echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+	}
+	else{
+		echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+	}
+	?>";
 	var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
 	var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
 	var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";

pandora_console/include/ajax/graph.ajax.php

@@ -64,7 +64,7 @@ if ($print_custom_graph) {
 	$ttl = (int) get_parameter('ttl', 1);
 	$dashboard = (bool) get_parameter('dashboard');
 	$vconsole = (bool) get_parameter('vconsole');
-	
+
 	echo custom_graphs_print($id_graph, $height, $width, $period, $stacked,
 		true, $date, $only_image, $background_color, $modules_param,
 		$homeurl, $name_list, $unit_list, $show_last, $show_max,
@@ -102,13 +102,14 @@ if ($print_sparse_graph) {
 	$percentil = get_parameter('percentil', null);
 	$dashboard = (bool) get_parameter('dashboard');
 	$vconsole = (bool) get_parameter('vconsole');
+	$type_g = get_parameter('type_g', $config['type_module_charts']);
 	
 	echo grafico_modulo_sparse($agent_module_id, $period, $show_events,
 		$width, $height , $title, $unit_name, $show_alerts, $avg_only,
 		$pure, $date, $unit, $baseline, $return_data, $show_title,
 		$only_image, $homeurl, $ttl, $projection, $adapt_key, $compare,
 		$show_unknown, $menu, $backgroundColor, $percentil,
-		$dashboard, $vconsole, $config['type_module_charts']);
+		$dashboard, $vconsole, $type_g);
 	return;
 }
 

pandora_console/include/ajax/visual_console_builder.ajax.php

@@ -468,6 +468,8 @@ switch ($action) {
 			case 'label':
 			case 'icon':
 			case 'auto_sla_graph':
+			case 'bars_graph':
+			case 'donut_graph':
 			default:
 				if ($type == 'label') {
 					$values['type'] = LABEL;
@@ -518,11 +520,11 @@ switch ($action) {
 						$values['id_agent'] = $id_agent;
 					}
 				}
-				else if ($agent !== null) {
+				else if (!empty($id_agent)) {
-					$id_agent = agents_get_agent_id($agent);
 					$values['id_agent'] = $id_agent;
 				}
-				else {
+				else if ($agent !== null) {
+					$id_agent = agents_get_agent_id($agent);
 					$values['id_agent'] = $id_agent;
 				}
 				if ($id_module !== null) {
@@ -977,9 +979,6 @@ switch ($action) {
 				$values['image'] = $image;
 				$values['width'] = $width;
 				$values['height'] = $height;
-				if(defined('METACONSOLE') && $values['id_agent'] == 0){
-					$values['id_metaconsole'] = 1;
-				}
 				break;
 			case 'group_item':
 				$values['type'] = GROUP_ITEM;
@@ -998,18 +997,12 @@ switch ($action) {
 			case 'label':
 				$values['type'] = LABEL;
 				$values['label'] = $label;
-				if(defined('METACONSOLE') && $values['id_agent'] == 0){
-					$values['id_metaconsole'] = 1;
-				}
 				break;
 			case 'icon':
 				$values['type'] = ICON;
 				$values['image'] = $image;
 				$values['width'] = $width;
 				$values['height'] = $height;
-				if(defined('METACONSOLE') && $values['id_agent'] == 0){
-					$values['id_metaconsole'] = 1;
-				}
 				break;
 			default:
 				if (enterprise_installed()) {

pandora_console/include/constants.php

@@ -199,6 +199,8 @@ define('BOX_ITEM',			12);
 define('LINE_ITEM',			13);
 define('CIRCULAR_PROGRESS_BAR', 15);
 define('CIRCULAR_INTERIOR_PROGRESS_BAR', 16);
+define('DONUT_GRAPH',		17);
+define('BARS_GRAPH',		18);
 //Some styles
 define('MIN_WIDTH',			300);
 define('MIN_HEIGHT',		120);

pandora_console/include/functions_graph.php

@@ -2119,7 +2119,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		case CUSTOM_GRAPH_PIE:
 			return ring_graph($flash_charts, $graph_values, $width, $height,
 				$others_str, $homeurl, $water_mark, $config['fontpath'],
-				($config['font_size']+1), $ttl, false, $color, false);
+				($config['font_size']+1), $ttl, false, $color, false,$background_color);
 			break;
 	}
 }

pandora_console/include/functions_update_manager.php

@@ -358,7 +358,14 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
 					var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
 					var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
 					var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
-					var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
+					var text4_mr_file = "<?php 
+					if($config['language'] == 'es'){
+						echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+					}
+					else{
+						echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+					}
+					?>";
 					var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
 					var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
 					var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";

pandora_console/include/functions_visual_map.php

@@ -424,7 +424,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 					}
 				}
 				else if ($is_a_link_to_other_visualconsole) {
-					if (empty($layoutData['id_metaconsole'])) {
+					if (empty($layout_data['id_metaconsole'])) {
 						$url = $config['homeurl'] . "index.php?sec=reporting&sec2=operation/visual_console/render_view&pure=" . $config["pure"] . "&id=" . $layoutData["id_layout_linked"];
 					}
 					else {
@@ -490,6 +490,29 @@ function visual_map_print_item($mode = "read", $layoutData,
 						"&date_to=" . $date_to . "&time_to=" . $time_to . "&status=-1";
 				}
 				break;
+			
+			case DONUT_GRAPH:
+				if (empty($layout_data['id_metaconsole'])) {
+					$url = $config['homeurl'] . "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				else {
+					$url = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				break;
+
+			case BARS_GRAPH:
+				if (empty($layout_data['id_metaconsole'])) {
+					$url = $config['homeurl'] . "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				else {
+					$url = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				break;
+
 			case GROUP_ITEM:
 				$is_a_link_to_other_visualconsole = false;
 				if ($layoutData['id_layout_linked'] != 0) {
@@ -513,20 +536,15 @@ function visual_map_print_item($mode = "read", $layoutData,
 			case LABEL:
 				if ($layoutData['id_layout_linked'] != 0) {
 					// Link to a map
-					if ($layoutData['id_metaconsole'] == 0) {
+					$url = $config['homeurl'] .
-						$url = $config['homeurl'] .
+						'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config["pure"].'&id='.$layoutData["id_layout_linked"];
-							'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config["pure"].'&id='.$layoutData["id_layout_linked"];
-					}
-					else{
-						$url = "index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap=" . $layoutData["id_layout_linked"] . "&refr=0";
-					}
 				}
 				break;
 			case ICON:
 				$url_icon = "";
 				if ($layoutData['id_layout_linked'] != 0) {
 					// Link to a map
-					if ($layoutData['id_metaconsole'] == 0) {
+					if (empty($layoutData['id_metaconsole'])) {
 						$url = 'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config["pure"].'&id='.$layoutData["id_layout_linked"];
 					}
 					else {
@@ -1088,10 +1106,10 @@ function visual_map_print_item($mode = "read", $layoutData,
 			if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
 				if($width == 0 || $height == 0){
 					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/module-events.png" style="width:500px;height:40px;">';
+						$img =  '<img src="../../images/console/signes/module-events.png">';
 					}
 					else{
-						$img =  '<img src="images/console/signes/module-events.png" style="width:500px;height:40px;">';	
+						$img =  '<img src="images/console/signes/module-events.png">';	
 					}
 				}
 				else{
@@ -1189,12 +1207,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 	if ($link) {
 		echo "<a href=\"$url\">";
 	}
-
+	
-	//for clean link text from bbdd
-	if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') {
-		$text = preg_replace("/<\/*a.*?>/", '', $text);
-	}
-
 	switch ($type) {
 		case BOX_ITEM:
 			if ($width == 0 || $width == 0) {
@@ -1287,12 +1300,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$imgpos = 'float:left';
 				}
 				
-				if ($layoutData['id_metaconsole'] != 0) {
-					$img = "../../" . $img;
-				}
-
 				$varsize = getimagesize($img);
 				
+				
 				if($layoutData['show_statistics'] == 1){
 					
 					if (get_parameter('action') == 'edit') {
@@ -1386,35 +1396,34 @@ function visual_map_print_item($mode = "read", $layoutData,
 				else{
 				
 					if ($width == 0 || $height == 0) {
-
 						if($varsize[0] > 150 || $varsize[1] > 150){
 							echo html_print_image($img, true,
-								array("class" => "image",
+							array("class" => "image",
-								"id" => "image_" . $id,
+							"id" => "image_" . $id,
-								"width" => "70px",
+							"width" => "70px",
-								"height" => "70px",
+							"height" => "70px",
-								"title" => $img_style_title,
+							"title" => $img_style_title,
-								"style" => $borderStyle.$imgpos), false,
+							"style" => $borderStyle.$imgpos), false,
-								false, false, $isExternalLink);
+							false, false, $isExternalLink);
 						}
 						else{
 							echo html_print_image($img, true,
-								array("class" => "image",
+							array("class" => "image",
-								"id" => "image_" . $id,
+							"id" => "image_" . $id,
-								"title" => $img_style_title,
+							"title" => $img_style_title,
-								"style" => $borderStyle.$imgpos), false,
+							"style" => $borderStyle.$imgpos), false,
-								false, false, $isExternalLink);
+							false, false, $isExternalLink);
 						}
 					}
 					else{
-						echo html_print_image($img, true,
+					echo html_print_image($img, true,
-							array("class" => "image",
+						array("class" => "image",
-								"id" => "image_" . $id,
+							"id" => "image_" . $id,
-								"width" => $width,
+							"width" => $width,
-								"height" => $height,
+							"height" => $height,
-								"title" => $img_style_title,
+							"title" => $img_style_title,
-								"style" => $borderStyle.$imgpos), false,
+							"style" => $borderStyle.$imgpos), false,
-								false, false, $isExternalLink);
+							false, false, $isExternalLink);
 					}
 			
 				}
@@ -2755,10 +2764,9 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 		$mapWidth = $layout["width"];
 		$mapHeight = $layout["height"];
 		$backgroundImage = '';
-		if ($layout["background"] != 'None.png' ){
+		if ($layout["background"] != 'None.png' )
 			$backgroundImage = $metaconsole_hack . 'images/console/background/' .
 				$layout["background"];
-		}
 	}
 	
 	if (defined('METACONSOLE')) {
@@ -2853,33 +2861,14 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
  * @return array A list of layouts the user can see.
  */
 function visual_map_get_user_layouts ($id_user = 0, $only_names = false, $filter = false, $returnAllGroup = true) {
-	if (! is_array ($filter)){
+	if (! is_array ($filter))
 		$filter = array ();
-	} else {
+	
-		if(!empty($filter['name'])){
+	if ($returnAllGroup)
-			$where .= "name LIKE '%".io_safe_output($filter['name'])."%'";
-			unset($filter['name']);
-		}
-	}
-		
-	if ($returnAllGroup){
 		$groups = users_get_groups ($id_user, 'VR');
-	} else {
+	else
-		if(!empty($filter['group'])){
+		$groups = users_get_groups ($id_user, 'VR', false);
-			$permissions_group = users_get_groups ($id_user, 'VR', false);
+	
-			if(empty($permissions_group)){
-				$permissions_group = users_get_groups ($id_user, 'VM', false);
-			}
-			$groups = array_intersect_key($filter['group'], $permissions_group);
-			unset($filter['group']);
-		} else {
-			$groups = users_get_groups ($id_user, 'VR', false);
-			if(empty($groups)){
-				$groups = users_get_groups ($id_user, 'VM', false);
-			}
-		}
-	}
-		
 	if (!empty($groups)) {
 		if (empty($where))
 			$where = "";

pandora_console/include/functions_visual_map_editor.php

@@ -220,7 +220,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['enable_link_row']['html'] =
 				'<td align="left" style="">' . __('Enable link') . '</td>
 				<td align="left" style="">' .
-				html_print_checkbox('enable_link', '', 1, true) . '</td>';
+				html_print_checkbox('enable_link', '', !is_metaconsole(), true) . '</td>';
 			
 			
 			$form_items['preview_row'] = array();
@@ -275,7 +275,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['agent_row'] = array();
 			$form_items['agent_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos', 'auto_sla_graph');
+				'simple_value', 'datos', 'auto_sla_graph', 'bars_graph', 'donut_graph');
 			$form_items['agent_row']['html'] = '<td align="left">' .
 				__('Agent') . '</td>';			
 			$params = array();
@@ -308,7 +308,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['module_row'] = array();
 			$form_items['module_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos', 'auto_sla_graph');
+				'simple_value', 'datos', 'auto_sla_graph', 'donut_graph', 'bars_graph');
 			$form_items['module_row']['html'] = '<td align="left">' .
 				__('Module') . '</td>
 				<td align="left">' .
@@ -394,7 +394,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			
 			
 			$form_items['percentile_bar_row_1'] = array();
-			$form_items['percentile_bar_row_1']['items'] = array('percentile_bar', 'percentile_item', 'datos');
+			$form_items['percentile_bar_row_1']['items'] = array('percentile_bar', 'percentile_item', 'datos', 'donut_graph', 'bars_graph');
 			$form_items['percentile_bar_row_1']['html'] = '<td align="left">' .
 				__('Width') . '</td>
 				<td align="left">' . html_print_input_text('width_percentile', 0, '', 3, 5, true) . '</td>';
@@ -573,11 +573,12 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'</td>';
 			
 			$form_items_advance['map_linked_row'] = array();
-			$form_items_advance['map_linked_row']['items'] = array('static_graph', 'label', 'icon');
+			$form_items_advance['map_linked_row']['items'] = array(
+				'group_item', 'static_graph', 'percentile_bar',
+				'percentile_item', 'module_graph', 'simple_value',
+				'icon', 'label', 'datos');
 			$form_items_advance['map_linked_row']['html'] = '<td align="left">'.
-				__('Map linked') . ui_print_help_tip (
+				__('Map linked') . '</td>' .
-					__("If a parent visual console is selected here, an agent or module cannot be selected and will be removed if a previous selection was done."), true) .
-					'</td>' .
 				'<td align="left">' . html_print_select_from_sql (
 				'SELECT id, name
 				FROM tlayout
@@ -692,6 +693,8 @@ function visual_map_editor_print_toolbox() {
 		visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true);
 		visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true);
 		visual_map_print_button_editor('module_graph', __('Module Graph'), 'left', false, 'graph_min', true);
+		visual_map_print_button_editor('donut_graph', __('Donut Graph'), 'left', false, 'donut_graph_min', true);
+		visual_map_print_button_editor('bars_graph', __('Bars Graph'), 'left', false, 'bars_graph_min', true);
 		visual_map_print_button_editor('auto_sla_graph', __('Auto SLA Graph'), 'left', false, 'auto_sla_graph_min', true);
 		visual_map_print_button_editor('simple_value', __('Simple Value'), 'left', false, 'binary_min', true);
 		visual_map_print_button_editor('label', __('Label'), 'left', false, 'label_min', true);
@@ -765,18 +768,4 @@ function visual_map_editor_print_hack_translate_strings() {
 	echo '<span style="display: none" id="hack_translation_incorrect_save">' .
 		__('Could not be save') .'</span>';
 }
-?>
+?>
-
-<script type="text/javascript">
-$(document).ready (function () {
-	$("#map_linked").change(function () {
-		$("#text-agent").val("");
-		$("input[name=id_agent]").val(0);
-		$("#module").empty();
-		$("#module")
-			.append($("<option>")
-				.attr("value", 0)
-				.html("<?php echo __('Any'); ?>"));
-	})
-});
-</script>

pandora_console/include/graphs/fgraph.php

@@ -188,7 +188,7 @@ function vbar_graph($flash_chart, $chart_data, $width, $height,
 	if ($flash_chart) {
 		return flot_vcolumn_chart ($chart_data, $width, $height, $color,
 			$legend, $long_index, $homeurl, $unit, $water_mark_url,
-			$homedir,$font,$font_size, $from_ux, $from_wux);
+			$homedir,$font,$font_size, $from_ux, $from_wux, $backgroundColor);
 	}
 	else {
 		foreach ($chart_data as $key => $value) {
@@ -652,7 +652,7 @@ function hbar_graph($flash_chart, $chart_data, $width, $height,
 	
 	if ($flash_chart) {
 		return flot_hcolumn_chart(
-			$chart_data, $width, $height, $water_mark_url, $font, $font_size);
+			$chart_data, $width, $height, $water_mark_url, $font, $font_size, $backgroundColor);
 	}
 	else {
 		
@@ -784,7 +784,7 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width,
 function ring_graph($flash_chart, $chart_data, $width,
 	$height, $others_str = "other", $homedir="", $water_mark = "",
 	$font = '', $font_size = '', $ttl = 1, $legend_position = false,
-	$colors = '', $hide_labels = false) {
+	$colors = '', $hide_labels = false,$background_color = 'white') {
 	
 	if (empty($chart_data)) {
 		return graph_nodata_image($width, $height, 'pie');
@@ -800,7 +800,7 @@ function ring_graph($flash_chart, $chart_data, $width,
 		return flot_custom_pie_chart ($flash_chart, $chart_data,
 		$width, $height, $colors, $module_name_list, $long_index,
 		$no_data, false, '', $water_mark, $font, $font_size,
-		$unit, $ttl, $homeurl, $background_color, $legend_position);
+		$unit, $ttl, $homeurl, $background_color, $legend_position,$background_color);
 	}
 	else {
 		$total_modules = $chart_data['total_modules'];

pandora_console/include/graphs/flot/pandora.flot.js

@@ -119,7 +119,8 @@ function pandoraFlotPie(graph_id, values, labels, nseries, width, font_size, wat
 
 function pandoraFlotPieCustom(graph_id, values, labels, width,
 			font_size, font, water_mark, separator, legend_position, height,
-				colors,legend) {
+				colors,legend,background_color) {
+										
 	font = font.split("/").pop().split(".").shift();
 	var labels = labels.split(separator);
 	var legend = legend.split(separator);
@@ -211,8 +212,24 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 		$('.legend>table').css('right',($('.legend>div').height()*-1));
 	}
 	//$('.legend>table').css('border',"1px solid #E2E2E2");
-	$('.legend>table').css('background-color',"transparent");
 	
+	if(background_color == 'transparent'){
+		$('.legend>table').css('background-color',"");
+		$('.legend>div').css('background-color',"");
+		$('.legend>table').css('color',"#aaa");
+	}
+	else if (background_color == 'white') {
+		$('.legend>table').css('background-color',"white");
+		$('.legend>table').css('color',"black");
+	}
+	else if (background_color == 'black') {
+		$('.legend>table').css('background-color',"black");
+		$('.legend>table').css('color',"#aaa");
+	}
+	
+	$('.legend').over(function(){
+		return false;
+	});
 	
 	var pielegends = $('#'+graph_id+' .pieLabelBackground');
 	pielegends.each(function () {
@@ -309,7 +326,7 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 }
 
 function pandoraFlotHBars(graph_id, values, labels, water_mark,
-	maxvalue, water_mark, separator, separator2, font, font_size) {
+	maxvalue, water_mark, separator, separator2, font, font_size, background_color) {
 
 	var colors_data = ['#FC4444','#FFA631','#FAD403','#5BB6E5','#F2919D','#80BA27'];
 	values = values.split(separator2);
@@ -355,7 +372,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
 			grid: {
 				hoverable: true,
 				borderWidth: 1,
-				backgroundColor: { colors: ["#FFF", "#FFF"] }
+				backgroundColor: { colors: [background_color, background_color] }
 				},
 			xaxis: {
 				axisLabelUseCanvas: true,
@@ -494,7 +511,7 @@ function showTooltip(x, y, color, contents) {
     }).appendTo("body").fadeIn(200);
 }
 
-function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, water_mark, maxvalue, water_mark, separator, separator2, font, font_size , from_ux, from_wux) {
+function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, water_mark, maxvalue, water_mark, separator, separator2, font, font_size , from_ux, from_wux, background_color) {
 	values = values.split(separator2);
 	legend = legend.split(separator);
 	font = font.split("/").pop().split(".").shift();
@@ -585,7 +602,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 		grid: {
 			hoverable: true,
 			borderWidth: 1,
-			backgroundColor: { colors: ["#FFF", "#FFF"] }
+			backgroundColor: { colors: [background_color, background_color] }
 		}
 	};
 	
@@ -608,16 +625,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 	$('#' + graph_id).VUseTooltip();
 	$('#' + graph_id).css("margin-left","auto");
 	$('#' + graph_id).css("margin-right","auto");
-	//~ $('#' + graph_id).find('div.legend-tooltip').tooltip({ track: true });
+	
-	/*
-		$('#'+graph_id+' .xAxis .tickLabel')
-			.css('transform', 'rotate(-45deg)')
-			.css('max-width','100px')
-			.find('div')
-				.css('position', 'relative')
-				.css('top', '+10px')
-				.css('left', '-30px');
-	*/
 	if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent))
 		$('#'+graph_id+' .xAxis .tickLabel')
 			.find('div')
@@ -638,7 +646,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 			}
 			
 			format.push([i,
-				'<div class="'+font+'" title="'+title+'" style="word-break: normal; transform: rotate(-45deg); position:relative; top:+30px; left:-20px; max-width: 100px;font-size:'+font_size+'pt !important;">'
+				'<div class="'+font+'" title="'+title+'" style="word-break: normal; transform: rotate(-45deg); position:relative; top:+30px; left:0px; max-width: 100px;font-size:'+font_size+'pt !important;">'
 				+ label
 				+ '</div>']);
 		}

pandora_console/include/graphs/functions_flot.php

@@ -666,7 +666,7 @@ function flot_custom_pie_chart ($flash_charts, $graph_values,
 	
 	$return .= "pandoraFlotPieCustom('$graph_id', '$values', '$labels',
 			'$width', $font_size, '$fontpath', $water_mark,
-			'$separator', '$legend_position', '$height', '$colors','$legend')";
+			'$separator', '$legend_position', '$height', '$colors','$legend','$background_color')";
 	
 	$return .= "</script>";
 	
@@ -674,7 +674,7 @@ function flot_custom_pie_chart ($flash_charts, $graph_values,
 }
 
 // Returns a 3D column chart
-function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = '', $font_size = 7) {
+function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = '', $font_size = 7, $background_color = "white") {
 	global $config;
 	
 	include_javascript_dependencies_flot_graph();
@@ -755,7 +755,7 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font =
 	$return .= "<script type='text/javascript'>";
 	
 	$return .= "pandoraFlotHBars('$graph_id', '$values', '$labels',
-		false, $max, '$water_mark', '$separator', '$separator2', '$font', $font_size)";
+		false, $max, '$water_mark', '$separator', '$separator2', '$font', $font_size, '$background_color')";
 
 	$return .= "</script>";
 	
@@ -763,7 +763,7 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font =
 }
 
 // Returns a 3D column chart
-function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark, $homedir, $font, $font_size, $from_ux, $from_wux) {
+function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark, $homedir, $font, $font_size, $from_ux, $from_wux, $background_color = 'white') {
 	global $config;
 	
 	include_javascript_dependencies_flot_graph();
@@ -847,14 +847,14 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
 
 	if ($from_ux) {
 		if($from_wux){
-			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, true)";
+			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, true, '$background_color')";
 		}
 		else{
-			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, false)";
+			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, false, '$background_color')";
 		}
 	}
 	else {
-		$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, false, false)";
+		$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, false, false, '$background_color')";
 	}
 
 	$return .= "</script>";

pandora_console/include/graphs/functions_pchart.php

@@ -754,13 +754,7 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
 	$myPicture->setGraphArea($margin_left, $margin_top, $width - $margin_right, $height - $margin_bottom);
 	
 	$myPicture->drawScale($scaleSettings);
-	/*
+	
-	if (isset($legend)) {
-		/* Write the chart legend 
-		$size = $myPicture->getLegendSize(array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
-		$myPicture->drawLegend($width-$size['Width'],0,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL, "BoxWidth"=>10, "BoxHeight"=>10));
-	}
-	*/
 	/* Turn on shadow computing */ 
 	$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
 	

pandora_console/include/help/en/help_alert_config.php

@@ -58,6 +58,8 @@ Apart from the defined module macros, the following macros are also available:
 <li>_id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_target_ip_ : IP address of the target of the module.</li>
 <li>_target_port_ : Port number of the target of the module.</li>
 <li>_plugin_parameters_ : Plug-in Parameters of the module.</li>

pandora_console/include/help/en/help_alert_macros.php

@@ -54,6 +54,8 @@ Besides the defined module macros, the following macros are available:
 <li>_target_ip_: IP address for the module’s target.</li>
 <li>_target_port_: Port number for the module’s target.</li>
 <li>_plugin_parameters_: Module’s Plugin parameters.</li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_groupcontact_: Group’s contact information. Configured when the group is created.</li>
 <li>_groupcustomid_: Group’s custom ID.</li>
 <li>_groupother_: Other information about the group. Configured when the group is created.</li>

pandora_console/include/help/es/help_alert_config.php

@@ -63,6 +63,8 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_target_ip_ : Dirección IP del objetivo del módulo.</li>
 <li>_target_port_ : Puerto del objetivo del módulo.</li>
 <li>_plugin_parameters_ : Parámetros del Plug-in del módulo.</li>
+<li>_server_ip_ : Ip del servidor al que el agente está asignado. </li>
+<li>_server_name_ : Nombre del servidor al que el agente está asignado. </li>
 <li>_groupcontact_ : Información de contacto del grupo.	Se configura al crear el grupo.</li>
 <li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
 <li>_email_tag_ : Emails asociados a los tags de módulos.</li>

pandora_console/include/help/es/help_alert_macros.php

@@ -54,6 +54,8 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_target_ip_: Dirección IP del objetivo del módulo.</li>
 <li>_target_port_: Puerto del objetivo del módulo.</li>
 <li>_plugin_parameters_: Parámetros del plugin del módulo.</li>
+<li>_server_ip_ : Ip del servidor al que el agente está asignado. </li>
+<li>_server_name_ : Nombre del servidor al que el agente está asignado. </li>
 <li>_groupcontact_: Información de contacto del grupo. Se configura al crear el grupo.</li>
 <li>_groupcustomid_: ID personalizado del grupo.</li>
 <li>_groupother_: Otra información sobre el grupo. Se configura al crear el grupo.</li>

pandora_console/include/help/ja/help_alert_config.php

@@ -62,6 +62,8 @@ email アクションを設定するには、_field1_ (送信先アドレス)、
 <li>_target_ip_ : モジュールの対象IPアドレス</li>
 <li>_target_port_ : モジュールの対象ポート</li>
 <li>_plugin_parameters_ : モジュールのプラグインパラメータ</li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_groupcontact_ : グループコンタクト情報。グループの作成時に設定されます。</li>
 <li>_groupother_ : グループに関するその他情報。グループの作成時に設定されます。</li>
 <li>_email_tag_ : モジュールタグに関連付けられた Email。</li>

pandora_console/include/help/ja/help_alert_macros.php

@@ -54,6 +54,8 @@
 <li>_target_ip_ : モジュールの対象IPアドレス</li>
 <li>_target_port_ : モジュールの対象ポート</li>
 <li>_plugin_parameters_ : モジュールのプラグインパラメータ</li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_groupcontact_ : グループコンタクト情報。グループの作成時に設定されます。</li>
 <li>_groupcustomid_: グループカスタムID</li>
 <li>_groupother_ : グループに関するその他情報。グループの作成時に設定されます。</li>

pandora_console/include/styles/pandora.css

@@ -769,6 +769,12 @@ input.graph_min {
 input.graph_min[disabled] {
 	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;
 }
+input.bars_graph_min {
+	background: #fefefe url(../../images/icono-barras-arriba.png) no-repeat center !important;
+}
+input.bars_graph_min[disabled] {
+	background: #fefefe url(../../images/icono-barras-arriba.disabled.png) no-repeat center !important;
+}
 input.percentile_min {
 	background: #fefefe url(../../images/chart_bar.png) no-repeat center !important;
 }
@@ -787,6 +793,12 @@ input.auto_sla_graph_min {
 input.auto_sla_graph_min[disabled] {
 	background: #fefefe url(../../images/auto_sla_graph.disabled.png) no-repeat center !important;
 }
+input.donut_graph_min {
+	background: #fefefe url(../../images/icono-quesito.png) no-repeat center !important;
+}
+input.donut_graph_min[disabled] {
+	background: #fefefe url(../../images/icono-quesito.disabled.png) no-repeat center !important;
+}
 input.binary_min {
 	background: #fefefe url(../../images/binary.png) no-repeat center !important;
 }
@@ -2399,29 +2411,61 @@ span#plugin_description {
 	font-size: 14pt !important;
 	line-height: 14pt;
 }
+.visual_font_size_18pt, .visual_font_size_18pt > em , .visual_font_size_18pt > strong, .visual_font_size_18pt > strong > span, .visual_font_size_18pt > span, .visual_font_size_18pt > strong > em, .visual_font_size_18pt > em > strong, .visual_font_size_18pt em span, .visual_font_size_18pt span em    {
+	font-size: 18pt !important;
+	line-height: 18pt;
+}
+
 .visual_font_size_24pt, .visual_font_size_24pt > em, .visual_font_size_24pt > strong, .visual_font_size_24pt > strong > span , .visual_font_size_24pt > span, .visual_font_size_24pt > strong > em, .visual_font_size_24pt > em > strong, .visual_font_size_24pt em span, .visual_font_size_24pt span em   {
 	font-size: 24pt !important;
 	line-height: 24pt;
 }
+.visual_font_size_28pt, .visual_font_size_28pt > em, .visual_font_size_28pt > strong, .visual_font_size_28pt > strong > span , .visual_font_size_28pt > span, .visual_font_size_28pt > strong > em, .visual_font_size_28pt > em > strong, .visual_font_size_28pt em span, .visual_font_size_28pt span em   {
+	font-size: 28pt !important;
+	line-height: 28pt;
+}
 .visual_font_size_36pt, .visual_font_size_36pt > em, .visual_font_size_36pt > strong, .visual_font_size_36pt > strong > span, .visual_font_size_36pt > span, .visual_font_size_36pt > strong > em, .visual_font_size_36pt > em > strong, .visual_font_size_36pt em span, .visual_font_size_36pt span em   {
 	font-size: 36pt !important;
 	line-height: 36pt;
 }
+.visual_font_size_48pt, .visual_font_size_48pt > em, .visual_font_size_48pt > strong, .visual_font_size_48pt > strong > span, .visual_font_size_48pt > span, .visual_font_size_48pt > strong > em, .visual_font_size_48pt > em > strong, .visual_font_size_48pt em span, .visual_font_size_48pt span em   {
+	font-size: 48pt !important;
+	line-height: 48pt;
+}
+.visual_font_size_60pt, .visual_font_size_60pt > em, .visual_font_size_60pt > strong, .visual_font_size_60pt > strong > span, .visual_font_size_60pt > span, .visual_font_size_60pt > strong > em, .visual_font_size_60pt > em > strong, .visual_font_size_60pt em span, .visual_font_size_60pt span em   {
+	font-size: 60pt !important;
+	line-height: 60pt;
+}
 .visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span, .visual_font_size_72pt > strong > em, .visual_font_size_72pt > em > strong, .visual_font_size_72pt em span, .visual_font_size_72pt span em   {
 	font-size: 72pt !important;
 	line-height: 72pt;
 }
 
+.visual_font_size_84pt, .visual_font_size_84pt > em, .visual_font_size_84pt > strong, .visual_font_size_84pt > strong > span, .visual_font_size_84pt > span, .visual_font_size_84pt > strong > em, .visual_font_size_84pt > em > strong, .visual_font_size_84pt em span, .visual_font_size_84pt span em   {
+	font-size: 84pt !important;
+	line-height: 84pt;
+}
+
 .visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span, .visual_font_size_96pt > strong > em, .visual_font_size_96pt > em > strong, .visual_font_size_96pt em span, .visual_font_size_96pt span em   {
 	font-size: 96pt !important;
 	line-height: 96pt;
 }
 
+.visual_font_size_116pt, .visual_font_size_116pt > em, .visual_font_size_116pt > strong, .visual_font_size_116pt > strong > span, .visual_font_size_116pt > span, .visual_font_size_116pt > strong > em, .visual_font_size_116pt > em > strong, .visual_font_size_116pt em span, .visual_font_size_116pt span em   {
+	font-size: 116pt !important;
+	line-height: 116pt;
+}
+
 .visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span, .visual_font_size_128pt > strong > em, .visual_font_size_128pt > em > strong, .visual_font_size_128pt em span, .visual_font_size_128pt span em   {
 	font-size: 128pt !important;
 	line-height: 128pt;
 }
 
+.visual_font_size_140pt, .visual_font_size_140pt > em, .visual_font_size_140pt > strong, .visual_font_size_140pt > strong > span, .visual_font_size_140pt > span, .visual_font_size_140pt > strong > em, .visual_font_size_140pt > em > strong, .visual_font_size_140pt em span, .visual_font_size_140pt span em   {
+	font-size: 140pt !important;
+	line-height: 140pt;
+}
+
 .visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span, .visual_font_size_154pt > strong > em, .visual_font_size_154pt > em > strong, .visual_font_size_154pt em span, .visual_font_size_154pt span em   {
 	font-size: 154pt !important;
 	line-height: 154pt;

pandora_console/include/styles/pandora_black.css

@@ -2457,29 +2457,59 @@ span#plugin_description {
 	font-size: 14pt !important;
 	line-height: 14pt; 
 }
+.visual_font_size_18pt, .visual_font_size_18pt > em , .visual_font_size_18pt > strong, .visual_font_size_18pt > strong > span, .visual_font_size_18pt > span, .visual_font_size_18pt > strong > em, .visual_font_size_18pt > em > strong, .visual_font_size_18pt em span, .visual_font_size_18pt span em    {
+	font-size: 18pt !important;
+	line-height: 18pt; 
+}
 .visual_font_size_24pt, .visual_font_size_24pt > em, .visual_font_size_24pt > strong, .visual_font_size_24pt > strong > span , .visual_font_size_24pt > span, .visual_font_size_24pt > strong > em, .visual_font_size_24pt > em > strong, .visual_font_size_24pt em span, .visual_font_size_24pt span em   {
 	font-size: 24pt !important;
 	line-height: 24pt; 
 }
+.visual_font_size_28pt, .visual_font_size_28pt > em, .visual_font_size_28pt > strong, .visual_font_size_28pt > strong > span , .visual_font_size_28pt > span, .visual_font_size_28pt > strong > em, .visual_font_size_28pt > em > strong, .visual_font_size_28pt em span, .visual_font_size_28pt span em   {
+	font-size: 28pt !important;
+	line-height: 28pt; 
+}
 .visual_font_size_36pt, .visual_font_size_36pt > em, .visual_font_size_36pt > strong, .visual_font_size_36pt > strong > span, .visual_font_size_36pt > span, .visual_font_size_36pt > strong > em, .visual_font_size_36pt > em > strong, .visual_font_size_36pt em span, .visual_font_size_36pt span em   {
 	font-size: 36pt !important;
 	line-height: 36pt; 
 }
+.visual_font_size_48pt, .visual_font_size_48pt > em, .visual_font_size_48pt > strong, .visual_font_size_48pt > strong > span, .visual_font_size_48pt > span, .visual_font_size_48pt > strong > em, .visual_font_size_48pt > em > strong, .visual_font_size_48pt em span, .visual_font_size_48pt span em   {
+	font-size: 48pt !important;
+	line-height: 48pt; 
+}
+.visual_font_size_60pt, .visual_font_size_60pt > em, .visual_font_size_60pt > strong, .visual_font_size_60pt > strong > span, .visual_font_size_60pt > span, .visual_font_size_60pt > strong > em, .visual_font_size_60pt > em > strong, .visual_font_size_60pt em span, .visual_font_size_60pt span em   {
+	font-size: 60pt !important;
+	line-height: 60pt; 
+}
 .visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span, .visual_font_size_72pt > strong > em, .visual_font_size_72pt > em > strong, .visual_font_size_72pt em span, .visual_font_size_72pt span em   {
 	font-size: 72pt !important;
 	line-height: 72pt;
 }
+.visual_font_size_84pt, .visual_font_size_84pt > em, .visual_font_size_84pt > strong, .visual_font_size_84pt > strong > span, .visual_font_size_84pt > span, .visual_font_size_84pt > strong > em, .visual_font_size_84pt > em > strong, .visual_font_size_84pt em span, .visual_font_size_84pt span em   {
+	font-size: 84pt !important;
+	line-height: 84pt;
+}
 
 .visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span, .visual_font_size_96pt > strong > em, .visual_font_size_96pt > em > strong, .visual_font_size_96pt em span, .visual_font_size_96pt span em   {
 	font-size: 96pt !important;
 	line-height: 96pt; 
 }
 
+.visual_font_size_116pt, .visual_font_size_116pt > em, .visual_font_size_116pt > strong, .visual_font_size_116pt > strong > span, .visual_font_size_116pt > span, .visual_font_size_116pt > strong > em, .visual_font_size_116pt > em > strong, .visual_font_size_116pt em span, .visual_font_size_116pt span em   {
+	font-size: 116pt !important;
+	line-height: 116pt; 
+}
+
 .visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span, .visual_font_size_128pt > strong > em, .visual_font_size_128pt > em > strong, .visual_font_size_128pt em span, .visual_font_size_128pt span em   {
 	font-size: 128pt !important;
 	line-height: 128pt; 
 }
 
+.visual_font_size_140pt, .visual_font_size_140pt > em, .visual_font_size_140pt > strong, .visual_font_size_140pt > strong > span, .visual_font_size_140pt > span, .visual_font_size_140pt > strong > em, .visual_font_size_140pt > em > strong, .visual_font_size_140pt em span, .visual_font_size_140pt span em   {
+	font-size: 140pt !important;
+	line-height: 140pt;
+}
+
 .visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span, .visual_font_size_154pt > strong > em, .visual_font_size_154pt > em > strong, .visual_font_size_154pt em span, .visual_font_size_154pt span em   {
 	font-size: 154pt !important;
 	line-height: 154pt; 
@@ -2487,7 +2517,7 @@ span#plugin_description {
 
 .visual_font_size_196pt, .visual_font_size_196pt > em, .visual_font_size_196pt > strong, .visual_font_size_196pt > strong > span, .visual_font_size_196pt > span, .visual_font_size_196pt > strong > em, .visual_font_size_196pt > em > strong, .visual_font_size_196pt em span, .visual_font_size_196pt span em   {
 	font-size: 196pt !important;
-	line-height: 196pt; 
+	line-height: 196pt;
 }
 
 

pandora_console/include/styles/pandora_green_old.css

@@ -2435,53 +2435,97 @@ span#plugin_description {
 #tinymce {
 	text-align: left;
 }
+
 .visual_font_size_4pt, .visual_font_size_4pt > em, .visual_font_size_4pt > strong, .visual_font_size_4pt > strong > span, .visual_font_size_4pt > span, .visual_font_size_4pt > strong > em, .visual_font_size_4pt > em > strong, .visual_font_size_4pt em span, .visual_font_size_4pt span em  {
 	font-size: 4pt !important;
 	line-height: 4pt;
 }
+
 .visual_font_size_6pt, .visual_font_size_6pt > em, .visual_font_size_6pt > strong, .visual_font_size_6pt > strong > span, .visual_font_size_6pt > span, .visual_font_size_6pt > strong > em, .visual_font_size_6pt > em > strong, .visual_font_size_6pt em span, .visual_font_size_6pt span em   {
 	font-size: 6pt !important;
 	line-height: 6pt;
 }
+
 .visual_font_size_8pt, .visual_font_size_8pt > em, .visual_font_size_8pt > strong, .visual_font_size_8pt > strong > span , .visual_font_size_8pt > span, .visual_font_size_8pt > strong > em, .visual_font_size_8pt > em > strong, .visual_font_size_8pt em span, .visual_font_size_8pt span em   {
 	font-size: 8pt !important;
 	line-height: 8pt;
 }
+
 .visual_font_size_10pt, .visual_font_size_10pt > em , .visual_font_size_10pt > strong, .visual_font_size_10pt > strong > em, .visual_font_size_10pt > em > strong, .visual_font_size_10pt em span, .visual_font_size_10pt span em   {
 	font-size: 10pt !important;
 	line-height: 10pt;
 }
+
 .visual_font_size_12pt, .visual_font_size_12pt > em , .visual_font_size_12pt > strong, .visual_font_size_12pt > strong > em, .visual_font_size_12pt > em > strong, .visual_font_size_12pt em span, .visual_font_size_12pt span em   {
 	font-size: 12pt !important;
 	line-height: 12pt;
 }
+
 .visual_font_size_14pt, .visual_font_size_14pt > em , .visual_font_size_14pt > strong, .visual_font_size_14pt > strong > span, .visual_font_size_14pt > span, .visual_font_size_14pt > strong > em, .visual_font_size_14pt > em > strong, .visual_font_size_14pt em span, .visual_font_size_14pt span em    {
 	font-size: 14pt !important;
 	line-height: 14pt;
 }
+
+.visual_font_size_18pt, .visual_font_size_18pt > em , .visual_font_size_18pt > strong, .visual_font_size_18pt > strong > span, .visual_font_size_18pt > span, .visual_font_size_18pt > strong > em, .visual_font_size_18pt > em > strong, .visual_font_size_18pt em span, .visual_font_size_18pt span em    {
+	font-size: 18pt !important;
+	line-height: 18pt;
+}
+
 .visual_font_size_24pt, .visual_font_size_24pt > em, .visual_font_size_24pt > strong, .visual_font_size_24pt > strong > span , .visual_font_size_24pt > span, .visual_font_size_24pt > strong > em, .visual_font_size_24pt > em > strong, .visual_font_size_24pt em span, .visual_font_size_24pt span em   {
 	font-size: 24pt !important;
 	line-height: 24pt;
 }
+
+.visual_font_size_28pt, .visual_font_size_28pt > em, .visual_font_size_28pt > strong, .visual_font_size_28pt > strong > span , .visual_font_size_28pt > span, .visual_font_size_28pt > strong > em, .visual_font_size_28pt > em > strong, .visual_font_size_28pt em span, .visual_font_size_28pt span em   {
+	font-size: 28pt !important;
+	line-height: 28pt;
+}
+
 .visual_font_size_36pt, .visual_font_size_36pt > em, .visual_font_size_36pt > strong, .visual_font_size_36pt > strong > span, .visual_font_size_36pt > span, .visual_font_size_36pt > strong > em, .visual_font_size_36pt > em > strong, .visual_font_size_36pt em span, .visual_font_size_36pt span em   {
 	font-size: 36pt !important;
 	line-height: 36pt;
 }
+
+.visual_font_size_48pt, .visual_font_size_48pt > em, .visual_font_size_48pt > strong, .visual_font_size_48pt > strong > span, .visual_font_size_48pt > span, .visual_font_size_48pt > strong > em, .visual_font_size_48pt > em > strong, .visual_font_size_48pt em span, .visual_font_size_48pt span em   {
+	font-size: 48pt !important;
+	line-height: 48pt;
+}
+
+.visual_font_size_60pt, .visual_font_size_60pt > em, .visual_font_size_60pt > strong, .visual_font_size_60pt > strong > span, .visual_font_size_60pt > span, .visual_font_size_60pt > strong > em, .visual_font_size_60pt > em > strong, .visual_font_size_60pt em span, .visual_font_size_60pt span em   {
+	font-size: 60pt !important;
+	line-height: 60pt;
+}
+
 .visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span, .visual_font_size_72pt > strong > em, .visual_font_size_72pt > em > strong, .visual_font_size_72pt em span, .visual_font_size_72pt span em   {
 	font-size: 72pt !important;
 	line-height: 72pt;
 }
 
+.visual_font_size_84pt, .visual_font_size_84pt > em, .visual_font_size_84pt > strong, .visual_font_size_84pt > strong > span, .visual_font_size_84pt > span, .visual_font_size_84pt > strong > em, .visual_font_size_84pt > em > strong, .visual_font_size_84pt em span, .visual_font_size_84pt span em   {
+	font-size: 84pt !important;
+	line-height: 84pt;
+}
+
 .visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span, .visual_font_size_96pt > strong > em, .visual_font_size_96pt > em > strong, .visual_font_size_96pt em span, .visual_font_size_96pt span em   {
 	font-size: 96pt !important;
 	line-height: 96pt; 
 }
 
+.visual_font_size_116pt, .visual_font_size_116pt > em, .visual_font_size_116pt > strong, .visual_font_size_116pt > strong > span, .visual_font_size_116pt > span, .visual_font_size_116pt > strong > em, .visual_font_size_116pt > em > strong, .visual_font_size_116pt em span, .visual_font_size_116pt span em   {
+	font-size: 116pt !important;
+	line-height: 116pt; 
+}
+
 .visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span, .visual_font_size_128pt > strong > em, .visual_font_size_128pt > em > strong, .visual_font_size_128pt em span, .visual_font_size_128pt span em   {
 	font-size: 128pt !important;
 	line-height: 128pt; 
 }
 
+.visual_font_size_140pt, .visual_font_size_140pt > em, .visual_font_size_140pt > strong, .visual_font_size_140pt > strong > span, .visual_font_size_140pt > span, .visual_font_size_140pt > strong > em, .visual_font_size_140pt > em > strong, .visual_font_size_140pt em span, .visual_font_size_140pt span em   {
+	font-size: 140pt !important;
+	line-height: 140pt; 
+}
+
 .visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span, .visual_font_size_154pt > strong > em, .visual_font_size_154pt > em > strong, .visual_font_size_154pt em span, .visual_font_size_154pt span em   {
 	font-size: 154pt !important;
 	line-height: 154pt; 

pandora_console/operation/agentes/graphs.php

@@ -38,8 +38,8 @@ $start_date = get_parameter ("start_date", date("Y-m-d"));
 $draw_events = get_parameter ("draw_events", 0);
 $modules = get_parameter('modules', array());
 $filter = get_parameter('filter', 0);
-$combined = (bool)get_parameter('combined', 1);
+$combined = get_parameter('combined', 1);
-
+$option_type = get_parameter('option_type', 0);
 
 //----------------------------------------------------------------------
 // Get modules of agent sorted as:
@@ -159,7 +159,6 @@ $table->data[0][1] = html_print_select($list_modules, 'modules[]',
 $table->rowspan[2][0] = 7;
 $table->data[2][0] = "";
 
-
 $table->data[2][1] = __('Begin date');
 $table->data[2][2] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 10, 40, true);
 $table->data[2][2] .= html_print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
@@ -174,12 +173,17 @@ $table->data[5][2] = __('Show alerts') .
 	ui_print_help_tip(__('the combined graph does not show the alerts into this graph'), true);
 $table->data[5][3] = html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
 $table->data[6][2] = __('Show as one combined graph');
-$table->data[6][3] = 
+$graph_option_one_or_several = array(0 => __('several graphs for each module'), 1 => __('One combined graph'));
-	html_print_radio_button('combined', 1, __('one combined graph'),
+$table->data[6][3] = html_print_select($graph_option_one_or_several, 'combined', $combined, '', '', 1, true);
-		$combined, true);
+
-$table->data[6][3] .= 
+$table->data[7][2] = __('Chart type');
-	html_print_radio_button('combined', 0, __('several graphs for each module'),
+if ($combined == 1) {
-		$combined, true);
+	$graph_option_type = array(0 => __('Area'), 1 => __('Area stack'), 2 => __('Line'), 3 => __('Line stack'));
+}
+else {
+	$graph_option_type = array(0 => __('Area'), 2 => __('Line'));
+}
+$table->data[7][3] = html_print_select($graph_option_type, 'option_type', $option_type, '', '', 1, true);
 
 $htmlForm = '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=graphs&id_agente=' . $id_agente . '" >';
 $htmlForm .= html_print_table($table, true);
@@ -321,6 +325,39 @@ echo "</div>";
 	
 	// Load graphs
 	$(document).ready(function() {
+		$('#combined').change(function () {
+			if ($('#combined').val() == 1) {
+				$('#option_type').empty();
+				$('#option_type').append($('<option>', {
+					value: 0,
+					text: "<?php echo __('Area'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 1,
+					text: "<?php echo __('Area stack'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 2,
+					text: "<?php echo __('Line'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 3,
+					text: "<?php echo __('Line stack'); ?>"
+				}));
+			}
+			else {
+				$('#option_type').empty();
+				$('#option_type').append($('<option>', {
+					value: 0,
+					text: "<?php echo __('Area'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 2,
+					text: "<?php echo __('Line'); ?>"
+				}));
+			}
+		});
+
 		var getModulesPHP = function () {
 			return <?php echo json_encode($modules); ?>;
 		}
@@ -353,7 +390,7 @@ echo "</div>";
 			});
 		}
 		
-		var requestSparseGraph = function (moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit) {
+		var requestSparseGraph = function (moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit, type_g) {
 			return requestGraph('sparse', {
 				page: 'include/ajax/graph.ajax',
 				print_sparse_graph: 1,
@@ -366,7 +403,8 @@ echo "</div>";
 				show_alerts: showAlerts,
 				avg_only: avgOnly,
 				date: date,
-				unit: unit
+				unit: unit,
+				type_g: type_g
 			});
 		}
 		
@@ -380,15 +418,23 @@ echo "</div>";
 			var $container = $(element);
 			var $errorMessage = $('div#graph-error-message');
 			var period = $container.data('period');
-			var conf_stacked = '<?php echo $config['type_module_charts']; ?>';
+			var conf_stacked = parseInt($("#option_type").val());
+			
 			switch (conf_stacked) {
-				case 'area':
+				case 0:
 					var stacked = 0;
 					break;
-				case 'line':
+				case 1:
+					var stacked = 1;
+					break;
+				case 2:
 					var stacked = 2;
 					break;
+				case 3:
+					var stacked = 3;
+					break;
 			}
+
 			var date = $container.data('date');
 			var height = $container.data('height');
 			
@@ -426,6 +472,16 @@ echo "</div>";
 			var unit = $container.data('unit');
 			var date = $container.data('date');
 			var height = $container.data('height');
+			var conf_stacked = parseInt($("#option_type").val());
+			
+			switch (conf_stacked) {
+				case 0:
+					var type_g = 'area';
+					break;
+				case 2:
+					var type_g = 'line';
+					break;
+			}
 			
 			var width = $container.width() - 20;
 			
@@ -435,8 +491,8 @@ echo "</div>";
 			var handleError = function (xhr, textStatus, errorThrown) {
 				$container.html($errorMessage.html());
 			}
-			
+
-			requestSparseGraph(moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit)
+			requestSparseGraph(moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit, type_g)
 				.done(handleSuccess)
 				.fail(handleError);
 		}

pandora_server/lib/PandoraFMS/Core.pm

@@ -1014,6 +1014,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
 				_id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '',
 				_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',
+				_server_ip_ => (defined ($agent)) ? get_db_value($dbh, "SELECT ip_address FROM tserver WHERE name = ?", $agent->{'server_name'}) : '',
+				_server_name_ => (defined ($agent)) ? $agent->{'server_name'} : '',
 				_target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', 
 				_target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '', 
 				_policy_ => undef,

tests/Dockerfile

@@ -66,6 +66,7 @@ RUN yum install -y \
 	cronie \
 	ntp \
 	wget \
+	nano \
 	curl \
 	xterm \
 	postfix \
@@ -96,5 +97,9 @@ RUN yum install -y \
 	net-snmp-utils \
 	perl-Test-Simple; yum clean all;
 
+RUN wget http://rpmfind.net/linux/centos/6.9/os/i386/Packages/gettext-0.17-18.el6.i686.rpm; \
+	yum localinstall -y gettext-0.17-18.el6.i686.rpm; \
+	rm -rf gettext-0.17-18.el6.i686.rpm;
+
 #Exposing ports for: HTTP, SNMP Traps, Tentacle protocol
 EXPOSE 80 162/udp 41121