';
+ } else {
+ echo '
';
+ }
+ echo html_print_select (array('common' => __('Show common modules'), 'all' => __('Show all modules')), 'modules_selection_mode',
+ 'common', false, '', '', true,false,true,'',false,'min-width:180px;');
+ echo '
';
+
echo '' . __('Available modules:') . ui_print_help_tip (__('Only for type Quiet for downtimes.'), true) . '
'; - if ($type_downtime != 'quiet') + if ($type_downtime != 'quiet'){ echo '';
- else
+ } else {
echo '
"; @@ -904,8 +931,10 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri case 'disable_agents_alerts': case 'disable_agents': $("#available_modules").hide(); + $("#available_modules_selection_mode").hide(); break; case 'quiet': + $("#available_modules_selection_mode").show(); $("#available_modules").show(); break; } diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index 7e2db21c3c..dfafbb7559 100755 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -501,7 +501,7 @@ $table->data['edit3'][1] = html_print_extended_select_for_post_process('post_pro $table->data['edit3'][2] = __('SMNP community'); $table->data['edit3'][3] = html_print_input_text ('snmp_community', '', - '', 10, 15, true); + '', 10, 100, true); $target_ip_values = array(); $target_ip_values['auto'] = __('Auto'); diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 494e95e3f5..276ab4c478 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -212,7 +212,7 @@ You can of course remove the warnings, that's why we include the source and do n */ ui_print_page_header( - __('Massive operations') . ' » '. $options[$option], + __('Bulk operations') . ' » '. $options[$option], "images/gm_massive_operations.png", false, "", true, $onheader,true, "massivemodal"); // Checks if the PHP configuration is correctly diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 38c0f2dfc6..b929a1ec84 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -196,7 +196,7 @@ if (!empty($sub)) { } -if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "PM")) { +if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "RR")) { // Servers $menu_godmode["gservers"]["text"] = __('Servers'); $menu_godmode["gservers"]["sec2"] = "godmode/servers/modificar_server"; diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 0662ff8b0d..00df36a2c7 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -69,6 +69,8 @@ $exception_condition = REPORT_EXCEPTION_CONDITION_EVERYTHING; $exception_condition_value = 10; $modulegroup = 0; $period = SECONDS_1DAY; +$search = ""; +$log_number = 1000; // Added support for projection graphs $period_pg = SECONDS_5DAY; $projection_period = SECONDS_5DAY; @@ -201,9 +203,12 @@ switch ($action) { case 'event_report_log': $period = $item['period']; $description = $item['description']; + $es = json_decode($item['external_source'], true); $id_agents = $es['id_agents']; $source = $es['source']; + $search = $es['search']; + $log_number = empty($es['log_number']) ? $log_number : $es['log_number']; break; case 'simple_graph': $only_avg = isset($style['only_avg']) ? (bool) $style['only_avg'] : true; @@ -705,6 +710,29 @@ You can of course remove the warnings, that's why we include the source and do n +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ";
+ ?>
+
+
+
$value) {
+ $agents2[$value['id_agente']] = $value['alias'];
+ }
+
+ // $agents = agents_get_group_agents($group);
+ if ((empty($agents2)) || $agents2 == -1) $agents = array();
$agents_select = array();
if (is_array($id_agents) || is_object($id_agents)){
foreach ($id_agents as $id) {
- foreach ($agents as $key => $a) {
+ foreach ($agents2 as $key => $a) {
if ($key == (int)$id) {
$agents_select[$key] = $key;
}
}
}
}
- html_print_select($agents, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
+ // html_debug($agents);
+ html_print_select($agents2, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
?>
@@ -2578,6 +2616,8 @@ function chooseType() {
$("#row_agent").hide();
$("#row_module").hide();
$("#row_period").hide();
+ $("#row_search").hide();
+ $("#row_log_number").hide();
$("#row_period1").hide();
$("#row_estimate").hide();
$("#row_interval").hide();
@@ -2675,6 +2715,8 @@ function chooseType() {
$("#log_help_tip").css("visibility", "visible");
$("#row_description").show();
$("#row_period").show();
+ $("#row_search").show();
+ $("#row_log_number").show();
$("#agents_row").show();
$("#row_source").show();
$("#row_historical_db_check").hide();
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index ac6d35d4b4..705f49c2d0 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -925,9 +925,13 @@ switch ($action) {
case 'event_report_log':
$agents_to_report = get_parameter('id_agents2');
$source = get_parameter('source', "");
-
+ $search = get_parameter('search', "");
+ $log_number = get_parameter('log_number', "");
+
$es['source'] = $source;
$es['id_agents'] = $agents_to_report;
+ $es['search']=$search;
+ $es['log_number']=$log_number;
$values['external_source'] = json_encode($es);
$values['period'] = get_parameter('period');
@@ -1281,9 +1285,13 @@ switch ($action) {
case 'event_report_log':
$agents_to_report = get_parameter('id_agents2');
$source = get_parameter('source', "");
-
+ $search = get_parameter('search', "");
+ $log_number = get_parameter('log_number', "");
+
$es['source'] = $source;
$es['id_agents'] = $agents_to_report;
+ $es['search']=$search;
+ $es['log_number']=$log_number;
$values['external_source'] = json_encode($es);
$values['period'] = get_parameter('period');
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 3cea48be21..2c98fb5493 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -15,6 +15,7 @@ var creationItem = null;
var is_opened_palette = false;
var idItem = 0;
var selectedItem = null;
+var selectedItems = null;
var lines = Array();
var user_lines = Array();
var toolbuttonActive = null;
@@ -303,34 +304,64 @@ function update_button_palette_callback() {
alert('Undefined height');
return false;
}
-
+
$("#text_" + idItem).html(values['label']);
- if ((values['width'] == 0) || (values['height'] == 0)) {
- if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
- $("#image_" + idItem).removeAttr('width');
- $("#image_" + idItem).removeAttr('height');
- $("#image_" + idItem).attr('width', 70);
- $("#image_" + idItem).attr('height', 70);
- $("#image_" + idItem).css('width', '70px');
- $("#image_" + idItem).css('height', '70px');
+
+ if(values['show_statistics'] == 1){
+
+
+ if ((values['width'] == 0) || (values['height'] == 0)) {
+ $("#image_" + idItem).removeAttr('width');
+ $("#image_" + idItem).removeAttr('height');
+ $("#image_" + idItem).attr('width', 520);
+ $("#image_" + idItem).attr('height', 80);
+ $("#image_" + idItem).css('width', '520px');
+ $("#image_" + idItem).css('height', '80px');
+ $("#image_" + idItem).attr('src', 'images/console/signes/group_status.png');
+
}
- else{
+ else {
$("#image_" + idItem).removeAttr('width');
$("#image_" + idItem).removeAttr('height');
- $("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
- $("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
- $("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
- $("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');
- }
+ $("#image_" + idItem).attr('width', values['width']);
+ $("#image_" + idItem).attr('height', values['height']);
+ $("#image_" + idItem).css('width', values['width'] + 'px');
+ $("#image_" + idItem).css('height', values['height'] + 'px');
+ $("#image_" + idItem).attr('src', 'images/console/signes/group_status.png');
+ }
+
}
- else {
- $("#image_" + idItem).removeAttr('width');
- $("#image_" + idItem).removeAttr('height');
- $("#image_" + idItem).attr('width', values['width']);
- $("#image_" + idItem).attr('height', values['height']);
- $("#image_" + idItem).css('width', values['width'] + 'px');
- $("#image_" + idItem).css('height', values['height'] + 'px');
+ else{
+
+ if ((values['width'] == 0) || (values['height'] == 0)) {
+ if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+ $("#image_" + idItem).removeAttr('width');
+ $("#image_" + idItem).removeAttr('height');
+ $("#image_" + idItem).attr('width', 70);
+ $("#image_" + idItem).attr('height', 70);
+ $("#image_" + idItem).css('width', '70px');
+ $("#image_" + idItem).css('height', '70px');
+ }
+ else{
+ $("#image_" + idItem).removeAttr('width');
+ $("#image_" + idItem).removeAttr('height');
+ $("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
+ $("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
+ $("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
+ $("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');
+ }
+ }
+ else {
+ $("#image_" + idItem).removeAttr('width');
+ $("#image_" + idItem).removeAttr('height');
+ $("#image_" + idItem).attr('width', values['width']);
+ $("#image_" + idItem).attr('height', values['height']);
+ $("#image_" + idItem).css('width', values['width'] + 'px');
+ $("#image_" + idItem).css('height', values['height'] + 'px');
+ }
+
}
+
break;
case 'percentile_bar':
case 'percentile_item':
@@ -613,6 +644,7 @@ function readFields() {
$("input[name='line_width']").val());
values['line_color'] = $("input[name='line_color']").val();
values['label_position'] = $(".labelpos[sel=yes]").attr('position');
+ values['show_statistics'] = $("input[name=show_statistics]").is(':checked') ? 1 : 0;
if (is_metaconsole()) {
values['metaconsole'] = 1;
@@ -659,7 +691,7 @@ function create_button_palette_callback() {
alert('Undefined height');
validate = false;
}
- if ((values['label'] == '') && (values['image'] == '')) {
+ if ((values['label'] == '') && (values['image'] == '') && (values['show_statistics']) == false) {
alert($("#message_alert_no_label_no_image").html());
validate = false;
}
@@ -1140,6 +1172,17 @@ function loadFieldsFromDB(item) {
}
}
+ if (key == 'show_statistics') {
+ if (val == "1") {
+ $("input[name=show_statistics]")
+ .prop("checked", true);
+ }
+ else {
+ $("input[name=show_statistics]")
+ .prop("checked", false);
+ }
+ }
+
if (key == 'type_graph') {
$("select[name=type_graph]").val(val);
}
@@ -1427,6 +1470,9 @@ function hiddenFields(item) {
$("#enable_link_row").css('display', 'none');
$("#enable_link_row." + item).css('display', '');
+
+ $("#show_statistics_row").css('display', 'none');
+ $("#show_statistics_row." + item).css('display', '');
$("#preview_row").css('display', 'none');
$("#preview_row." + item).css('display', '');
@@ -1621,11 +1667,13 @@ function set_static_graph_status(idElement, image, status) {
data: parameter,
success: function (data) {
set_static_graph_status(idElement, image, data);
- if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
- $('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);
- }
- else{
- $('#'+idElement+ ' img').css('margin-left', parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
+ if(values['show_statistics'] == 1){
+ if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
+ $('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);
+ }
+ else{
+ $('#'+idElement+ ' img').css('margin-left', parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
+ }
}
}
});
@@ -1660,15 +1708,25 @@ function set_static_graph_status(idElement, image, status) {
}
function set_image(type, idElement, image) {
- if (type == "image") {
+
+ if(image == 'show_statistics_bad.png' || image == 'show_statistics_ok.png' || image == 'show_statistics_warning.png' || image == 'show_statistics.png'){
item = "#image_" + idElement;
- img_src = "images/console/icons/" + image;
+ img_src = "images/console/signes/group_status.png";
}
- else if (type == "background") {
- item = "#background_img";
- img_src = "images/console/background/" + image;
+ else{
+
+ if (type == "image") {
+ item = "#image_" + idElement;
+ img_src = "images/console/icons/" + image;
+ }
+ else if (type == "background") {
+ item = "#background_img";
+ img_src = "images/console/background/" + image;
+ }
+
}
-
+
+
var params = [];
params.push("get_image_path=1");
params.push("img_src=" + img_src);
@@ -1682,6 +1740,12 @@ function set_image(type, idElement, image) {
url: get_url_ajax(),
success: function (data) {
$(item).attr('src', data);
+
+ if(image == 'show_statistics_bad.png' || image == 'show_statistics_ok.png' || image == 'show_statistics_warning.png' || image == 'show_statistics.png'){
+ $(item).attr('width', 520);
+ $(item).attr('height', 80);
+ }
+
}
});
}
@@ -2173,21 +2237,28 @@ function createItem(type, values, id_data) {
}
- if ((values['width'] == 0) || (values['height'] == 0)) {
- // Do none
- if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
- $image.attr('width', '70')
- .attr('height', '70');
+ if(values['show_statistics'] != 1){
+
+ if ((values['width'] == 0) || (values['height'] == 0)) {
+ // Do none
+ if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+ $image.attr('width', '70')
+ .attr('height', '70');
+ }
+ else{
+ $image.attr('width', $('#preview > img')[0].naturalWidth)
+ .attr('height', $('#preview > img')[0].naturalHeight);
+ }
+ }
+ else {
+ $image.attr('width', values['width'])
+ .attr('height', values['height']);
+ }
}
- else{
- $image.attr('width', $('#preview > img')[0].naturalWidth)
- .attr('height', $('#preview > img')[0].naturalHeight);
- }
- }
- else {
- $image.attr('width', values['width'])
- .attr('height', values['height']);
- }
+ // else{
+ // $('#image_'+id_data).css('width', values['width']+'px');
+ // $('#image_'+id_data).css('height', values['height']+'px');
+ // }
/*
var $span = $('')
.attr('id', 'text_' + id_data)
@@ -2245,8 +2316,32 @@ function createItem(type, values, id_data) {
.append($image)
.append($input);
}
-
- set_static_graph_status(id_data, values['image']);
+
+ if(values['show_statistics'] != 1){
+ set_static_graph_status(id_data, values['image']);
+ }
+ else{
+ set_static_graph_status(id_data, 'show_statistics');
+ }
+
+ if(values['show_statistics'] != 1){
+
+ if ((values['width'] == 0) || (values['height'] == 0)) {
+ // Do none
+ if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+ $image.attr('width', '70')
+ .attr('height', '70');
+ }
+ else{
+ $image.attr('width', $('#preview > img')[0].naturalWidth)
+ .attr('height', $('#preview > img')[0].naturalHeight);
+ }
+ }
+ else {
+ $image.attr('width', values['width'])
+ .attr('height', values['height']);
+ }
+ }
break;
case 'auto_sla_graph':
@@ -2580,9 +2675,9 @@ function updateDB_visual(type, idElement , values, event, top, left) {
case 'static_graph':
if ((event != 'resizestop') && (event != 'show_grid')
&& (event != 'dragstop')) {
-
- set_static_graph_status(idElement, values['image']);
-
+ if(values['show_statistics'] != 1){
+ set_static_graph_status(idElement, values['image']);
+ }
}
break;
case 'percentile_item':
@@ -2811,6 +2906,9 @@ function updateDB(type, idElement , values, event) {
}
function copyDB(idItem) {
+
+ console.log(idItem);
+
metaconsole = $("input[name='metaconsole']").val();
parameter = Array();
@@ -2931,10 +3029,19 @@ function activeToolboxButton(id, active) {
}
function click_delete_item_callback() {
- activeToolboxButton('edit_item', false);
- deleteDB(idItem);
- idItem = 0;
- selectedItem = null;
+ if(selectedItems == null){
+ activeToolboxButton('edit_item', false);
+ deleteDB(idItem);
+ idItem = 0;
+ selectedItem = null;
+ }
+ else{
+ idItem = 0;
+ selectedItem = null;
+ selectedItems.forEach( function(valor, indice, array) {
+ deleteDB(valor);
+ });
+ }
}
/**
@@ -2953,6 +3060,7 @@ function eventsItems(drag) {
//$(".item").resizable(); //Disable but run in ff and in the waste (aka micro$oft IE) show ungly borders
$('.item').bind('click', function(event, ui) {
+
event.stopPropagation();
if (!is_opened_palette) {
var divParent = $(event.target);
@@ -3070,6 +3178,62 @@ function eventsItems(drag) {
enterprise_click_item_callback(divParent);
}
}
+
+
+
+ if(!event.ctrlKey){
+ firstItem = event.currentTarget.id;
+ selectedItems = null;
+ selectedItems = Array();
+ selectedItems.push(event.currentTarget.id);
+
+ }
+ else{
+
+ selectedItem = null;
+
+ unselectAll();
+
+ if(selectedItems.indexOf(event.currentTarget.id) > -1){
+
+ $('#'+event.currentTarget.id).css('left', '+=1');
+ $('#'+event.currentTarget.id).css('top', '+=1');
+ $('#'+event.currentTarget.id).css('border', '');
+ $('#'+event.currentTarget.id).attr('withborder') == 'false';
+
+
+ selectedItems.splice(selectedItems.indexOf(event.currentTarget.id),1);
+ }
+ else{
+ $('#'+event.currentTarget.id).css('left', '-=1');
+ $('#'+event.currentTarget.id).css('top', '-=1');
+ $('#'+event.currentTarget.id).css('border', '1px dotted rgb(0, 0, 255)');
+ $('#'+event.currentTarget.id).attr('withborder') == 'true';
+
+
+ selectedItems.push(event.currentTarget.id);
+ }
+
+
+ selectedItems.forEach( function(valor, indice, array) {
+ if(selectedItems.indexOf(valor) > -1 && $('#'+valor).css('border') != '1px dotted rgb(0, 0, 255)'){
+ // $('#'+valor).css('left', '-=1');
+ // $('#'+valor).css('top', '-=1');
+ $('#'+valor).css('border', '1px dotted rgb(0, 0, 255)');
+ $('#'+valor).attr('withborder') == 'true';
+ }
+ });
+
+ $('#'+firstItem).css('left', '-=1');
+ $('#'+firstItem).css('top', '-=1');
+
+ firstItem = null;
+
+ }
+
+
+
+
});
//Double click in the item
@@ -3119,8 +3283,9 @@ function eventsItems(drag) {
$(".item").draggable({containment: "#background", grid: drag});
$('.item').bind('dragstart', function(event, ui) {
-
- event.stopPropagation();
+
+ if(selectedItems == null || selectedItems.length < 2){
+ event.stopPropagation();
if (!is_opened_palette) {
unselectAll();
$(event.target).css('border', '1px blue dotted');
@@ -3189,6 +3354,7 @@ function eventsItems(drag) {
break;
default:
idItem = $(event.target).attr('id');
+
break;
}
activeToolboxButton('copy_item', true);
@@ -3196,10 +3362,17 @@ function eventsItems(drag) {
activeToolboxButton('delete_item', true);
}
}
+ }
+ else{
+ console.log('Dragstart');
+
+ multiDragStart(event);
+
+ }
});
$('.item').bind('dragstop', function(event, ui) {
-
+ if(selectedItems == null || selectedItems.length < 2){
event.stopPropagation();
var values = {};
@@ -3207,9 +3380,16 @@ function eventsItems(drag) {
values['mov_top'] = ui.position.top;
updateDB(selectedItem, idItem, values, 'dragstop');
+ }
+ else{
+
+ console.log('Dragstop');
+ multidragStop(event);
+ }
});
$('.item').bind('drag', function(event, ui) {
+ if(selectedItems == null || selectedItems.length < 2){
if ($(event.target).hasClass('handler_start')) {
selectedItem = 'handler_start';
}
@@ -3290,6 +3470,11 @@ function eventsItems(drag) {
draw_user_lines("", 0, 0, 0 , 0, 0, true);
break;
}
+ }
+ else{
+ console.log('Drag');
+
+ }
});
}
@@ -3355,6 +3540,8 @@ function eventsBackground() {
// Event click for background
$("#background").click(function(event) {
+ selectedItems = null;
+ selectedItems = Array();
event.stopPropagation();
if (!is_opened_palette) {
unselectAll();
@@ -3730,4 +3917,50 @@ function showGrid() {
eventsItems();
}
+}
+
+function multiDragStart(event){
+ multiDragMouse(event);
+
+}
+
+function multidragStop(event){
+ $('#background').off("mousemove");
+ values = [];
+ selectedItems.forEach( function(valor, indice, array) {
+ $('#'+valor).css('left','+=1');
+ $('#'+valor).css('top','+=1');
+ classItem = $('#'+valor).attr('class').replace(/item|ui-draggable|ui-draggable-dragging|-dragging/g, '').trim();
+ values['mov_left'] = parseInt($('#'+valor).css('left'));
+ values['mov_top'] = parseInt($('#'+valor).css('top'));
+ updateDB(classItem, valor, values,'dragstop');
+ });
+
+}
+
+
+
+function multiDragMouse(eventDrag){
+ var preX = [];
+ var preY = [];
+
+ selectedItems.forEach( function(valor, indice, array) {
+ preX[indice] = $('#'+valor).css('left');
+ preY[indice] = $('#'+valor).css('top');
+ });
+
+ $('#background').on('mousemove',function(event){
+ var moveDiffX = event.clientX - eventDrag.clientX;
+ var moveDiffY = event.clientY - eventDrag.clientY;
+ selectedItems.forEach( function(valor, indice, array) {
+ if(!(parseInt($('#'+valor).css('left')) < 0 && parseInt(moveDiffX)+parseInt(preX[indice]) < 0) &&
+ !(parseInt($('#'+valor).css('left')) + parseInt($('#'+valor).css('width')) > parseInt($('#background').css('width')) && parseInt(moveDiffX+preX[indice]) > 0)){
+ $('#'+valor).css('left',parseInt(moveDiffX)+parseInt(preX[indice])+'px');
+ }
+ if(!(parseInt($('#'+valor).css('top')) < 0 && parseInt(moveDiffY)+parseInt(preY[indice]) < 0) &&
+ !(parseInt($('#'+valor).css('top')) + parseInt($('#'+valor).css('height')) > parseInt($('#background').css('height')) && parseInt(moveDiffY+preY[indice]) > 0)){
+ $('#'+valor).css('top',parseInt(moveDiffY)+parseInt(preY[indice])+'px');
+ }
+ });
+ });
}
\ No newline at end of file
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 1baaab1cd5..fa997be6e5 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -357,6 +357,7 @@ switch ($activeTab) {
break;
case GROUP_ITEM:
$values['id_group'] = get_parameter('group_' . $id, 0);
+ $values['show_statistics'] = get_parameter('show_statistics', 0);
break;
}
$agentName = get_parameter('agent_' . $id, '');
@@ -410,6 +411,7 @@ switch ($activeTab) {
$width = (int) get_parameter ("width", 0);
$height = (int) get_parameter ("height", 0);
$period = (int) get_parameter ("period", 0);
+ $show_statistics = get_parameter ("show_statistics", 0);
$process_value = (int) get_parameter ("process_value", 0);
$percentileitem_width = (int) get_parameter ("percentileitem_width", 0);
$max_value = (int) get_parameter ("max_value", 0);
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 23a8805570..dc83d2d7f6 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -209,7 +209,7 @@ $table->data[34][0] = __('Allow create planned downtimes in the past') .
$table->data[34][1] = __('Yes').' '.html_print_radio_button ('past_planned_downtimes', 1, '', $config["past_planned_downtimes"], true).' ';
$table->data[34][1] .= __('No').' '.html_print_radio_button ('past_planned_downtimes', 0, '', $config["past_planned_downtimes"], true);
-$table->data[35][0] = __('Limit parameters massive') .
+$table->data[35][0] = __('Limit parameters bulk') .
ui_print_help_tip(__('Your PHP environment is setted with %d max_input_vars. Maybe you must not set this value with upper values.', ini_get("max_input_vars")), true);
$table->data[35][1] = html_print_input_text('limit_parameters_massive',
$config['limit_parameters_massive'], '', 10, 10, true);
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 2e18f50669..a8ff68d74c 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -577,7 +577,7 @@ $row++;
$dirItems = scandir($config['homedir'] . '/images/custom_logo');
foreach ($dirItems as $entryDir) {
- if (strstr($entryDir, '.jpg') !== false) {
+ if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) {
$customLogos['images/custom_logo/' . $entryDir] = $entryDir;
}
}
@@ -600,7 +600,7 @@ $table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts,
$table_other->data['custom_report_front-logo'][0] = __('Custom report front') . ' - ' .
__('Custom logo') .
ui_print_help_tip(
- __("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG) in upload tool in console."), true);
+ __("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
$table_other->data['custom_report_front-logo'][1] = html_print_select(
$customLogos,
'custom_report_front_logo',
diff --git a/pandora_console/images/console/signes/group_status.png b/pandora_console/images/console/signes/group_status.png
new file mode 100644
index 0000000000..bd3f76a5f3
Binary files /dev/null and b/pandora_console/images/console/signes/group_status.png differ
diff --git a/pandora_console/images/minireloj-16.png b/pandora_console/images/minireloj-16.png
new file mode 100644
index 0000000000..b78bb2e5aa
Binary files /dev/null and b/pandora_console/images/minireloj-16.png differ
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index d97d51264f..c78c4d8adf 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -275,12 +275,16 @@ if ($get_module_detail) {
// Detect string data with \n and convert to
's $datos = $row[$attr[0]]; - // Because this *SHIT* of print_table monster, I cannot format properly this cells - // so, eat this, motherfucker :)) - $datos = preg_replace("/\n/", "", $datos); + $datos = preg_replace ('//', '>', $datos); + $datos = preg_replace ('/\n/i','
',$datos); + $datos = preg_replace ('/\s/i',' ',$datos); + $datos_format = ")
';
- $data[1] = ui_print_os_icon ($agent["id_os"], true, true).' ('.$agent["os_version"].')';
+ $data[1] = ui_print_os_icon ($agent["id_os"], true, true);
+ if (!empty($agent["os_version"])) $data[1] .= ' ('.$agent["os_version"].')';
$table_details->data[] = $data;
$data = array();
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 10433ef91a..0ef5e1d9d3 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3794,7 +3794,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$unit_name, $show_alerts, $avg_only = 0,
$date = 0, $series_suffix = '', $series_suffix_str = '', $show_unknown = false,
$fullscale = false) {
-
+
global $config;
global $chart;
global $color;
@@ -3851,13 +3851,70 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
if ($fullscale) {
// Get module data
- $data = db_get_all_rows_filter ('tagente_datos',
- array ('id_agente_modulo' => $agent_module_id,
+ $events = db_get_all_rows_filter('tevento',
+ array ('id_agentmodule' => $agent_module_id,
"utimestamp > $datelimit",
"utimestamp < $date",
'order' => 'utimestamp ASC'),
- array ('datos', 'utimestamp'), 'AND', true);
+ array ('evento', 'utimestamp', 'event_type', 'id_evento'));
+ $table = "tagente_datos";
+ $module_type_str = modules_get_type_name ($agent_module_id);
+ if (strstr ($module_type_str, 'string') !== false) {
+ $table = "tagente_datos_string";
+ }
+
+ $query = " SELECT utimestamp, datos FROM $table ";
+ $query .= " WHERE id_agente_modulo=$agent_module_id ";
+ $query .= " ORDER BY utimestamp ASC LIMIT 1";
+
+ $ret = db_get_all_rows_sql( $query , true);
+
+ $first_data = $ret[0]['utimestamp'];
+ /*
+ // Get the last event after inverval to know if graph start on unknown
+ $prev_event = db_get_row_filter ('tevento',
+ array ('id_agentmodule' => $agent_module_id,
+ "utimestamp <= $datelimit",
+ 'order' => 'utimestamp DESC'));
+ if (isset($prev_event['event_type']) && $prev_event['event_type'] == 'going_unknown') {
+ $start_unknown = true;
+ }
+ */
+ if ($events === false) {
+ $events = array ();
+ }
+
+ $data_uncompress = db_uncompress_module_data($agent_module_id, $datelimit, $date);
+
+ $i = 0;
+ $data = array();
+ if(is_array($data_uncompress)){
+ foreach ($data_uncompress as $value) {
+ foreach ($value['data'] as $key => $value) {
+ $data[$i]['datos'] = $value['datos'];
+ if(empty($value['datos'])){
+ if($value['utimestamp'] < $first_data){
+ $data[$i]['unknown'] = 0;
+ $data[$i]['not_init'] = 1;
+ $data[$i]['utimestamp'] = $value['utimestamp'];
+ }
+ else{
+ $data[$i]['not_init'] = 0;
+ $data[$i]['unknown'] = 1;
+ $data[$i]['utimestamp'] = $value['utimestamp'];
+ }
+ }
+ else{
+ $data[$i]['not_init'] = 0;
+ $data[$i]['unknown'] = 0;
+ }
+ $data[$i]['utimestamp'] = $value['utimestamp'];
+ $i++;
+ }
+ }
+ }
+
if (count($data) > $resolution) {
$resolution = count($data); //Number of points of the graph
$interval = (int) ($period / $resolution);
@@ -3937,26 +3994,6 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
$max_value = 0;
-
- if ($fullscale) {
- $data2 = array();
- $previus_datas_cont = -1;
- $k = 0;
- for ($i = 0; $i <= $resolution; $i++) {
- $timestamp = $datelimit + ($interval * $i);
-
- if ($timestamp < $data[0]['utimestamp']) {
- $previus_datas_cont++;
- $data2[$k]['utimestamp'] = $timestamp;
- $data2[$k]['datos'] = 0;
- $k++;
- }
- }
- html_debug($data2);
- html_debug($data);
- $data = array_merge($data2, $data);
- $resolution += $previus_datas_cont;
- }
// Calculate chart data
$last_known = $previous_data;
@@ -3970,7 +4007,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$zero = 0;
$total = 0;
$count = 0;
-
+ $is_unknown = false;
// Read data that falls in the current interval
while (isset ($data[$j]) &&
$data[$j]['utimestamp'] >= $timestamp &&
@@ -3984,6 +4021,10 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
$last_known = $data[$j]['datos'];
+
+ if ($show_unknown && $data[$j]['unknown']){
+ $is_unknown = true;
+ }
$j++;
}
@@ -3996,7 +4037,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$event_value = 0;
$alert_value = 0;
$unknown_value = 0;
- $is_unknown = false;
+
// Is the first point of a unknown interval
$first_unknown = false;
@@ -4026,7 +4067,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
$k++;
}
-
+
// In some cases, can be marked as known because a recovery event
// was found in same interval. For this cases first_unknown is
// checked too
@@ -4046,7 +4087,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
elseif ($period < SECONDS_1MONTH) {
$time_format = 'M d H\h';
- }
+ }
else {
$time_format = 'M d H\h';
}
@@ -4107,7 +4148,6 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
if (!isset($chart[$timestamp]['unknown'.$series_suffix])) {
$chart[$timestamp]['unknown'.$series_suffix] = 0;
}
-
$chart[$timestamp]['unknown'.$series_suffix] = $unknown_value;
$series_type['unknown'.$series_suffix] = 'area';
}
diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php
index 7c11505ed3..f0cf25587e 100755
--- a/pandora_console/include/functions_io.php
+++ b/pandora_console/include/functions_io.php
@@ -102,14 +102,15 @@ function io_safe_input($value) {
// Replace ( for the html entitie
$valueHtmlEncode = str_replace(')', ")", $valueHtmlEncode);
- $valueHtmlEncode = str_replace(')', ")", $valueHtmlEncode);
-
// Fixed the º character, because the Perl in the Pandora Server
// use the hex value instead the human readble.
// TICKET: #1495
$valueHtmlEncode = str_replace('º', "º", $valueHtmlEncode);
+ // Fixed the ° character.
+ // TICKET: 1223
+ $valueHtmlEncode = str_replace('°', "°", $valueHtmlEncode);
//Replace some characteres for html entities
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index c775ef0329..de5389ebd2 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1447,7 +1447,7 @@ function networkmap_open_graph ($layout, $nooverlap, $pure, $zoom,
$head .= "size=\"$size\";";
$head .= "\n";
-
+
return $head;
}
@@ -1808,6 +1808,26 @@ function networkmap_get_new_nodes_from_ip_mask($ip_mask,
return $agents;
}
+function modules_get_all_interfaces($id_agent) {
+ $return = array();
+
+ $modules = db_get_all_rows_filter('tagente_modulo',
+ array('id_agente' => $id_agent));
+
+ if (empty($modules))
+ $modules = array();
+
+ foreach ($modules as $module) {
+ if (preg_match ("/(.+)_ifOperStatus$/" , (string)$module['nombre'], $matches)) {
+ if ($matches[1]) {
+ $return[] = $module;
+ }
+ }
+ }
+
+ return $return;
+}
+
?>
";
diff --git a/pandora_console/include/help/clippy/homepage.php b/pandora_console/include/help/clippy/homepage.php
index 8ba7ac2f57..be52096875 100644
--- a/pandora_console/include/help/clippy/homepage.php
+++ b/pandora_console/include/help/clippy/homepage.php
@@ -55,12 +55,12 @@ function clippy_start_page_homepage() {
$return_tours['tours']['homepage']['steps'][] = array(
'element'=> '#clippy',
'intro' =>
- '
';
+ }
+
echo html_print_select (array(), "module[]", '', '', '', 0, false, true, true, '', false, 'width: 180px;');
echo "
";
echo ""; @@ -904,8 +931,10 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri case 'disable_agents_alerts': case 'disable_agents': $("#available_modules").hide(); + $("#available_modules_selection_mode").hide(); break; case 'quiet': + $("#available_modules_selection_mode").show(); $("#available_modules").show(); break; } diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index 7e2db21c3c..dfafbb7559 100755 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -501,7 +501,7 @@ $table->data['edit3'][1] = html_print_extended_select_for_post_process('post_pro $table->data['edit3'][2] = __('SMNP community'); $table->data['edit3'][3] = html_print_input_text ('snmp_community', '', - '', 10, 15, true); + '', 10, 100, true); $target_ip_values = array(); $target_ip_values['auto'] = __('Auto'); diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 494e95e3f5..276ab4c478 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -212,7 +212,7 @@ You can of course remove the warnings, that's why we include the source and do n */ ui_print_page_header( - __('Massive operations') . ' » '. $options[$option], + __('Bulk operations') . ' » '. $options[$option], "images/gm_massive_operations.png", false, "", true, $onheader,true, "massivemodal"); // Checks if the PHP configuration is correctly diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 38c0f2dfc6..b929a1ec84 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -196,7 +196,7 @@ if (!empty($sub)) { } -if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "PM")) { +if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "RR")) { // Servers $menu_godmode["gservers"]["text"] = __('Servers'); $menu_godmode["gservers"]["sec2"] = "godmode/servers/modificar_server"; diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 0662ff8b0d..00df36a2c7 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -69,6 +69,8 @@ $exception_condition = REPORT_EXCEPTION_CONDITION_EVERYTHING; $exception_condition_value = 10; $modulegroup = 0; $period = SECONDS_1DAY; +$search = ""; +$log_number = 1000; // Added support for projection graphs $period_pg = SECONDS_5DAY; $projection_period = SECONDS_5DAY; @@ -201,9 +203,12 @@ switch ($action) { case 'event_report_log': $period = $item['period']; $description = $item['description']; + $es = json_decode($item['external_source'], true); $id_agents = $es['id_agents']; $source = $es['source']; + $search = $es['search']; + $log_number = empty($es['log_number']) ? $log_number : $es['log_number']; break; case 'simple_graph': $only_avg = isset($style['only_avg']) ? (bool) $style['only_avg'] : true; @@ -705,6 +710,29 @@ You can of course remove the warnings, that's why we include the source and do n +
's $datos = $row[$attr[0]]; - // Because this *SHIT* of print_table monster, I cannot format properly this cells - // so, eat this, motherfucker :)) - $datos = preg_replace("/\n/", "", $datos); + $datos = preg_replace ('//', '>', $datos); + $datos = preg_replace ('/\n/i','
',$datos); + $datos = preg_replace ('/\s/i',' ',$datos); + $datos_format = "
";
+ $datos_format .= $datos;
+ $datos_format .= "
";
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
- $data[] = $datos;
+ $data[] = $datos_format;
}
elseif ($is_web_content_string) {
//Fixed the goliat sends the strings from web
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 6f2bae0b40..e854a31c49 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -132,6 +132,7 @@ $get_element_status = get_parameter('get_element_status', 0);
$enable_link = get_parameter('enable_link', 1);
$type_graph = get_parameter('type_graph', 'area');
$label_position = get_parameter('label_position', 'down');
+$show_statistics = get_parameter('show_statistics', 0);
switch ($action) {
case 'get_font':
@@ -569,6 +570,9 @@ switch ($action) {
if ($height !== null) {
$values['height'] = $height;
}
+ if ($show_statistics !== null) {
+ $values['show_statistics'] = $show_statistics;
+ }
break;
case 'module_graph':
if ($height_module_graph !== null) {
@@ -640,6 +644,7 @@ switch ($action) {
switch ($type) {
case 'group_item':
unset($values['id_group']);
+ unset($values['show_statistics']);
break;
case 'module_graph':
unset($values['image']);
@@ -948,6 +953,7 @@ switch ($action) {
$values['width'] = $width;
$values['height'] = $height;
$values['id_group'] = $id_group;
+ $values['show_statistics'] = $show_statistics;
breaK;
case 'simple_value':
//This allows min, max and avg process in a simple value
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c58d86b343..cbcd7ec774 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC170907';
+$build_version = 'PC170919';
$pandora_version = 'v7.0NG.712';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index f59032071f..c5830bfbfa 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1806,7 +1806,18 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
else {
$id_group = (int) $id_group;
}
-
+
+ $three_eyes_crow_groups = db_get_all_rows_sql("SELECT tperfil.*, tusuario_perfil.id_perfil FROM tperfil, tusuario_perfil WHERE tusuario_perfil.id_usuario = '" .
+ $id_user . "' AND tusuario_perfil.id_grupo = 0 AND tusuario_perfil.id_perfil = tperfil.id_perfil");
+ if ($three_eyes_crow_groups && !empty($three_eyes_crow_groups)) {
+ $acl_column = get_acl_column($access);
+ foreach ($three_eyes_crow_groups as $three_eyes_crow_group) {
+ if (isset($three_eyes_crow_group[$acl_column])) {
+ return 1;
+ }
+ }
+ }
+
$parents_id = array($id_group);
if ($id_group != 0 && $onlyOneGroup !== true) {
$group = db_get_row_filter('tgrupo', array('id_grupo' => $id_group));
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 260596649b..838fb58d55 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -853,11 +853,13 @@ function agents_get_group_agents ($id_group = 0, $search = false,
//No added search. Show both disabled and non-disabled
}
else if (is_array ($search)) {
- $filter['disabled'] = 0;
- if (isset ($search["disabled"])) {
- $filter['disabled'] = (int) $search["disabled"];
-
- unset ($search["disabled"]);
+ if (!$search['all_agents']) {
+ $filter['disabled'] = 0;
+ if (isset ($search["disabled"])) {
+ $filter['disabled'] = (int) $search["disabled"];
+
+ unset ($search["disabled"]);
+ }
}
if (isset ($search["string"])) {
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index bba8cb1cc3..5ecac3a944 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -9941,7 +9941,14 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
$other['data'][0]
:
SECONDS_1HOUR; // 1 hour by default
-
+
+ $graph_threshold =
+ (!empty($other) && isset($other['data'][2]))
+ ?
+ $other['data'][2]
+ :
+ 0;
+
if (is_nan($graph_seconds) || $graph_seconds <= 0) {
// returnError('error_module_graph', __(''));
return;
@@ -9952,41 +9959,44 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
$id_module, $graph_seconds, false, 600, 300, '',
'', false, false, true, time(), '', 0, 0, true, true,
ui_get_full_url(false) . '/', 1, false, '', false, true,
- true, 'white', null, false, false, $config['type_module_charts']);
+ true, 'white', null, false, false, $config['type_module_charts'],
+ false, false);
- $graph_image_file_encoded = false;
+ $graph_image_file_encoded = false;
if (preg_match("/'.
+ '
'.
__('Hi, can I help you?') . '
' . __('Let me introduce my self: I am Pandorin, the annoying assistant of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') . '
' . '
' . - '
' . __('Let me introduce my self: I am Pandorin, the annoying assistant of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') . '
' . '
' . - '
' .
+ '
' .
html_print_checkbox_extended
('clippy_is_annoying', 1, $clippy_is_annoying, false,
'set_clippy_annoying()', '', true) .
diff --git a/pandora_console/include/help/en/help_profile.php b/pandora_console/include/help/en/help_profile.php
index 58327eb36a..1222af8668 100644
--- a/pandora_console/include/help/en/help_profile.php
+++ b/pandora_console/include/help/en/help_profile.php
@@ -51,7 +51,7 @@
Group Management PM
Creating inventory modules PM
Module Management (includes all suboptions) PM
- Massive Management Operations AW
+ Bulk Management Operations AW
Creating agents AW
Duplicating remote configurations AW
Downtime Management AW
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 86ab6bd914..0aec15c35d 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -1589,8 +1589,14 @@ function show_menu(item, data) {
name: interface_link_add,
icon: "interface_link_children",
disabled : function() {
+ console.log(data);
if (enterprise_installed) {
- return false;
+ if (data.type == 3) {
+ return true;
+ }
+ else {
+ return false;
+ }
}
else {
return true;
@@ -1657,7 +1663,12 @@ function show_menu(item, data) {
icon: "interface_link_parent",
disabled : function() {
if (enterprise_installed) {
- return false;
+ if (data.type == 3) {
+ return true;
+ }
+ else {
+ return false;
+ }
}
else {
return true;
@@ -1681,7 +1692,12 @@ function show_menu(item, data) {
icon: "interface_link_cancel",
disabled : function() {
if (enterprise_installed) {
- return false;
+ if (data.type == 3) {
+ return true;
+ }
+ else {
+ return false;
+ }
}
else {
return true;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index c2aede5f8c..905f57d35a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4139,6 +4139,8 @@ div#main_help_new_content {
padding-top: 10px;
background: white;
height: 100%;
+ font-size: 12pt;
+ font-family: 'lato-bolder';
}
div#main_help_new_content h1 {
@@ -4150,6 +4152,15 @@ div#main_help_new_content p {
font-family: 'lato-bolder';
font-size: 12pt;
}
+div#main_help_new_content b {
+ font-family: 'lato-bolder';
+ font-size: 12pt;
+}
+
+div#main_help_new_content li {
+ font-family: 'lato-bolder';
+ font-size: 12pt;
+}
div#footer_help{
background: #333;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 981b6223fa..3dca8bdbf9 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -2951,6 +2951,10 @@ table#policy_modules td * {
border-top-right-radius: 2px;
}
+.clippy_body {
+ color: black;
+}
+
#dialog-double_auth-container {
width: 100%;
text-align: center;
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b803306db9..6acecb6d2e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
getRequest('agent_id', '0');
$width = $system->getRequest('width', '400');
graph_graphic_agentevents(
- $this->id, $width, 30, SECONDS_1DAY, ui_get_full_url(false));
+ $agent_id, $width, 30, SECONDS_1DAY, ui_get_full_url(false));
exit;
}
}
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 23b5dabed8..111abffeee 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -601,7 +601,7 @@ $data[0][0] .=
' .
__('Events (24h)') .
'
' . + '
' . graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true, true) . '
[] []', 'Create a new tag');
help_screen_line('--add_tag_to_user_profile', ' ', 'Add a tag to the given user profile');
help_screen_line('--add_tag_to_module', ' ', 'Add a tag to the given module');
+
+ print "\nVISUAL CONSOLES\n\n" unless $param ne '';
+ help_screen_line('--create_visual_console', ' [] [] []', 'Create a new visual console');
+ help_screen_line('--edit_visual_console', ' [] [] [] [] [] [] [] [] []', 'Edit a visual console');
+ help_screen_line('--delete_visual_console', '', 'Delete a visual console');
+ help_screen_line('--delete_visual_console_objects', ' ', 'Delete a visual console elements');
+ help_screen_line('--duplicate_visual_console', ' []', 'Duplicate a visual console');
+ help_screen_line('--export_json_visual_console', ' []', 'Creates a json with the visual console elements information');
+
print "\n";
exit;
@@ -4753,6 +4763,784 @@ sub cli_delete_special_day() {
exist_check($result,'special day',$special_day);
}
+##############################################################################
+# Creates a new visual console.
+# Related option: --create_visual_console
+##############################################################################
+
+sub cli_create_visual_console() {
+ my ($name,$background,$width,$height,$group,$mode,$element_square_positions,$background_color,$elements) = @ARGV[2..10];
+
+ if($name eq '') {
+ print_log "[ERROR] Name field cannot be empty.\n\n";
+ exit 1;
+ }
+ elsif ($background eq '') {
+ print_log "[ERROR] Background field cannot be empty.\n\n";
+ exit 1;
+ }
+ elsif (($width eq '') || ($height eq '')) {
+ print_log "[ERROR] Please specify size.\n\n";
+ exit 1;
+ }
+ elsif ($group eq '') {
+ print_log "[ERROR] Group field cannot be empty.\n\n";
+ exit 1;
+ }
+ elsif ($mode eq '') {
+ print_log "[ERROR] Mode parameter must be 'static_objects' or 'auto_creation'.\n\n";
+ exit 1;
+ }
+
+ if ($background_color eq '') {
+ $background_color = '#FFF';
+ }
+
+ print_log "[INFO] Creating visual console '$name' \n\n";
+
+ my $vc_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout (name, id_group, background, width, height, background_color)
+ VALUES (?, ?, ?, ?, ?, ?)', safe_input($name), $group, $background, $width, $height, $background_color);
+
+ print_log "[INFO] The visual console id is '$vc_id' \n\n";
+
+ if ($elements ne '') {
+ my $elements_in_array = decode_json($elements);
+
+ if ($mode eq 'static_objects') {
+ my $elem_count = 1;
+
+ foreach my $elem (@$elements_in_array) {
+ my $pos_x = $elem->{'pos_x'};
+ my $pos_y = $elem->{'pos_y'};
+ my $width = $elem->{'width'};
+ my $height = $elem->{'height'};
+ my $label = $elem->{'label'};
+ my $image = $elem->{'image'};
+ my $type = $elem->{'type'};
+ my $period = $elem->{'period'};
+ my $id_agente_modulo = $elem->{'id_agente_modulo'};
+ my $id_agent = $elem->{'id_agent'};
+ my $id_layout_linked = $elem->{'id_layout_linked'};
+ my $parent_item = $elem->{'parent_item'};
+ my $enable_link = $elem->{'enable_link'};
+ my $id_metaconsole = $elem->{'id_metaconsole'};
+ my $id_group = $elem->{'id_group'};
+ my $id_custom_graph = $elem->{'id_custom_graph'};
+ my $border_width = $elem->{'border_width'};
+ my $type_graph = $elem->{'type_graph'};
+ my $label_position = $elem->{'label_position'};
+ my $border_color = $elem->{'border_color'};
+ my $fill_color = $elem->{'fill_color'};
+
+ my $elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $vc_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+ print_log "[INFO] The element id in position $elem_count is '$elem_id' \n\n";
+
+ $elem_count++;
+ }
+ }
+ elsif ($mode eq 'auto_creation') {
+ if ($element_square_positions eq '') {
+ print_log "[ERROR] With this mode, square positions is obligatory'.\n\n";
+ exit 1;
+ }
+ else {
+ my $positions = decode_json($element_square_positions);
+
+ my $pos1X = $positions->{'pos1x'};
+ my $pos1Y = $positions->{'pos1y'};
+ my $pos2X = $positions->{'pos2x'};
+ my $pos2Y = $positions->{'pos2y'};
+
+ my $number_of_elements = scalar(@$elements_in_array);
+
+ my $x_divider = 4;
+ my $y_divider = 1;
+
+ for (my $i = 1; $i <= 1000; $i++) {
+ if (($i * 4) < $number_of_elements) {
+ $y_divider++;
+ }
+ else {
+ last;
+ }
+ }
+
+ my $elem_width = ($pos2X - $pos1X) / $x_divider;
+ my $elem_height = ($pos2Y - $pos1Y) / $y_divider;
+
+ if ($number_of_elements < 4) {
+ $elem_height = ($pos2Y - $pos1Y) / 3;
+ }
+
+ my $elem_count = 1;
+ my $pos_helper_x = 0;
+ my $pos_helper_y = 0;
+ foreach my $elem (@$elements_in_array) {
+ my $pos_x = $pos_helper_x * $elem_width;
+ my $pos_y = $pos_helper_y * $elem_height;
+ my $width = $elem_width;
+ my $height = $elem_height;
+ my $label = $elem->{'label'};
+ my $image = $elem->{'image'};
+ my $type = $elem->{'type'};
+ my $period = $elem->{'period'};
+ my $id_agente_modulo = $elem->{'id_agente_modulo'};
+ my $id_agent = $elem->{'id_agent'};
+ my $id_layout_linked = $elem->{'id_layout_linked'};
+ my $parent_item = $elem->{'parent_item'};
+ my $enable_link = $elem->{'enable_link'};
+ my $id_metaconsole = $elem->{'id_metaconsole'};
+ my $id_group = $elem->{'id_group'};
+ my $id_custom_graph = $elem->{'id_custom_graph'};
+ my $border_width = $elem->{'border_width'};
+ my $type_graph = $elem->{'type_graph'};
+ my $label_position = $elem->{'label_position'};
+ my $border_color = $elem->{'border_color'};
+ my $fill_color = $elem->{'fill_color'};
+
+ my $elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $vc_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+ print_log "[INFO] The element id in position $elem_count is '$elem_id' \n\n";
+
+ $elem_count++;
+
+ if ($pos_helper_x == 3) {
+ $pos_helper_x = 0;
+ $pos_helper_y++;
+ }
+ else {
+ $pos_helper_x++;
+ }
+ }
+ }
+ }
+ else {
+ print_log "[ERROR] Mode parameter must be 'static_objects' or 'auto_creation'.\n\n";
+ exit 1;
+ }
+ }
+}
+
+##############################################################################
+# Edit a visual console.
+# Related option: --edit_visual_console
+##############################################################################
+
+sub cli_edit_visual_console() {
+ my ($id,$name,$background,$width,$height,$group,$mode,$element_square_positions,$background_color,$elements) = @ARGV[2..11];
+
+ if($id eq '') {
+ print_log "[ERROR] ID field cannot be empty.\n\n";
+ exit 1;
+ }
+
+ my $console = get_db_single_row ($dbh, "SELECT *
+ FROM tlayout
+ WHERE id = $id");
+
+ my $new_name = $console->{'name'};
+ my $new_background = $console->{'background'};
+ my $new_console_width = $console->{'width'};
+ my $new_console_height = $console->{'height'};
+ my $new_console_id_group = $console->{'id_group'};
+ my $new_background_color = $console->{'background_color'};
+
+ if($name ne '') {
+ $new_name = $name;
+ }
+ if ($background ne '') {
+ $new_background = $background;
+ }
+ if ($width ne '') {
+ $new_console_width = $width;
+ }
+ if ($height ne '') {
+ $new_console_height = $height;
+ }
+ if ($group ne '') {
+ $new_console_id_group = $group;
+ }
+ if ($background_color ne '') {
+ $new_background_color = $background_color;
+ }
+
+ print_log "[INFO] The visual console with id $id is updated \n\n";
+
+ db_update ($dbh, "UPDATE tlayout SET name = '" . $new_name . "', background = '" . $new_background . "', width = " . $new_console_width . ", height = " . $new_console_height . ", id_group = " . $new_console_id_group . ", background_color = '" . $new_background_color . "' WHERE id = " . $id);
+
+ if ($elements ne '') {
+ my $elements_in_array = decode_json($elements);
+
+ if ($mode eq 'static_objects') {
+ foreach my $elem (@$elements_in_array) {
+ if (defined($elem->{'id'})) {
+
+ print_log "[INFO] Edit element with id " . $elem->{'id'} . " \n\n";
+
+ my $element_in_db = get_db_single_row ($dbh, "SELECT *
+ FROM tlayout_data
+ WHERE id = " . $elem->{'id'});
+
+ my $new_pos_x = $element_in_db->{'pos_x'};
+ my $new_pos_y = $element_in_db->{'pos_y'};
+ my $new_width = $element_in_db->{'width'};
+ my $new_height = $element_in_db->{'height'};
+ my $new_label = $element_in_db->{'label'};
+ my $new_image = $element_in_db->{'image'};
+ my $new_type = $element_in_db->{'type'};
+ my $new_period = $element_in_db->{'period'};
+ my $new_id_agente_modulo = $element_in_db->{'id_agente_modulo'};
+ my $new_id_agent = $element_in_db->{'id_agent'};
+ my $new_id_layout_linked = $element_in_db->{'id_layout_linked'};
+ my $new_parent_item = $element_in_db->{'parent_item'};
+ my $new_enable_link = $element_in_db->{'enable_link'};
+ my $new_id_metaconsole = $element_in_db->{'id_metaconsole'};
+ my $new_id_group = $element_in_db->{'id_group'};
+ my $new_id_custom_graph = $element_in_db->{'id_custom_graph'};
+ my $new_border_width = $element_in_db->{'border_width'};
+ my $new_type_graph = $element_in_db->{'type_graph'};
+ my $new_label_position = $element_in_db->{'label_position'};
+ my $new_border_color = $element_in_db->{'border_color'};
+ my $new_fill_color = $element_in_db->{'fill_color'};
+
+ if(defined($elem->{'pos_x'})) {
+ $new_pos_x = $elem->{'pos_x'};
+ }
+ if(defined($elem->{'pos_y'})) {
+ $new_pos_y = $elem->{'pos_y'};
+ }
+ if(defined($elem->{'width'})) {
+ $new_width = $elem->{'width'};
+ }
+ if(defined($elem->{'height'})) {
+ $new_height = $elem->{'height'};
+ }
+ if(defined($elem->{'label'})) {
+ $new_label = $elem->{'label'};
+ }
+ if(defined($elem->{'image'})) {
+ $new_image = $elem->{'image'};
+ }
+ if(defined($elem->{'type'})) {
+ $new_type = $elem->{'type'};
+ }
+ if(defined($elem->{'period'})) {
+ $new_period = $elem->{'period'};
+ }
+ if(defined($elem->{'id_agente_modulo'})) {
+ $new_id_agente_modulo = $elem->{'id_agente_modulo'};
+ }
+ if(defined($elem->{'id_agent'})) {
+ $new_id_agent = $elem->{'id_agent'};
+ }
+ if(defined($elem->{'id_layout_linked'})) {
+ $new_id_layout_linked = $elem->{'id_layout_linked'};
+ }
+ if(defined($elem->{'parent_item'})) {
+ $new_parent_item = $elem->{'parent_item'};
+ }
+ if(defined($elem->{'enable_link'})) {
+ $new_enable_link = $elem->{'enable_link'};
+ }
+ if(defined($elem->{'id_metaconsole'})) {
+ $new_id_metaconsole = $elem->{'id_metaconsole'};
+ }
+ if(defined($elem->{'id_group'})) {
+ $new_id_group = $elem->{'id_group'};
+ }
+ if(defined($elem->{'id_custom_graph'})) {
+ $new_id_custom_graph = $elem->{'id_custom_graph'};
+ }
+ if(defined($elem->{'border_width'})) {
+ $new_border_width = $elem->{'border_width'};
+ }
+ if(defined($elem->{'type_graph'})) {
+ $new_type_graph = $elem->{'type_graph'};
+ }
+ if(defined($elem->{'label_position'})) {
+ $new_label_position = $elem->{'label_position'};
+ }
+ if(defined($elem->{'border_color'})) {
+ $new_border_color = $elem->{'border_color'};
+ }
+ if(defined($elem->{'fill_color'})) {
+ $new_fill_color = $elem->{'fill_color'};
+ }
+
+ db_update ($dbh, "UPDATE tlayout_data SET pos_x = " . $new_pos_x . ", pos_y = " . $new_pos_y . ", width = " . $new_width .
+ ", height = " . $new_height . ", label = '" . $new_label . "', image = '" . $new_image .
+ "', type = " . $new_type . ", period = " . $new_period . ", id_agente_modulo = " . $new_id_agente_modulo .
+ ", id_agent = " . $new_id_agent . ", id_layout_linked = " . $new_id_layout_linked . ", parent_item = " . $new_parent_item .
+ ", enable_link = " . $new_enable_link . ", id_metaconsole = " . $new_id_metaconsole . ", id_group = " . $new_id_group .
+ ", id_custom_graph = " . $new_id_custom_graph . ", border_width = " . $new_border_width . ", type_graph = '" . $new_type_graph .
+ "', label_position = '" . $new_label_position . "', border_color = '" . $new_border_color . "', fill_color = '" . $new_fill_color .
+ "' WHERE id = " . $elem->{'id'});
+
+ print_log "[INFO] Element with id " . $elem->{'id'} . " has been updated \n\n";
+ }
+ else {
+ my $pos_x = $elem->{'pos_x'};
+ my $pos_y = $elem->{'pos_y'};
+ my $width = $elem->{'width'};
+ my $height = $elem->{'height'};
+ my $label = $elem->{'label'};
+ my $image = $elem->{'image'};
+ my $type = $elem->{'type'};
+ my $period = $elem->{'period'};
+ my $id_agente_modulo = $elem->{'id_agente_modulo'};
+ my $id_agent = $elem->{'id_agent'};
+ my $id_layout_linked = $elem->{'id_layout_linked'};
+ my $parent_item = $elem->{'parent_item'};
+ my $enable_link = $elem->{'enable_link'};
+ my $id_metaconsole = $elem->{'id_metaconsole'};
+ my $id_group = $elem->{'id_group'};
+ my $id_custom_graph = $elem->{'id_custom_graph'};
+ my $border_width = $elem->{'border_width'};
+ my $type_graph = $elem->{'type_graph'};
+ my $label_position = $elem->{'label_position'};
+ my $border_color = $elem->{'border_color'};
+ my $fill_color = $elem->{'fill_color'};
+
+ my $new_elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+ print_log "[INFO] New element with id $new_elem_id has been created \n\n";
+ }
+ }
+ }
+ elsif ($mode eq 'auto_creation') {
+ if ($element_square_positions eq '') {
+ print_log "[ERROR] With this mode, square positions is obligatory'.\n\n";
+ exit 1;
+ }
+ else {
+ foreach my $elem (@$elements_in_array) {
+ if (defined($elem->{'id'})) {
+ print_log "[INFO] Edit element with id " . $elem->{'id'} . " \n\n";
+
+ my $element_in_db = get_db_single_row ($dbh, "SELECT *
+ FROM tlayout_data
+ WHERE id = " . $elem->{'id'});
+
+ my $new_pos_x = $element_in_db->{'pos_x'};
+ my $new_pos_y = $element_in_db->{'pos_y'};
+ my $new_width = $element_in_db->{'width'};
+ my $new_height = $element_in_db->{'height'};
+ my $new_label = $element_in_db->{'label'};
+ my $new_image = $element_in_db->{'image'};
+ my $new_type = $element_in_db->{'type'};
+ my $new_period = $element_in_db->{'period'};
+ my $new_id_agente_modulo = $element_in_db->{'id_agente_modulo'};
+ my $new_id_agent = $element_in_db->{'id_agent'};
+ my $new_id_layout_linked = $element_in_db->{'id_layout_linked'};
+ my $new_parent_item = $element_in_db->{'parent_item'};
+ my $new_enable_link = $element_in_db->{'enable_link'};
+ my $new_id_metaconsole = $element_in_db->{'id_metaconsole'};
+ my $new_id_group = $element_in_db->{'id_group'};
+ my $new_id_custom_graph = $element_in_db->{'id_custom_graph'};
+ my $new_border_width = $element_in_db->{'border_width'};
+ my $new_type_graph = $element_in_db->{'type_graph'};
+ my $new_label_position = $element_in_db->{'label_position'};
+ my $new_border_color = $element_in_db->{'border_color'};
+ my $new_fill_color = $element_in_db->{'fill_color'};
+
+ if(defined($elem->{'width'})) {
+ $new_width = $elem->{'width'};
+ }
+ if(defined($elem->{'height'})) {
+ $new_height = $elem->{'height'};
+ }
+ if(defined($elem->{'label'})) {
+ $new_label = $elem->{'label'};
+ }
+ if(defined($elem->{'image'})) {
+ $new_image = $elem->{'image'};
+ }
+ if(defined($elem->{'type'})) {
+ $new_type = $elem->{'type'};
+ }
+ if(defined($elem->{'period'})) {
+ $new_period = $elem->{'period'};
+ }
+ if(defined($elem->{'id_agente_modulo'})) {
+ $new_id_agente_modulo = $elem->{'id_agente_modulo'};
+ }
+ if(defined($elem->{'id_agent'})) {
+ $new_id_agent = $elem->{'id_agent'};
+ }
+ if(defined($elem->{'id_layout_linked'})) {
+ $new_id_layout_linked = $elem->{'id_layout_linked'};
+ }
+ if(defined($elem->{'parent_item'})) {
+ $new_parent_item = $elem->{'parent_item'};
+ }
+ if(defined($elem->{'enable_link'})) {
+ $new_enable_link = $elem->{'enable_link'};
+ }
+ if(defined($elem->{'id_metaconsole'})) {
+ $new_id_metaconsole = $elem->{'id_metaconsole'};
+ }
+ if(defined($elem->{'id_group'})) {
+ $new_id_group = $elem->{'id_group'};
+ }
+ if(defined($elem->{'id_custom_graph'})) {
+ $new_id_custom_graph = $elem->{'id_custom_graph'};
+ }
+ if(defined($elem->{'border_width'})) {
+ $new_border_width = $elem->{'border_width'};
+ }
+ if(defined($elem->{'type_graph'})) {
+ $new_type_graph = $elem->{'type_graph'};
+ }
+ if(defined($elem->{'label_position'})) {
+ $new_label_position = $elem->{'label_position'};
+ }
+ if(defined($elem->{'border_color'})) {
+ $new_border_color = $elem->{'border_color'};
+ }
+ if(defined($elem->{'fill_color'})) {
+ $new_fill_color = $elem->{'fill_color'};
+ }
+
+ db_update ($dbh, "UPDATE tlayout_data SET pos_x = " . $new_pos_x . ", pos_y = " . $new_pos_y . ", width = " . $new_width .
+ ", height = " . $new_height . ", label = '" . $new_label . "', image = '" . $new_image .
+ "', type = " . $new_type . ", period = " . $new_period . ", id_agente_modulo = " . $new_id_agente_modulo .
+ ", id_agent = " . $new_id_agent . ", id_layout_linked = " . $new_id_layout_linked . ", parent_item = " . $new_parent_item .
+ ", enable_link = " . $new_enable_link . ", id_metaconsole = " . $new_id_metaconsole . ", id_group = " . $new_id_group .
+ ", id_custom_graph = " . $new_id_custom_graph . ", border_width = " . $new_border_width . ", type_graph = '" . $new_type_graph .
+ "', label_position = '" . $new_label_position . "', border_color = '" . $new_border_color . "', fill_color = '" . $new_fill_color .
+ "' WHERE id = " . $elem->{'id'});
+
+ print_log "[INFO] Element with id " . $elem->{'id'} . " has been updated \n\n";
+ }
+ else {
+ my $pos_x = 0;
+ my $pos_y = 0;
+ my $width = $elem->{'width'};
+ my $height = $elem->{'height'};
+ my $label = $elem->{'label'};
+ my $image = $elem->{'image'};
+ my $type = $elem->{'type'};
+ my $period = $elem->{'period'};
+ my $id_agente_modulo = $elem->{'id_agente_modulo'};
+ my $id_agent = $elem->{'id_agent'};
+ my $id_layout_linked = $elem->{'id_layout_linked'};
+ my $parent_item = $elem->{'parent_item'};
+ my $enable_link = $elem->{'enable_link'};
+ my $id_metaconsole = $elem->{'id_metaconsole'};
+ my $id_group = $elem->{'id_group'};
+ my $id_custom_graph = $elem->{'id_custom_graph'};
+ my $border_width = $elem->{'border_width'};
+ my $type_graph = $elem->{'type_graph'};
+ my $label_position = $elem->{'label_position'};
+ my $border_color = $elem->{'border_color'};
+ my $fill_color = $elem->{'fill_color'};
+
+ my $new_elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+ print_log "[INFO] New element with id $new_elem_id has been created \n\n";
+ }
+ }
+
+ my $positions = decode_json($element_square_positions);
+
+ my $pos1X = $positions->{'pos1x'};
+ my $pos1Y = $positions->{'pos1y'};
+ my $pos2X = $positions->{'pos2x'};
+ my $pos2Y = $positions->{'pos2y'};
+
+ my @console_elements = get_db_rows ($dbh, "SELECT *
+ FROM tlayout_data
+ WHERE id_layout = $id");
+
+ my $number_of_elements = scalar(@console_elements);
+
+ my $x_divider = 4;
+ my $y_divider = 1;
+
+ for (my $i = 1; $i <= 1000; $i++) {
+ if (($i * 4) < $number_of_elements) {
+ $y_divider++;
+ }
+ else {
+ last;
+ }
+ }
+
+ my $elem_width = ($pos2X - $pos1X) / $x_divider;
+ my $elem_height = ($pos2Y - $pos1Y) / $y_divider;
+
+ if ($number_of_elements < 4) {
+ $elem_height = ($pos2Y - $pos1Y) / 3;
+ }
+
+ my $elem_count = 1;
+ my $pos_helper_x = 0;
+ my $pos_helper_y = 0;
+ foreach my $elem (@console_elements) {
+ my $new_pos_x = $pos_helper_x * $elem_width;
+ my $new_pos_y = $pos_helper_y * $elem_height;
+ my $new_elem_width = $elem_width;
+ my $new_elem_height = $elem_height;
+
+ db_update ($dbh, "UPDATE tlayout_data SET pos_x = " . $new_pos_x . ", pos_y = " . $new_pos_y .
+ ", width = " . $new_elem_width . ", height = " . $new_elem_height .
+ " WHERE id = " . $elem->{'id'});
+
+ print_log "[INFO] Recolocate element with id " . $elem->{'id'} . " \n\n";
+
+ $elem_count++;
+
+ if ($pos_helper_x == 3) {
+ $pos_helper_x = 0;
+ $pos_helper_y++;
+ }
+ else {
+ $pos_helper_x++;
+ }
+ }
+ }
+ }
+ else {
+ print_log "[ERROR] Mode parameter must be 'static_objects' or 'auto_creation'.\n\n";
+ exit 1;
+ }
+ }
+}
+
+##############################################################################
+# Delete a visual console.
+# Related option: --delete_visual_console
+##############################################################################
+
+sub cli_delete_visual_console() {
+ my ($id) = @ARGV[2];
+
+ if($id eq '') {
+ print_log "[ERROR] ID field cannot be empty.\n\n";
+ exit 1;
+ }
+
+ print_log "[INFO] Delete visual console with ID '$id' \n\n";
+
+ my $delete_layout = db_do($dbh, 'DELETE FROM tlayout WHERE id = ?', $id);
+
+ if ($delete_layout eq 1) {
+ db_do($dbh, 'DELETE FROM tlayout_data WHERE id_layout = ?', $id);
+
+ print_log "[INFO] Delete visual console elements with console ID '$id' \n\n";
+ }
+ else {
+ print_log "[ERROR] Error at remove the visual console.\n\n";
+ exit 1;
+ }
+}
+
+##############################################################################
+# Delete a visual console objects.
+# Related option: --delete_visual_console_objects
+##############################################################################
+
+sub cli_delete_visual_console_objects() {
+ my ($id_console,$mode,$id_mode) = @ARGV[2..4];
+
+ if($id_console eq '') {
+ print_log "[ERROR] Console ID field cannot be empty.\n\n";
+ exit 1;
+ }
+ elsif ($mode eq '') {
+ print_log "[ERROR] Mode field cannot be empty.\n\n";
+ exit 1;
+ }
+ elsif ($id_mode eq '') {
+ print_log "[ERROR] Mode index field cannot be empty.\n\n";
+ exit 1;
+ }
+
+ if (($mode eq 'type') || ($mode eq 'image') || ($mode eq 'id_agent') ||
+ ($mode eq 'id_agente_modulo') || ($mode eq 'id_group') || ($mode eq 'type_graph')) {
+ print_log "[INFO] Removind objects with mode '$mode' and id '$id_mode' \n\n";
+
+ db_do($dbh, 'DELETE FROM tlayout_data WHERE id_layout = ' . $id_console . ' AND ' . $mode . ' = "' . $id_mode . '"');
+ }
+ else {
+ print_log "[ERROR] Mode is not correct.\n\n";
+ exit 1;
+ }
+}
+
+##############################################################################
+# Duplicate a visual console.
+# Related option: --duplicate_visual_console
+##############################################################################
+
+sub cli_duplicate_visual_console () {
+ my ($id_console,$prefix) = @ARGV[2..3];
+
+ if($id_console eq '') {
+ print_log "[ERROR] Console ID field cannot be empty.\n\n";
+ exit 1;
+ }
+
+ my $console = get_db_single_row ($dbh, "SELECT *
+ FROM tlayout
+ WHERE id = $id_console");
+
+ my $name_to_compare = $console->{'name'};
+ my $new_name = $console->{'name'} . "_1";
+ my $name_count = 2;
+
+ if ($prefix ne '') {
+ $new_name = $prefix;
+ $name_to_compare = $prefix;
+ $name_count = 1;
+ }
+
+ my $exist = 1;
+ while ($exist == 1) {
+ my $name_in_db = get_db_single_row ($dbh, "SELECT name FROM tlayout WHERE name = '$new_name'");
+
+ if (defined($name_in_db->{'name'}) && ($name_in_db->{'name'} eq $new_name)) {
+ $new_name = $name_to_compare . "_" . $name_count;
+ $name_count++;
+ }
+ else {
+ $exist = 0;
+ }
+ }
+
+ my $new_console_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout (name, id_group, background, width, height, background_color)
+ VALUES (?, ?, ?, ?, ?, ?)', $new_name, $console->{'id_group'}, $console->{'background'}, $console->{'width'}, $console->{'height'}, $console->{'background_color'});
+
+ print_log "[INFO] The new visual console '$new_name' has been created. The new ID is '$new_console_id' \n\n";
+
+ my @console_elements = get_db_rows ($dbh, "SELECT *
+ FROM tlayout_data
+ WHERE id_layout = $id_console");
+
+ foreach my $element (@console_elements) {
+ my $pos_x = $element->{'pos_x'};
+ my $pos_y = $element->{'pos_y'};
+ my $width = $element->{'width'};
+ my $height = $element->{'height'};
+ my $label = $element->{'label'};
+ my $image = $element->{'image'};
+ my $type = $element->{'type'};
+ my $period = $element->{'period'};
+ my $id_agente_modulo = $element->{'id_agente_modulo'};
+ my $id_agent = $element->{'id_agent'};
+ my $id_layout_linked = $element->{'id_layout_linked'};
+ my $parent_item = $element->{'parent_item'};
+ my $enable_link = $element->{'enable_link'};
+ my $id_metaconsole = $element->{'id_metaconsole'};
+ my $id_group = $element->{'id_group'};
+ my $id_custom_graph = $element->{'id_custom_graph'};
+ my $border_width = $element->{'border_width'};
+ my $type_graph = $element->{'type_graph'};
+ my $label_position = $element->{'label_position'};
+ my $border_color = $element->{'border_color'};
+ my $fill_color = $element->{'fill_color'};
+
+ my $element_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $new_console_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+ print_log "[INFO] Element with ID " . $element->{"id"} . " has been duplicated to the new console \n\n";
+ }
+}
+
+##############################################################################
+# Export a visual console elements to json.
+# Related option: --export_json_visual_console
+##############################################################################
+
+sub cli_export_visual_console() {
+ my ($id,$path) = @ARGV[2..3];
+
+ if($id eq '') {
+ print_log "[ERROR] ID field cannot be empty.\n\n";
+ exit 1;
+ }
+
+ print_log "[INFO] Exporting visual console elements with ID '$id' \n\n";
+
+ my @console_elements = get_db_rows ($dbh, "SELECT *
+ FROM tlayout_data
+ WHERE id_layout = $id");
+
+ my $data_to_json = '[';
+ my $first = 1;
+
+ foreach my $element (@console_elements) {
+ my $pos_x = $element->{'pos_x'};
+ my $pos_y = $element->{'pos_y'};
+ my $width = $element->{'width'};
+ my $height = $element->{'height'};
+ my $label = $element->{'label'};
+ my $image = $element->{'image'};
+ my $type = $element->{'type'};
+ my $period = $element->{'period'};
+ my $id_agente_modulo = $element->{'id_agente_modulo'};
+ my $id_agent = $element->{'id_agent'};
+ my $id_layout_linked = $element->{'id_layout_linked'};
+ my $parent_item = $element->{'parent_item'};
+ my $enable_link = $element->{'enable_link'};
+ my $id_metaconsole = $element->{'id_metaconsole'};
+ my $id_group = $element->{'id_group'};
+ my $id_custom_graph = $element->{'id_custom_graph'};
+ my $border_width = $element->{'border_width'};
+ my $type_graph = $element->{'type_graph'};
+ my $label_position = $element->{'label_position'};
+ my $border_color = $element->{'border_color'};
+ my $fill_color = $element->{'fill_color'};
+
+ if ($first == 0) {
+ $data_to_json .= ','
+ }
+ else {
+ $first = 0;
+ }
+
+ $data_to_json .= '{"image":"' . $image . '"';
+ $data_to_json .= ',"pos_y":' . $pos_y;
+ $data_to_json .= ',"pos_x":' . $pos_x;
+ $data_to_json .= ',"width":' . $width;
+ $data_to_json .= ',"height":' . $height;
+ $data_to_json .= ',"label":"' . $label . '"';
+ $data_to_json .= ',"type":' . $type;
+ $data_to_json .= ',"period":' . $period;
+ $data_to_json .= ',"id_agente_modulo":' . $id_agente_modulo;
+ $data_to_json .= ',"id_agent":' . $id_agent;
+ $data_to_json .= ',"id_layout_linked":' . $id_layout_linked;
+ $data_to_json .= ',"parent_item":' . $parent_item;
+ $data_to_json .= ',"enable_link":' . $enable_link;
+ $data_to_json .= ',"id_metaconsole":' . $id_metaconsole;
+ $data_to_json .= ',"id_group":' . $id_group;
+ $data_to_json .= ',"id_custom_graph":' . $id_custom_graph;
+ $data_to_json .= ',"border_width":' . $border_width;
+ $data_to_json .= ',"type_graph":"' . $type_graph . '"';
+ $data_to_json .= ',"label_position":"' . $label_position . '"';
+ $data_to_json .= ',"border_color":"' . $border_color . '"';
+ $data_to_json .= ',"fill_color":"' . $fill_color . '"';
+ $data_to_json .= '}';
+ }
+
+ $data_to_json .= ']';
+
+ if ($path eq '') {
+ open(FicheroJSON, ">console_" . $id . "_elements");
+ }
+ else {
+ open(FicheroJSON, ">" . $path . "/console_" . $id . "_elements");
+ }
+
+ print FicheroJSON $data_to_json;
+
+ print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n";
+}
###############################################################################
###############################################################################
@@ -5183,7 +5971,31 @@ sub pandora_manage_main ($$$) {
elsif ($param eq '--locate_agent') {
param_check($ltotal, 1);
cli_locate_agent();
- }
+ }
+ elsif ($param eq '--create_visual_console') {
+ param_check($ltotal, 9, 3);
+ cli_create_visual_console();
+ }
+ elsif ($param eq '--edit_visual_console') {
+ param_check($ltotal, 10, 9);
+ cli_edit_visual_console();
+ }
+ elsif ($param eq '--delete_visual_console') {
+ param_check($ltotal, 1);
+ cli_delete_visual_console();
+ }
+ elsif ($param eq '--delete_visual_console_objects') {
+ param_check($ltotal, 3);
+ cli_delete_visual_console_objects();
+ }
+ elsif ($param eq '--duplicate_visual_console') {
+ param_check($ltotal, 2, 1);
+ cli_duplicate_visual_console();
+ }
+ elsif ($param eq '--export_json_visual_console') {
+ param_check($ltotal, 2, 1);
+ cli_export_visual_console();
+ }
else {
print_log "[ERROR] Invalid option '$param'.\n\n";
$param = '';
' . + '
' . graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true, true) . '