From 440adc41091df995c3c392ca87d72159ee7d564c Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 15 Nov 2023 13:07:06 +0100 Subject: [PATCH 1/4] #12453 Fixed interval 2 --- .../reporting_builder.item_editor.php | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index bb06d3a800..592f4e5fb3 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -6685,6 +6685,7 @@ function loadLogAgents() { params["get_agent_source"] = 1; params["log_alert"] = 1; params["page"] = "enterprise/include/ajax/log_viewer.ajax"; + params["date"] = ''; jQuery.ajax({ data: params, @@ -7904,8 +7905,10 @@ function source_change_agents() { $("#id_agents3 option").attr("style","display:none"); var params = {}; - params["get_agent_source"] = 1; + params["get_agents_by_source"] = 1; params["page"] = "enterprise/include/ajax/log_viewer.ajax"; + params["date"] = ''; + params["sources"] = JSON.stringify(source); jQuery.ajax({ data: params, @@ -7914,19 +7917,8 @@ function source_change_agents() { url: "ajax.php", async: true, success: function(data) { - let source_array = []; - $.each(data['source'],function(key,value) { - if (value === source) { - const split = key.split('-'); - source_array.push(split[1]); - } - }); - - $.each(data['agent'],function(key,value) { - const result = source_array.includes(key); - if (result === true) { - $(`#id_agents3 option[value*='${key}']`).attr("style","display:"); - } + $.each(data,function(key,value) { + $(`#id_agents3 option[value*='${value}']`).attr("style","display:"); }); $("#spinner_hack").hide(); From 6059f4dea0140fa66ed747f5de67140253fe5b58 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 15 Nov 2023 13:10:19 +0100 Subject: [PATCH 2/4] #12453 Changed string --- pandora_console/operation/agentes/log_sources_status.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php index 26f0c4490a..1c67cf2eba 100644 --- a/pandora_console/operation/agentes/log_sources_status.php +++ b/pandora_console/operation/agentes/log_sources_status.php @@ -96,7 +96,7 @@ if (!empty($table->data)) { // Create controlled toggle content. ui_toggle( $html_content, - __('Log sources status'), + __('Log sources status (last 24h)'), 'log_sources_status', !$log_sources_defined, false, From 7219471ff847aa14195c9985aa5ed048ec5aac73 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 15 Nov 2023 16:10:00 +0100 Subject: [PATCH 3/4] #12453 Fixed interval 3 --- .../reporting_builder.item_editor.php | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 592f4e5fb3..8b68ea3036 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1589,7 +1589,7 @@ if (is_metaconsole() === true) { + + + + + + + + '; - + params["date"] = $('#period_select').val(); jQuery.ajax({ data: params, dataType: "json", @@ -6726,10 +6758,10 @@ function chooseType() { $("#row_period_range").hide(); $("#row_agent").hide(); $("#row_module").hide(); - $("#row_period").hide(); $("#row_search").hide(); $("#row_log_number").hide(); $("#row_period1").hide(); + $("#row_period2").hide(); $("#row_estimate").hide(); $("#row_interval").hide(); $("#row_custom_graph").hide(); @@ -6896,7 +6928,7 @@ function chooseType() { case 'event_report_log': $("#log_help_tip").css("visibility", "visible"); $("#row_description").show(); - $("#row_period").show(); + $("#row_period2").show(); $("#row_search").show(); $("#row_log_number").show(); $("#agents_row").show(); @@ -6910,7 +6942,7 @@ function chooseType() { case 'event_report_log_table': $("#log_help_tip").css("visibility", "visible"); $("#row_description").show(); - $("#row_period").show(); + $("#row_period2").show(); $("#row_period_range").show(); $("#row_search").show(); $("#row_log_number").show(); From de905b2e95bacb0d7be1835e88b4dc04c9707372 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 16 Nov 2023 12:47:33 +0100 Subject: [PATCH 4/4] #12453 Fixed interval 4 --- .../reporting/reporting_builder.item_editor.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 8b68ea3036..c461aba626 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -6726,9 +6726,9 @@ function loadLogAgents() { url: "ajax.php", async: true, success: function(data) { - $('#id_agents3') - .find('option') - .remove(); + $('#id_agents3').find('option').remove(); + $('#source option[value!=""]').remove(); + $.each(data['source'],function(key,value) { if (value === source) { $('#source').append( ``); @@ -7979,7 +7979,7 @@ function dialog_message(message_id) { } function control_period_range() { let value_period_range = $('#row_period_range #hidden-period_range').val(); - let current_value = $('#row_period #hidden-period').val(); + let current_value = $('#row_period2 #hidden-period').val(); let min_range = (current_value/12); if(min_range > value_period_range) { $('#row_period_range div:nth-child(2) select option').removeAttr("selected"); @@ -8027,10 +8027,10 @@ function control_period_range() { $(document).ready(function () { $('[id^=period], #combo_graph_options, #combo_sla_sort_options').next().css('z-index', 0); - $('#row_period input').change(function(e){ + $('#row_period2 input').change(function(e){ control_period_range(); }); - $('#row_period select').change(function(e){ + $('#row_period2 select').change(function(e){ control_period_range(); }); $('#row_period_range input').change(function(e){