From 90d8ac5129197d672ded0a0dfcc48e809090232a Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 4 Jan 2021 15:12:55 +0100 Subject: [PATCH 01/17] Fixed ip target while creating policy modules --- pandora_console/include/functions_snmp_browser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index 0d3c5ca32d..5a3546354e 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -1316,7 +1316,7 @@ function snmp_browser_create_modules_snmp(string $module_target, array $snmp_val 'min_ff_event_critical' => 0, 'ff_type' => 0, 'each_ff' => 0, - 'ip_target' => $target_ip, + 'ip_target' => '', 'configuration_data' => '', 'history_data' => 1, ]; From 91b74fe19f79388c73b05d76bb826a45e413f116 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 20 Jan 2021 17:55:11 +0100 Subject: [PATCH 02/17] Fixed little issue with the URL --- pandora_console/godmode/wizards/DiscoveryTaskList.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 1dfc7063e7..abe97b023b 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -494,7 +494,7 @@ class DiscoveryTaskList extends HTML if (check_acl($config['id_user'], 0, 'AW')) { $data[0] = '{'id_recon_server'} ne $master_server) { + my $this_server_status = get_db_value ($dbh, 'SELECT status FROM tserver WHERE id_server = ?', $task->{'id_recon_server'}); + if (!defined($this_server_status) || $this_server_status eq -1) { + my $updated_task = db_process_update ($dbh, 'trecon_task', { 'id_recon_server' => $master_server }, { 'id_rt' => $task->{'id_rt'} }); + log_message('FORGOTTEN DISCOVERY TASKS', 'Updated discovery task '.$task->{'name'}); + } + } + } + + log_message('FORGOTTEN DISCOVERY TASKS', 'Step ended'); +} + + # Init pandora_init_pdb(\%conf); From 5283771e3224cb643c9e2c91c041bebb9dc34ff8 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 21 Jan 2021 13:33:14 +0100 Subject: [PATCH 04/17] Solved issue with verbosity parameters --- pandora_server/lib/PandoraFMS/Config.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 34f3f468f9..ea378b623e 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -826,7 +826,9 @@ sub pandora_load_config { $pa_config->{"snmp_proc_deadresponse"} = clean_blank($1); } elsif ($parametro =~ m/^verbosity\s+([0-9]*)/i) { - $pa_config->{"verbosity"} = clean_blank($1); + if ($pa_config->{"verbosity"} == 0) { + $pa_config->{"verbosity"} = clean_blank($1); + } } elsif ($parametro =~ m/^server_threshold\s+([0-9]*)/i) { $pa_config->{"server_threshold"} = clean_blank($1); From 64ae9641911ce55923b36ada623f1242c069440a Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 19 Feb 2021 14:30:09 +0100 Subject: [PATCH 05/17] Fixed forced 2FA --- pandora_console/general/register.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php index 9f90e7ad39..9147a0e016 100644 --- a/pandora_console/general/register.php +++ b/pandora_console/general/register.php @@ -234,8 +234,8 @@ if (!$double_auth_enabled && $config['2FA_all_users'] != '' } }); - $("div#doble_auth_window").dialog({ + $("div#doble_auth_window").dialog({ resizable: true, draggable: true, modal: true, @@ -247,12 +247,6 @@ if (!$double_auth_enabled && $config['2FA_all_users'] != '' width: 500, height: 400, close: function (event, ui) { - - // Abort the ajax request if (typeof request != 'undefined'){ request.abort(); From af680b5d924469c8ab1cf385fff2442fe9acbf7a Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 1 Mar 2021 13:58:04 +0100 Subject: [PATCH 06/17] permissions limitation for command management --- .../godmode/alerts/alert_commands.php | 35 +++++++++++++++++-- .../alerts/configure_alert_command.php | 4 +-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 001cfc0430..20a84f0dc1 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -28,6 +28,12 @@ if (! check_acl($config['id_user'], 0, 'LM')) { exit; } +if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user'])) { + echo "'; +} + if (is_metaconsole()) { $sec = 'advanced'; } else { @@ -558,7 +564,7 @@ foreach ($commands as $command) { $data['name'] = ''; // (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group. - if (!$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) { + if (!$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'PM')) { $data['name'] .= ''.$command['name'].''; } else { $data['name'] .= $command['name']; @@ -584,7 +590,7 @@ foreach ($commands as $command) { $table->cellclass[]['action'] = 'action_buttons'; // (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group. - if ($is_central_policies_on_node === false && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) { + if ($is_central_policies_on_node === false && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'PM')) { $data['action'] = ''; $data['action'] .= ''.html_print_image('images/copy.png', true).''; @@ -602,7 +608,7 @@ if (count($table->data) > 0) { ui_print_info_message(['no_close' => true, 'message' => __('No alert commands configured') ]); } -if ($is_central_policies_on_node === false) { +if ($is_central_policies_on_node === false && check_acl_restricted_all($config['id_user'], $command['id_group'], 'PM')) { echo '
'; echo '
'; html_print_submit_button(__('Create'), 'create', false, 'class="sub next"'); @@ -612,3 +618,26 @@ if ($is_central_policies_on_node === false) { } enterprise_hook('close_meta_frame'); + +?> + + \ No newline at end of file diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index 2882d260db..88da3e5abf 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -21,7 +21,7 @@ check_login(); enterprise_hook('open_meta_frame'); -if (! check_acl($config['id_user'], 0, 'LM')) { +if (! check_acl($config['id_user'], 0, 'PM')) { db_pandora_audit( 'ACL Violation', 'Trying to access Alert Management' @@ -51,7 +51,7 @@ if (is_metaconsole() === true) { if ($id > 0) { $alert = alerts_get_alert_command($id); - if ($alert['internal'] || !check_acl_restricted_all($config['id_user'], $alert['id_group'], 'LM')) { + if ($alert['internal'] || !check_acl_restricted_all($config['id_user'], $alert['id_group'], 'PM')) { db_pandora_audit('ACL Violation', 'Trying to access Alert Management'); include 'general/noaccess.php'; exit; From 9b3f6f1efb925d0d3fdf78344d09a120ca8800c5 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 2 Mar 2021 10:42:08 +0100 Subject: [PATCH 07/17] added option to disable selected agents massively --- .../godmode/agentes/module_manager.php | 82 ++++++++++++++++--- 1 file changed, 71 insertions(+), 11 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 35f4c7943a..1d900b192d 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -222,9 +222,9 @@ if (! isset($id_agente)) { } -$multiple_delete = (bool) get_parameter('multiple_delete'); +$module_action = (string) get_parameter('module_action'); -if ($multiple_delete) { +if ($module_action === 'delete') { $id_agent_modules_delete = (array) get_parameter('id_delete'); $count_correct_delete_modules = 0; @@ -400,23 +400,63 @@ if ($multiple_delete) { if ($count_correct_delete_modules == 0) { ui_print_error_message( sprintf( - __('There was a problem deleting %s modules, none deleted.'), + __('There was a problem completing the operation. Applied to 0/%d modules.'), $count_modules_to_delete ) ); } else { if ($count_correct_delete_modules == $count_modules_to_delete) { - ui_print_success_message(__('All Modules deleted succesfully')); + ui_print_success_message(__('Operation finished successfully.')); } else { ui_print_error_message( sprintf( - __('There was a problem only deleted %s modules of %s total.'), - count_correct_delete_modules, + __('There was a problem completing the operation. Applied to %d/%d modules.'), + $count_correct_delete_modules, $count_modules_to_delete ) ); } } +} else if ($module_action === 'disable') { + $id_agent_modules_disable = (array) get_parameter('id_delete'); + + $count_correct_delete_modules = 0; + $updated_count = 0; + + foreach ($id_agent_modules_disable as $id_agent_module_disable) { + $sql = sprintf( + 'UPDATE tagente_modulo + SET disabled = 1 + WHERE id_agente_modulo = %d', + $id_agent_module_disable + ); + + if (db_process_sql($sql)) { + $updated_count++; + } + } + + $count_modules_to_disable = count($id_agent_modules_disable); + if ($updated_count === 0) { + ui_print_error_message( + sprintf( + __('There was a problem completing the operation. Applied to 0/%d modules.'), + $count_modules_to_disable + ) + ); + } else { + if ($updated_count == $count_modules_to_disable) { + ui_print_success_message(__('Operation finished successfully.')); + } else { + ui_print_error_message( + sprintf( + __('There was a problem completing the operation. Applied to %d/%d modules.'), + $updated_count, + $count_modules_to_disable + ) + ); + } + } } @@ -845,6 +885,9 @@ foreach ($modules as $module) { 'id_delete[]', $module['id_agente_modulo'], false, + true, + false, + '', true ); } @@ -1123,12 +1166,29 @@ html_print_table($table); if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) { echo '
'; - html_print_input_hidden('multiple_delete', 1); - html_print_submit_button( - __('Delete'), - 'multiple_delete', + + html_print_input_hidden('submit_modules_action', 1); + + html_print_select( + [ + 'disable' => 'Disable selected modules', + 'delete' => 'Delete selected modules', + ], + 'module_action', + '', + '', + '', + 0, false, - 'class="sub delete"' + false, + false + ); + + html_print_submit_button( + __('Execute action'), + 'submit_modules_action', + false, + 'class="sub next"' ); echo '
'; echo ''; From 0a8c478c473afb960cff1c0b59f7c05f3ba8b559 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 8 Mar 2021 17:48:59 +0100 Subject: [PATCH 08/17] visual fixes in agent view graphs --- pandora_console/include/ajax/graph.ajax.php | 8 +++++++- pandora_console/include/functions.php | 12 ++++++++++++ pandora_console/operation/agentes/graphs.php | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php index 09c4355b57..554f8c8118 100644 --- a/pandora_console/include/ajax/graph.ajax.php +++ b/pandora_console/include/ajax/graph.ajax.php @@ -55,9 +55,15 @@ if ($save_custom_graph) { if ($print_custom_graph) { ob_clean(); + $width_value = (int) get_parameter('width', CHART_DEFAULT_WIDTH); + + if ($width_value === -1) { + $width_value = ''; + } + $params = [ 'period' => (int) get_parameter('period', SECONDS_5MINUTES), - 'width' => (int) get_parameter('width', CHART_DEFAULT_WIDTH), + 'width' => $width_value, 'height' => (int) get_parameter('height', CHART_DEFAULT_HEIGHT), 'unit_name' => get_parameter('unit_list', []), 'date' => (int) get_parameter('date', time()), diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index accda15dd8..0896912edd 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -3910,6 +3910,18 @@ function series_type_graph_array($data, $show_elements_graph) $name_legend = $show_elements_graph['labels'][$value['agent_module_id']][$label_interfaces[$value['agent_module_id']]].': '; } else if (is_array($show_elements_graph['labels'][$value['agent_module_id']]) === true) { $name_legend = 'Avg: '; + + if (array_key_exists('agent_alias', $value) + && array_key_exists('module_name', $value) + && array_key_exists('unit', $value) + ) { + $name_legend .= $value['agent_alias']; + $name_legend .= ' / '; + $name_legend .= $value['module_name']; + $name_legend .= ' / '; + $name_legend .= __('Unit ').' '; + $name_legend .= $value['unit'].': '; + } } else { $name_legend = $show_elements_graph['labels'][$value['agent_module_id']].': '; } diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php index 279661e02e..d33298b014 100644 --- a/pandora_console/operation/agentes/graphs.php +++ b/pandora_console/operation/agentes/graphs.php @@ -516,7 +516,7 @@ echo "
"; $container.html($errorMessage.html()); } - requestCustomGraph(0, width, height, period, stacked, date, modules) + requestCustomGraph(0, -1, height, period, stacked, date, modules) .done(handleSuccess) .fail(handleError); } From 219ca1914d09dd6a74419967bf620031d235100a Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Tue, 9 Mar 2021 16:02:05 +0100 Subject: [PATCH 09/17] cambio de dominio --- extras/deploy-scripts/pandora_deploy_community.sh | 2 +- pandora_console/general/login_page.php | 4 ++-- pandora_console/include/functions_config.php | 4 ++-- pandora_console/install.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extras/deploy-scripts/pandora_deploy_community.sh b/extras/deploy-scripts/pandora_deploy_community.sh index 51f61c2b8a..aa858eec3a 100644 --- a/extras/deploy-scripts/pandora_deploy_community.sh +++ b/extras/deploy-scripts/pandora_deploy_community.sh @@ -71,7 +71,7 @@ check_pre_pandora () { check_repo_connection () { execute_cmd "ping -c 2 8.8.8.8" "Checking internet connection" execute_cmd "ping -c 2 firefly.artica.es" "Checking Community repo" - execute_cmd "ping -c 2 support.artica.es" "Checking Enterprise repo" + execute_cmd "ping -c 2 support.pandorafms.com" "Checking Enterprise repo" } check_root_permissions () { diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index cf7bce6c4d..9238810636 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -146,8 +146,8 @@ if (isset($config['custom_support_url'])) { echo '
  • '.__('Support').'
    • '; } } else if (!$custom_conf_enabled) { - echo '
  • support
    • '; - echo '
  • '.__('Docs').'
    • '; + echo '
  • support
    • '; + echo '
  • '.__('Docs').'
    • '; } echo '
    '; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 70744ef78a..0c2bcc1403 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -2224,7 +2224,7 @@ function config_process_config() } if (!isset($config['custom_support_url'])) { - config_update_value('custom_support_url', 'https://support.artica.es'); + config_update_value('custom_support_url', 'https://support.pandorafms.com'); } if (!isset($config['rb_product_name'])) { @@ -2240,7 +2240,7 @@ function config_process_config() } if (!isset($config['meta_custom_support_url'])) { - config_update_value('meta_custom_support_url', 'https://support.artica.es'); + config_update_value('meta_custom_support_url', 'https://support.pandorafms.com'); } if (!isset($config['meta_custom_logo'])) { diff --git a/pandora_console/install.php b/pandora_console/install.php index fb3381a361..c9c5a74592 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -909,7 +909,7 @@ function install_step4() // $config["custom_title2_login_alt"] = "NEXT GENERATION"; // $config["rb_product_name_alt"] = "Pandora FMS"; // $config["custom_docs_url_alt"] = "http://wiki.pandorafms.com/"; - // $config["custom_support_url_alt"] = "https://support.artica.es"; + // $config["custom_support_url_alt"] = "https://support.pandorafms.com"; @@ -1026,7 +1026,7 @@ function install_step4() // $config["custom_title2_login_alt"] = "NEXT GENERATION"; // $config["rb_product_name_alt"] = "Pandora FMS"; // $config["custom_docs_url_alt"] = "http://wiki.pandorafms.com/"; - // $config["custom_support_url_alt"] = "https://support.artica.es"; + // $config["custom_support_url_alt"] = "https://support.pandorafms.com"; /* ----------Attention-------------------- From 2d4577b23b9b7e3d909c55175490308fe06e0cc4 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 10 Mar 2021 13:58:56 +0100 Subject: [PATCH 10/17] Cleaned -v and -q options --- pandora_server/lib/PandoraFMS/Config.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index ea378b623e..71f2c70ce1 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -44,8 +44,8 @@ our @EXPORT = qw( ); # version: Defines actual version of Pandora Server for this module only -my $pandora_version = "7.0NG.751"; -my $pandora_build = "210120"; +my $pandora_version = "7.0NG.752"; +my $pandora_build = "210310"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash @@ -827,7 +827,7 @@ sub pandora_load_config { } elsif ($parametro =~ m/^verbosity\s+([0-9]*)/i) { if ($pa_config->{"verbosity"} == 0) { - $pa_config->{"verbosity"} = clean_blank($1); + $pa_config->{"verbosity"} = clean_blank($1); } } elsif ($parametro =~ m/^server_threshold\s+([0-9]*)/i) { From d86bfa8e7a7b93f7d7622a69cde057f3a7f6a32d Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 10 Mar 2021 14:00:29 +0100 Subject: [PATCH 11/17] Updated --- pandora_server/lib/PandoraFMS/Config.pm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 71f2c70ce1..cd8407115a 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -60,11 +60,9 @@ my %pa_config; sub help_screen { print "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file > \n\n"; print "Following options are optional : \n"; - print " -v : Verbose mode activated. Writes more information in the logfile \n"; print " -d : Debug mode activated. Writes extensive information in the logfile \n"; print " -D : Daemon mode (runs in background)\n"; print " -P : Store PID to file.\n"; - print " -q : Quiet startup \n"; print " -S : Manage the win32 service.\n"; print " -h : This screen. Shows a little help screen \n"; print " \n"; @@ -103,18 +101,12 @@ sub pandora_init { if (($parametro =~ m/-h\z/i ) || ($parametro =~ m/help\z/i )) { help_screen(); } - elsif ($parametro =~ m/-v\z/i) { - $pa_config->{"verbosity"}=5; - } elsif ($parametro =~ m/^-P\z/i) { $pa_config->{'PID'}= clean_blank($ARGV[$ax+1]); } elsif ($parametro =~ m/-d\z/) { $pa_config->{"verbosity"}=10; } - elsif ($parametro =~ m/-q\z/) { - $pa_config->{"quiet"}=1; - } elsif ($parametro =~ m/-D\z/) { $pa_config->{"daemon"}=1; } @@ -827,7 +819,7 @@ sub pandora_load_config { } elsif ($parametro =~ m/^verbosity\s+([0-9]*)/i) { if ($pa_config->{"verbosity"} == 0) { - $pa_config->{"verbosity"} = clean_blank($1); + $pa_config->{"verbosity"} = clean_blank($1); } } elsif ($parametro =~ m/^server_threshold\s+([0-9]*)/i) { From 74fb084ba50da91745dc03f70e0e3fde6303eddf Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 11 Mar 2021 01:00:18 +0100 Subject: [PATCH 12/17] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 57df336a24..53f6c71331 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210310 +Version: 7.0NG.752-210311 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index f372f1f16e..c7ac46ab2a 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.752-210310" +pandora_version="7.0NG.752-210311" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 6f0203f477..efbc6bcaea 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210310'; +use constant AGENT_BUILD => '210311'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index de169e4431..cd6f5c5345 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.752 -%define release 210310 +%define release 210311 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index b53e5c64af..6bc45c43ab 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.752 -%define release 210310 +%define release 210311 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 680d7e99d7..c29decfbca 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210310" +PI_BUILD="210311" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f90fa589bb..3676db6f23 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210310} +{210311} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0fd1673bae..6085898f74 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.752(Build 210310)") +#define PANDORA_VERSION ("7.0NG.752(Build 210311)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ac13101105..9d7c3a7d12 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.752(Build 210310))" + VALUE "ProductVersion", "(7.0NG.752(Build 210311))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5983841b8d..1dfc8565d5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210310 +Version: 7.0NG.752-210311 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 38a7c7409d..e3fc7561d9 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.752-210310" +pandora_version="7.0NG.752-210311" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4bc8478b54..45e58db6d9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210310'; +$build_version = 'PC210311'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c9b9dbb01f..30f37720b7 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 885e62253b..b67521022d 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210310 +%define release 210311 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 7a8ba304c2..c5db0e8c0a 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210310 +%define release 210311 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index bddaec24a7..bc2a62de7e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210310" +PI_BUILD="210311" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c6f887ec05..4f03017475 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210310"; +my $version = "7.0NG.752 PS210311"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 46c8ecc71e..6fd7ae604d 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210310"; +my $version = "7.0NG.752 PS210311"; # save program name for logging my $progname = basename($0); From c7b33c9c9c05011a60e608902feb0258ee6ddd03 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 11 Mar 2021 11:18:13 +0000 Subject: [PATCH 13/17] Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos --- pandora_console/include/class/AgentWizard.class.php | 2 +- pandora_console/include/functions_ui.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index 6094582691..c702dd9065 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -346,8 +346,8 @@ class AgentWizard extends HTML // Capture the parameters. $this->protocol = get_parameter('protocol'); + $this->targetPort = get_parameter('targetPort', '161'); if ($this->protocol === 'snmp') { - $this->targetPort = get_parameter('targetPort', '161'); $this->community = get_parameter('community', 'public'); $this->version = get_parameter('version', '1'); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 00e178005f..7e37604b22 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4869,6 +4869,7 @@ function ui_print_agent_autocomplete_input($parameters) $get_only_string_modules = true; } + $no_disabled_modules = true; if (isset($parameters['no_disabled_modules'])) { $no_disabled_modules = $parameters['no_disabled_modules']; } From ba997dd13fb372865b5483d500be5f8f0ba88c38 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 11 Mar 2021 14:49:39 +0100 Subject: [PATCH 14/17] Fixed --- pandora_console/general/register.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php index 9147a0e016..c01f8bc445 100644 --- a/pandora_console/general/register.php +++ b/pandora_console/general/register.php @@ -257,7 +257,11 @@ if (!$double_auth_enabled && $config['2FA_all_users'] != '' //document.location.reload(); } }) - .show(); + .show(); + // Don't allow close the dialog with X button + $('.ui-dialog-titlebar-close').css('display', 'none'); + + '; } From 54fc2e89d3d387489510fab9787e24034bf78c64 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 11 Mar 2021 14:22:28 +0000 Subject: [PATCH 15/17] new report histogram --- .../reporting_builder.item_editor.php | 23 +++++++++++++++---- .../godmode/reporting/reporting_builder.php | 2 ++ .../include/functions_reporting.php | 3 ++- .../include/functions_reporting_html.php | 19 +++++++++++++++ pandora_console/include/functions_reports.php | 4 ++++ 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index e90acee5cb..53d60df9fe 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -343,6 +343,7 @@ switch ($action) { $failover_type = $item['failover_type']; break; + case 'histogram_data': case 'module_histogram_graph': $description = $item['description']; $period = $item['period']; @@ -550,9 +551,18 @@ switch ($action) { $show_summary_group = $style['show_summary_group']; - $filter_event_severity = json_decode($style['filter_event_severity'], true); - $filter_event_status = json_decode($style['filter_event_status'], true); - $filter_event_type = json_decode($style['filter_event_type'], true); + $filter_event_severity = json_decode( + $style['filter_event_severity'], + true + ); + $filter_event_status = json_decode( + $style['filter_event_status'], + true + ); + $filter_event_type = json_decode( + $style['filter_event_type'], + true + ); $event_graph_by_user_validator = $style['event_graph_by_user_validator']; $event_graph_by_criticity = $style['event_graph_by_criticity']; @@ -561,7 +571,6 @@ switch ($action) { $filter_search = $style['event_filter_search']; $filter_exclude = $style['event_filter_exclude']; - break; case 'event_report_group': @@ -799,6 +808,7 @@ switch ($action) { case 'database_serialized': case 'last_value': case 'monitor_report': + case 'histogram_data': case 'min_value': case 'max_value': case 'avg_value': @@ -4136,6 +4146,7 @@ $(document).ready (function () { case 'max_value': case 'min_value': case 'monitor_report': + case 'histogram_data': case 'database_serialized': case 'last_value': case 'sumatory': @@ -4189,6 +4200,7 @@ $(document).ready (function () { case 'prediction_date': case 'projection_graph': case 'monitor_report': + case 'histogram_data': case 'module_histogram_graph': case 'avg_value': case 'max_value': @@ -4274,6 +4286,7 @@ $(document).ready (function () { case 'max_value': case 'min_value': case 'monitor_report': + case 'histogram_data': case 'database_serialized': case 'last_value': case 'sumatory': @@ -4322,6 +4335,7 @@ $(document).ready (function () { case 'prediction_date': case 'projection_graph': case 'monitor_report': + case 'histogram_data': case 'module_histogram_graph': case 'avg_value': case 'max_value': @@ -5337,6 +5351,7 @@ function chooseType() { $("#row_summary").show(); break; + case 'histogram_data': case 'module_histogram_graph': $("#row_description").show(); $("#row_period").show(); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 6f77f643ec..887b3c7750 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -2061,6 +2061,7 @@ switch ($action) { break; case 'module_histogram_graph': + case 'histogram_data': case 'agent_configuration': case 'alert_report_agent': case 'alert_report_module': @@ -2694,6 +2695,7 @@ switch ($action) { break; case 'module_histogram_graph': + case 'histogram_data': case 'agent_configuration': case 'alert_report_agent': case 'alert_report_module': diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 80f0801493..f72ff94b43 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -842,6 +842,7 @@ function reporting_make_reporting_data( ); break; + case 'histogram_data': case 'module_histogram_graph': $report['contents'][] = reporting_module_histogram_graph( $report, @@ -13624,7 +13625,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0) $urlImage = ui_get_full_url(false, true, false, false); - $return['type'] = 'module_histogram_graph'; + $return['type'] = $content['type']; $ttl = 1; if ($pdf) { diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 8f27e19933..4d02b482e8 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -43,6 +43,21 @@ require_once $config['homedir'].'/include/functions_ui.php'; require_once $config['homedir'].'/include/functions_netflow.php'; +/** + * Header function. + * + * @param object $table Table. + * @param boolean $mini Mini. + * @param string $title Title. + * @param string $subtitle Subtitle. + * @param integer $period Period. + * @param string $date Date. + * @param string $from From. + * @param string $to To. + * @param string $label Label. + * + * @return void + */ function reporting_html_header( &$table, $mini, @@ -411,6 +426,10 @@ function reporting_html_print_report($report, $mini=false, $report_info=1) $mini ); break; + + case 'histogram_data': + reporting_enterprise_html_histogram_data($table, $item, $mini); + break; } if ($item['type'] == 'agent_module') { diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index d142b418e5..192940c8ed 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -754,6 +754,10 @@ function reports_get_report_types($template=false, $not_editor=false) 'optgroup' => __('Modules'), 'name' => __('Last value'), ]; + $types['histogram_data'] = [ + 'optgroup' => __('Modules'), + 'name' => __('Histogram'), + ]; $types['general'] = [ 'optgroup' => __('Grouped'), From d8a628b1c43aaee30f91e039713c64bd2f10bc1a Mon Sep 17 00:00:00 2001 From: Marcos Alconada Date: Thu, 11 Mar 2021 14:40:23 +0000 Subject: [PATCH 16/17] Ent 6781 revision de estilos visuales y eliminacion de sistemas skins --- pandora_console/extensions/agents_modules.php | 57 +- pandora_console/extensions/api_checker.php | 8 +- pandora_console/extensions/db_status.php | 2 +- pandora_console/extensions/dbmanager.php | 4 +- .../extensions/disabled/matrix_events.php | 11 +- .../extensions/extension_uploader.php | 2 +- pandora_console/extensions/files_repo.php | 37 +- .../extensions/files_repo/files_repo_form.php | 4 +- .../extensions/files_repo/files_repo_list.php | 69 +- pandora_console/extensions/insert_data.php | 4 +- pandora_console/extensions/module_groups.php | 12 +- pandora_console/extensions/net_tools.php | 4 +- pandora_console/extensions/pandora_logs.php | 4 +- .../extensions/realtime_graphs.php | 4 +- .../realtime_graphs/realtime_graphs.css | 2 + .../extensions/users_connected.php | 2 +- pandora_console/general/alert_enterprise.php | 8 +- .../general/first_task/HA_cluster_builder.php | 6 +- .../general/first_task/cluster_builder.php | 2 +- pandora_console/general/header.php | 59 +- pandora_console/general/login_help_dialog.php | 52 +- pandora_console/general/login_page.php | 13 +- pandora_console/general/logon_failed.php | 4 +- pandora_console/general/news_dialog.php | 16 +- pandora_console/general/noaccess2.php | 9 +- pandora_console/general/pandora_help.php | 24 +- pandora_console/general/php7_message.php | 18 +- pandora_console/general/register.php | 2 +- pandora_console/general/ui/agents_list.php | 2 +- pandora_console/godmode/admin_access_logs.php | 17 +- .../godmode/agentes/agent_conf_gis.php | 10 +- .../godmode/agentes/agent_incidents.php | 2 +- .../godmode/agentes/agent_manager.php | 42 +- .../godmode/agentes/agent_template.php | 10 +- .../godmode/agentes/configurar_agente.php | 127 +- .../godmode/agentes/configure_field.php | 16 +- .../godmode/agentes/fields_manager.php | 12 +- .../godmode/agentes/modificar_agente.php | 240 +- .../godmode/agentes/module_manager.php | 48 +- .../agentes/module_manager_editor_common.php | 98 +- .../agentes/module_manager_editor_network.php | 6 +- .../agentes/module_manager_editor_plugin.php | 2 +- .../module_manager_editor_prediction.php | 2 +- .../agentes/planned_downtime.editor.php | 75 +- .../godmode/agentes/planned_downtime.list.php | 14 +- .../agentes/status_monitor_custom_fields.php | 6 +- .../godmode/alerts/alert_actions.php | 6 +- .../godmode/alerts/alert_commands.php | 38 +- .../godmode/alerts/alert_list.builder.php | 12 +- .../godmode/alerts/alert_list.list.php | 220 +- pandora_console/godmode/alerts/alert_list.php | 4 +- .../godmode/alerts/alert_special_days.php | 28 +- .../godmode/alerts/alert_templates.php | 4 +- pandora_console/godmode/alerts/alert_view.php | 34 +- .../godmode/alerts/configure_alert_action.php | 2 +- .../alerts/configure_alert_special_days.php | 66 +- .../alerts/configure_alert_template.php | 10 +- pandora_console/godmode/category/category.php | 44 +- .../godmode/category/edit_category.php | 24 +- .../godmode/events/custom_events.php | 2 +- .../godmode/events/event_filter.php | 19 +- .../godmode/events/event_responses.editor.php | 20 +- .../godmode/events/event_responses.list.php | 27 +- pandora_console/godmode/events/events.php | 36 +- pandora_console/godmode/extensions.php | 11 +- .../godmode/gis_maps/configure_gis_map.php | 55 +- .../godmode/groups/configure_group.php | 6 +- .../godmode/groups/configure_modu_group.php | 2 +- pandora_console/godmode/groups/group_list.php | 7 +- .../godmode/massive/massive_add_alerts.php | 2 +- .../godmode/massive/massive_delete_alerts.php | 2 +- .../massive/massive_delete_modules.php | 12 +- .../godmode/massive/massive_edit_agents.php | 30 +- .../godmode/massive/massive_edit_modules.php | 16 +- .../godmode/massive/massive_operations.php | 207 +- .../module_library/module_library_view.php | 8 +- .../godmode/modules/manage_nc_groups.php | 6 +- .../modules/manage_network_components.php | 50 +- .../manage_network_components_form_common.php | 15 +- .../manage_network_components_form_wizard.php | 8 +- .../modules/manage_network_templates.php | 20 +- .../modules/manage_network_templates_form.php | 10 +- .../godmode/modules/module_list.php | 2 +- pandora_console/godmode/netflow/nf_edit.php | 6 +- .../godmode/netflow/nf_edit_form.php | 4 +- .../godmode/netflow/nf_item_list.php | 19 +- .../godmode/reporting/create_container.php | 57 +- .../reporting/graph_builder.graph_editor.php | 19 +- .../godmode/reporting/graph_builder.main.php | 14 +- .../godmode/reporting/graph_builder.php | 39 +- .../godmode/reporting/graph_container.php | 28 +- pandora_console/godmode/reporting/graphs.php | 89 +- .../godmode/reporting/map_builder.php | 76 +- .../reporting_builder.item_editor.php | 564 ++-- .../reporting_builder.list_items.php | 71 +- .../godmode/reporting/reporting_builder.php | 66 +- .../reporting/visual_console_builder.data.php | 12 +- .../visual_console_builder.editor.php | 12 +- .../visual_console_builder.elements.php | 73 +- .../reporting/visual_console_builder.php | 16 +- .../visual_console_builder.wizard.php | 10 +- .../reporting/visual_console_favorite.php | 45 +- .../godmode/servers/modificar_server.php | 6 +- pandora_console/godmode/servers/plugin.php | 112 +- .../godmode/servers/servers.build_table.php | 28 +- pandora_console/godmode/setup/gis.php | 2 +- pandora_console/godmode/setup/gis_step_2.php | 256 +- pandora_console/godmode/setup/license.php | 4 +- pandora_console/godmode/setup/links.php | 10 +- pandora_console/godmode/setup/news.php | 6 +- pandora_console/godmode/setup/os.list.php | 2 +- pandora_console/godmode/setup/os.php | 18 +- pandora_console/godmode/setup/setup.php | 100 +- .../godmode/setup/setup_ehorus.php | 12 +- .../godmode/setup/setup_general.php | 24 +- .../godmode/setup/setup_integria.php | 12 +- .../godmode/setup/setup_netflow.php | 2 +- .../godmode/setup/setup_visuals.php | 57 +- .../godmode/setup/setup_websocket_engine.php | 2 +- pandora_console/godmode/setup/snmp_wizard.php | 4 +- .../godmode/snmpconsole/snmp_alert.php | 40 +- .../godmode/snmpconsole/snmp_filters.php | 22 +- pandora_console/godmode/tag/edit_tag.php | 33 +- pandora_console/godmode/tag/tag.php | 45 +- .../update_manager/update_manager.offline.php | 2 +- .../update_manager/update_manager.online.php | 20 +- .../godmode/update_manager/update_manager.php | 6 +- .../godmode/users/configure_profile.php | 20 +- .../godmode/users/configure_user.php | 217 +- .../godmode/users/profile_list.php | 42 +- pandora_console/godmode/users/user_list.php | 66 +- .../wizards/DiscoveryTaskList.class.php | 106 +- .../godmode/wizards/HostDevices.class.php | 2 +- pandora_console/images/eye.png | Bin 569 -> 521 bytes .../images/{ => menu}/builder.menu_gray.png | Bin .../images/{ => menu}/builder.menu_white.png | Bin .../{ => menu}/extensions.menu_gray.png | Bin .../{ => menu}/extensions.menu_white.png | Bin .../images/{ => menu}/gm_alerts.menu_gray.png | Bin .../{ => menu}/gm_alerts.menu_white.png | Bin .../{ => menu}/gm_configuration.menu_gray.png | Bin .../gm_configuration.menu_white.png | Bin .../images/{ => menu}/gm_discovery.menu.png | Bin .../{ => menu}/gm_discovery.menu_white.png | Bin .../images/{ => menu}/gm_events.menu_gray.png | Bin .../{ => menu}/gm_events.menu_white.png | Bin .../{ => menu}/gm_library.menu_gray.png | Bin .../{ => menu}/gm_library.menu_white.png | Bin .../{ => menu}/gm_resources.menu_gray.png | Bin .../{ => menu}/gm_resources.menu_white.png | Bin .../{ => menu}/gm_servers.menu_gray.png | Bin .../{ => menu}/gm_servers.menu_white.png | Bin .../images/{ => menu}/gm_setup.menu_gray.png | Bin .../images/{ => menu}/gm_setup.menu_white.png | Bin .../images/{ => menu}/gm_users.menu_gray.png | Bin .../images/{ => menu}/gm_users.menu_white.png | Bin .../images/{ => menu}/links.menu_gray.png | Bin .../images/{ => menu}/links.menu_white.png | Bin .../images/{ => menu}/op_events.menu_gray.png | Bin .../{ => menu}/op_events.menu_white.png | Bin .../{ => menu}/op_monitoring.menu_gray.png | Bin .../{ => menu}/op_monitoring.menu_white.png | Bin .../{ => menu}/op_network.menu_gray.png | Bin .../{ => menu}/op_network.menu_white.png | Bin .../{ => menu}/op_reporting.menu_gray.png | Bin .../{ => menu}/op_reporting.menu_white.png | Bin .../{ => menu}/op_workspace.menu_gray.png | Bin .../{ => menu}/op_workspace.menu_white.png | Bin .../{ => menu}/um_messages.menu_gray.png | Bin .../{ => menu}/um_messages.menu_white.png | Bin pandora_console/images/operation.png | Bin 521 -> 569 bytes pandora_console/images/user.png | Bin 0 -> 443 bytes .../include/ajax/alert_list.ajax.php | 12 +- .../include/ajax/custom_fields.php | 2 +- pandora_console/include/ajax/events.php | 113 +- pandora_console/include/ajax/graph.ajax.php | 10 +- pandora_console/include/ajax/module.php | 32 +- .../include/ajax/rolling_release.ajax.php | 24 +- .../include/ajax/snmp_browser.ajax.php | 30 +- pandora_console/include/ajax/tree.ajax.php | 2 +- pandora_console/include/auth/ldap.php | 2 +- pandora_console/include/auth/mysql.php | 2 +- .../include/class/AgentWizard.class.php | 40 +- .../include/class/AgentsAlerts.class.php | 10 +- .../include/class/ConfigPEN.class.php | 16 +- .../include/class/ConsoleSupervisor.php | 10 +- .../include/class/CredentialStore.class.php | 8 +- .../include/class/CustomNetScan.class.php | 17 +- .../include/class/Diagnostics.class.php | 7 +- pandora_console/include/class/HTML.class.php | 18 +- .../include/class/HelpFeedBack.class.php | 2 +- .../class/ManageNetScanScripts.class.php | 23 +- .../include/class/ModuleTemplates.class.php | 53 +- .../include/class/NetworkMap.class.php | 36 +- .../include/class/TreeService.class.php | 16 +- .../include/class/WelcomeWindow.class.php | 13 +- pandora_console/include/functions_agents.php | 16 +- pandora_console/include/functions_clippy.php | 2 +- .../include/functions_container.php | 33 +- pandora_console/include/functions_cron.php | 84 +- pandora_console/include/functions_events.php | 93 +- .../include/functions_filemanager.php | 36 +- pandora_console/include/functions_gis.php | 2 +- pandora_console/include/functions_graph.php | 2 +- pandora_console/include/functions_html.php | 61 +- .../include/functions_integriaims.php | 6 +- pandora_console/include/functions_menu.php | 8 +- pandora_console/include/functions_modules.php | 9 +- pandora_console/include/functions_netflow.php | 10 +- pandora_console/include/functions_network.php | 2 +- .../include/functions_notifications.php | 2 + pandora_console/include/functions_profile.php | 2 +- .../include/functions_reporting.php | 93 +- .../include/functions_reporting_html.php | 118 +- pandora_console/include/functions_servers.php | 144 +- .../include/functions_snmp_browser.php | 112 +- .../include/functions_treeview.php | 40 +- pandora_console/include/functions_ui.php | 86 +- .../include/functions_update_manager.php | 76 +- .../include/functions_visual_map.php | 100 +- .../include/functions_visual_map_editor.php | 200 +- .../include/graphs/flot/pandora.flot.js | 1 + .../include/graphs/functions_d3.php | 2 +- .../include/graphs/functions_flot.php | 26 +- .../include/help/clippy/homepage.php | 4 +- .../help/en/help_ad_advanced_permision.php | 24 +- .../include/help/en/help_agent_status.php | 2 +- .../help/en/help_cascade_protection.php | 6 +- .../help/en/help_configure_gis_map.php | 4 +- .../help/en/help_context_module_unknow.php | 2 +- pandora_console/include/help/en/help_cron.php | 2 +- .../include/help/en/help_eventview.php | 13 +- pandora_console/include/help/en/help_ipam.php | 28 +- .../include/help/en/help_module_macros.php | 20 +- .../include/help/en/help_profile.php | 4 +- .../help_visual_console_editor_editor_tab.php | 2 +- .../include/help/en/help_wux_console.php | 94 +- .../include/help/es/help_agent_status.php | 2 +- .../help/es/help_cascade_protection.php | 6 +- .../help/es/help_configure_gis_map.php | 4 +- pandora_console/include/help/es/help_cron.php | 2 +- .../include/help/es/help_eventview.php | 13 +- pandora_console/include/help/es/help_ipam.php | 28 +- .../include/help/es/help_module_macros.php | 20 +- .../include/help/es/help_profile.php | 4 +- .../include/help/es/help_wux_console.php | 94 +- .../help/ja/help_ad_advanced_permision.php | 2 +- .../include/help/ja/help_agent_status.php | 2 +- .../help/ja/help_cascade_protection.php | 6 +- .../help/ja/help_configure_gis_map.php | 4 +- .../help/ja/help_context_module_unknow.php | 2 +- pandora_console/include/help/ja/help_cron.php | 2 +- .../include/help/ja/help_eventview.php | 8 +- pandora_console/include/help/ja/help_ipam.php | 28 +- .../include/help/ja/help_profile.php | 4 +- .../help_visual_console_editor_editor_tab.php | 2 +- .../include/javascript/module_library.js | 4 +- .../include/javascript/pandora_events.js | 6 +- .../include/javascript/pandora_modules.js | 4 +- .../include/javascript/pandora_ui.js | 1 + .../include/javascript/tree/TreeController.js | 6 +- .../lib/Dashboard/Widgets/agent_module.php | 6 +- .../include/lib/Dashboard/Widgets/example.php | 6 +- .../lib/Dashboard/Widgets/groups_status.php | 12 +- .../lib/Dashboard/Widgets/monitor_health.php | 2 +- .../include/lib/Dashboard/Widgets/reports.php | 2 +- .../Dashboard/Widgets/system_group_status.php | 8 +- .../lib/Dashboard/Widgets/tree_view.php | 2 +- .../lib/Dashboard/Widgets/wux_transaction.php | 6 +- .../models/VisualConsole/Items/Group.php | 8 +- .../rest-api/models/VisualConsole/View.php | 4 +- pandora_console/include/styles/first_task.css | 1 - .../include/styles/js/jquery.contextMenu.css | 1 + pandora_console/include/styles/menu.css | 80 +- .../include/styles/module_library.css | 6 +- pandora_console/include/styles/pandora.css | 2698 +++++++++++++++-- .../include/styles/pandora_black.css | 448 ++- .../include/styles/pandora_green_old.css | 185 -- .../include/styles/select2_dark.min.css | 652 ++++ pandora_console/index.php | 6 +- pandora_console/log/.console.log.swp | Bin 0 -> 28672 bytes .../mobile/include/functions_web.php | 6 +- pandora_console/mobile/include/ui.class.php | 2 +- pandora_console/mobile/include/user.class.php | 4 +- pandora_console/mobile/operation/agent.php | 6 +- pandora_console/mobile/operation/agents.php | 30 +- pandora_console/mobile/operation/alerts.php | 2 +- pandora_console/mobile/operation/events.php | 22 +- pandora_console/mobile/operation/groups.php | 2 +- .../mobile/operation/module_graph.php | 6 +- pandora_console/mobile/operation/modules.php | 23 +- pandora_console/mobile/operation/tactical.php | 2 +- .../mobile/operation/visualmap.php | 2 +- .../mobile/operation/visualmaps.php | 2 +- .../operation/agentes/agent_fields.php | 2 +- .../agentes/alerts_status.functions.php | 6 +- .../operation/agentes/alerts_status.php | 4 +- .../operation/agentes/custom_fields.php | 4 +- .../operation/agentes/datos_agente.php | 8 +- pandora_console/operation/agentes/ehorus.php | 4 +- .../operation/agentes/estado_agente.php | 59 +- .../agentes/estado_generalagente.php | 90 +- .../operation/agentes/estado_monitores.php | 25 +- .../operation/agentes/exportdata.php | 26 +- .../operation/agentes/gis_view.php | 6 +- pandora_console/operation/agentes/graphs.php | 23 +- .../operation/agentes/group_view.php | 148 +- .../agentes/interface_traffic_graph_win.php | 13 +- .../operation/agentes/log_sources_status.php | 4 +- .../operation/agentes/networkmap.dinamic.php | 19 +- .../operation/agentes/pandora_networkmap.php | 16 +- .../agentes/pandora_networkmap.view.php | 23 +- .../operation/agentes/realtime_win.php | 2 +- .../operation/agentes/snapshot_view.php | 10 +- .../operation/agentes/stat_win.php | 8 +- .../operation/agentes/status_events.php | 2 +- .../operation/agentes/status_monitor.php | 34 +- .../operation/agentes/tactical.php | 8 +- .../operation/agentes/ver_agente.php | 205 +- .../operation/events/events.build_table.php | 45 +- pandora_console/operation/events/events.php | 145 +- .../operation/events/events_list.php | 24 +- .../operation/events/sound_events.php | 27 +- pandora_console/operation/gis_maps/ajax.php | 6 +- .../operation/gis_maps/gis_map.php | 2 +- .../operation/gis_maps/public_console.php | 4 +- .../operation/gis_maps/render_view.php | 12 +- .../configure_integriaims_incident.php | 2 +- .../dashboard_detail_integriaims_incident.php | 8 +- .../operation/incidents/incident.php | 14 +- .../operation/incidents/incident_detail.php | 12 +- .../incidents/list_integriaims_incidents.php | 12 +- .../operation/messages/message_edit.php | 15 +- .../operation/messages/message_list.php | 33 +- .../operation/netflow/nf_live_view.php | 26 +- .../operation/network/network_report.php | 6 +- .../operation/network/network_usage_map.php | 2 +- .../operation/reporting/graph_viewer.php | 61 +- .../operation/reporting/reporting_viewer.php | 55 +- pandora_console/operation/search_agents.php | 12 +- pandora_console/operation/search_helps.php | 2 +- pandora_console/operation/search_main.php | 14 +- pandora_console/operation/search_results.php | 2 +- .../operation/servers/recon_view.php | 10 +- .../operation/snmpconsole/snmp_browser.php | 10 +- .../operation/snmpconsole/snmp_statistics.php | 36 +- .../operation/snmpconsole/snmp_view.php | 97 +- pandora_console/operation/system_alert.php | 4 +- pandora_console/operation/tree.php | 36 +- pandora_console/operation/users/user_edit.php | 12 +- .../operation/users/user_edit_header.php | 14 +- .../users/user_edit_notifications.php | 2 +- .../visual_console/legacy_public_view.php | 6 +- .../operation/visual_console/legacy_view.php | 52 +- .../operation/visual_console/public_view.php | 4 +- .../operation/visual_console/pure_ajax.php | 48 +- .../operation/visual_console/view.php | 49 +- .../vendor/mpdf/mpdf/src/OtlDump.php | 4 +- .../Swift/Plugins/Reporters/HtmlReporter.php | 4 +- pandora_console/views/dashboard/header.php | 45 +- pandora_console/views/dashboard/layout.php | 8 +- pandora_console/views/dashboard/list.php | 12 +- pandora_console/views/dashboard/slides.php | 5 +- .../intel_dcm/extensions/intel_dcm_setup.php | 23 +- pandora_server/util/styles_backup.sh | 24 + 365 files changed, 9571 insertions(+), 3520 deletions(-) mode change 100644 => 100755 pandora_console/images/eye.png rename pandora_console/images/{ => menu}/builder.menu_gray.png (100%) rename pandora_console/images/{ => menu}/builder.menu_white.png (100%) rename pandora_console/images/{ => menu}/extensions.menu_gray.png (100%) rename pandora_console/images/{ => menu}/extensions.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_alerts.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_alerts.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_configuration.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_configuration.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_discovery.menu.png (100%) rename pandora_console/images/{ => menu}/gm_discovery.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_events.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_events.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_library.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_library.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_resources.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_resources.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_servers.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_servers.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_setup.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_setup.menu_white.png (100%) rename pandora_console/images/{ => menu}/gm_users.menu_gray.png (100%) rename pandora_console/images/{ => menu}/gm_users.menu_white.png (100%) rename pandora_console/images/{ => menu}/links.menu_gray.png (100%) rename pandora_console/images/{ => menu}/links.menu_white.png (100%) rename pandora_console/images/{ => menu}/op_events.menu_gray.png (100%) rename pandora_console/images/{ => menu}/op_events.menu_white.png (100%) rename pandora_console/images/{ => menu}/op_monitoring.menu_gray.png (100%) rename pandora_console/images/{ => menu}/op_monitoring.menu_white.png (100%) rename pandora_console/images/{ => menu}/op_network.menu_gray.png (100%) rename pandora_console/images/{ => menu}/op_network.menu_white.png (100%) rename pandora_console/images/{ => menu}/op_reporting.menu_gray.png (100%) rename pandora_console/images/{ => menu}/op_reporting.menu_white.png (100%) rename pandora_console/images/{ => menu}/op_workspace.menu_gray.png (100%) rename pandora_console/images/{ => menu}/op_workspace.menu_white.png (100%) rename pandora_console/images/{ => menu}/um_messages.menu_gray.png (100%) rename pandora_console/images/{ => menu}/um_messages.menu_white.png (100%) mode change 100755 => 100644 pandora_console/images/operation.png create mode 100644 pandora_console/images/user.png delete mode 100644 pandora_console/include/styles/pandora_green_old.css create mode 100644 pandora_console/include/styles/select2_dark.min.css create mode 100644 pandora_console/log/.console.log.swp create mode 100644 pandora_server/util/styles_backup.sh diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 72b9ddb2f9..a1483862f1 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -360,14 +360,14 @@ function mainAgentsModules() $fullscreen['text'] = ''.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).''; + &full_agents_id='.$full_agents.'&selection_agent_module='.$selection_a_m.'">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode'), 'class' => 'invert_filter']).''; } else if ($full_modules_selected[0] && $full_agents_id[0]) { $full_modules = urlencode(implode(';', $full_modules_selected)); $full_agents = urlencode(implode(';', $full_agents_id)); $fullscreen['text'] = ''.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).''; + &full_agents_id='.$full_agents.'&selection_agent_module='.$selection_a_m.'">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode'), 'class' => 'invert_filter']).''; } else { $fullscreen['text'] = ''.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).''; @@ -437,15 +437,15 @@ function mainAgentsModules() // Header. ui_print_page_header( __('Agents/Modules'), - 'images/module_mc.png', + 'images/module.png', false, '', false, $updated_time ); - echo ''; + echo '
    '; echo ''; - echo "'; + echo "'; echo ''; echo '
    ".$fullscreen['text'].' ".$fullscreen['text'].'
    '; } else { @@ -461,7 +461,7 @@ function mainAgentsModules() } // Floating menu - Start. - echo '
    '; + echo '
    '; echo '