Merge branch 'develop' into ent-11126-vulnerability-scanner-interface

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.773.3-231024
+Version: 7.0NG.773.3-231026
 Architecture: all
 Priority: optional
 Section: admin

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.773.3-231024"
+pandora_version="7.0NG.773.3-231026"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -1031,7 +1031,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.773.3';
-use constant AGENT_BUILD => '231024';
+use constant AGENT_BUILD => '231026';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.redhat_bin.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773.3"
-PI_BUILD="231024"
+PI_BUILD="231026"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231024}
+{231026}
 
 ViewReadme
 {Yes}

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.773.3 Build 231024")
+#define PANDORA_VERSION ("7.0NG.773.3 Build 231026")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.773.3(Build 231024))"
+      VALUE "ProductVersion", "(7.0NG.773.3(Build 231026))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773.3-231024
+Version: 7.0NG.773.3-231026
 Architecture: all
 Priority: optional
 Section: admin

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.773.3-231024"
+pandora_version="7.0NG.773.3-231026"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini

@@ -1,4 +1,4 @@
-pandorafms.vmware=459175dce8ab811e874ce2e7216f0db4
+pandorafms.vmware=9959cc3e5cc6bfcfadd6d05b56d4a11b
 pandorafms.mysql=fadb4750d18285c0eca34f47c6aa3cfe
 pandorafms.mssql=1cc215409741d19080269ffba112810e
 pandorafms.oracle=2d9320a514d1e48a0b2804e1653c31c6

pandora_console/extras/mr/66.sql

@@ -164205,7 +164205,13 @@ SET @id_os = 9;
 INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`)
 SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'ID:STATUS' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
 WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
+INSERT INTO tmodule_group (name) SELECT ('Security') WHERE NOT EXISTS (SELECT name FROM tmodule_group WHERE LOWER(name) = 'security');
+
+ALTER TABLE tagente_modulo ADD COLUMN `last_compact` TIMESTAMP NOT NULL DEFAULT 0;
 
 UPDATE `tevent_alert` ea INNER JOIN `tevent_rule` er ON ea.id = er.id_event_alert SET disabled=1 WHERE er.log_agent IS NOT NULL OR er.log_content IS NOT NULL OR er.log_source IS NOT NULL;
 
+ALTER TABLE `tnetwork_explorer_filter`
+MODIFY COLUMN `id` INT NOT NULL AUTO_INCREMENT;
+
 COMMIT;

pandora_console/godmode/agentes/configurar_agente.php

@@ -1361,6 +1361,14 @@ if ($update_module === true || $create_module === true) {
     }
 
     $configuration_data = (string) get_parameter('configuration_data');
+    $array_configuration_data = explode(PHP_EOL, io_safe_output($configuration_data));
+    $configuration_data = '';
+    foreach ($array_configuration_data as $value) {
+        $configuration_data .= trim($value).PHP_EOL;
+    }
+
+    $configuration_data = io_safe_input($configuration_data);
+
     $old_configuration_data = (string) get_parameter('old_configuration_data');
     $new_configuration_data = '';
 
@@ -1501,6 +1509,14 @@ if ($update_module === true || $create_module === true) {
         }
 
         $plugin_parameter = (string) get_parameter('plugin_parameter');
+
+        $array_plugin_parameter = explode(PHP_EOL, io_safe_output($plugin_parameter));
+        $plugin_parameter = '';
+        foreach ($array_plugin_parameter as $value) {
+            $plugin_parameter .= trim($value).PHP_EOL;
+        }
+
+        $plugin_parameter = io_safe_input($plugin_parameter);
     }
 
     $parent_module_id = (int) get_parameter('parent_module_id');

pandora_console/godmode/agentes/module_manager_editor_web.php

@@ -318,7 +318,7 @@ foreach ($texts as $code => $text) {
                 return;
             }
 
-            $(plugin_parameter).val('task_begin\ncookie 0\nresource 0\ntask_end');
+            $(plugin_parameter).val('task_begin\nget https://demoweb.com/page/\ncheck_string text string or HTML code to search (regexp)\ntask_end\n');
 
             $('#button-btn_loadbasic').attr('disabled', 'disabled');
 

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC231024';
+$build_version = 'PC231026';
 $pandora_version = 'v7.0NG.773.3';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions_html.php

@@ -5409,7 +5409,7 @@ function html_print_link_with_params($text, $params=[], $type='text', $style='',
         $formStyle = ' style="'.$formStyle.'"';
     }
 
-    $html = '<form method="POST"'.$formStyle.'>';
+    $html = '<form method="POST"'.$formStyle.' class="link-with-params">';
     switch ($type) {
         case 'image':
             $html .= html_print_input_image($text, $text, $text, $style, true);

pandora_console/include/lib/Dashboard/Widgets/inventory.php

@@ -30,6 +30,8 @@ namespace PandoraFMS\Dashboard;
 
 global $config;
 
+require_once $config['homedir'].'/include/functions_inventory.php';
+
 /**
  * Inventory Widget.
  */
@@ -608,7 +610,7 @@ class InventoryWidget extends Widget
                                     }
                                 }
 
-                                $id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid'];
+                                $id_table = 'id_'.$row['id_module_inventory'].'_'.uniqid().'_'.$nodo['server_uid'];
                                 $table = ui_print_datatable(
                                     [
                                         'id'                  => $id_table,
@@ -619,7 +621,7 @@ class InventoryWidget extends Widget
                                         'no_sortable_columns' => [],
                                         'data_element'        => $data,
                                         'searching'           => true,
-                                        'dom_elements'        => 'frtilp',
+                                        'dom_elements'        => 'rtilp',
                                         'order'               => [
                                             'field'     => $columns[0],
                                             'direction' => 'asc',
@@ -727,7 +729,7 @@ class InventoryWidget extends Widget
                                 }
                             }
 
-                            $id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid'];
+                            $id_table = 'id_'.$row['id_module_inventory'].'_'.uniqid().'_'.$nodo['server_uid'];
 
                             $table = ui_print_datatable(
                                 [
@@ -739,7 +741,7 @@ class InventoryWidget extends Widget
                                     'no_sortable_columns' => [],
                                     'data_element'        => $data,
                                     'searching'           => true,
-                                    'dom_elements'        => 'frtilp',
+                                    'dom_elements'        => 'rtilp',
                                     'order'               => [
                                         'field'     => $columns[0],
                                         'direction' => 'asc',
@@ -893,7 +895,7 @@ class InventoryWidget extends Widget
                                 }
                             }
 
-                            $id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente'];
+                            $id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.uniqid().'_'.$row['id_agente'];
 
                             $table = ui_print_datatable(
                                 [
@@ -905,7 +907,7 @@ class InventoryWidget extends Widget
                                     'no_sortable_columns' => [],
                                     'data_element'        => $data,
                                     'searching'           => true,
-                                    'dom_elements'        => 'frtilp',
+                                    'dom_elements'        => 'rtilp',
                                     'order'               => [
                                         'field'     => $columns[0],
                                         'direction' => 'asc',
@@ -985,7 +987,7 @@ class InventoryWidget extends Widget
                                 array_push($data, $data_tmp);
                             }
 
-                            $id_table = 'id_'.$row['id_module_inventory'];
+                            $id_table = 'id_'.$row['id_module_inventory'].'_'.uniqid();
                         }
 
                         if ($count_rows > 1) {
@@ -999,7 +1001,7 @@ class InventoryWidget extends Widget
                                     'no_sortable_columns' => [],
                                     'data_element'        => $data,
                                     'searching'           => true,
-                                    'dom_elements'        => 'frtilp',
+                                    'dom_elements'        => 'rtilp',
                                     'order'               => [
                                         'field'     => $columns[0],
                                         'direction' => 'asc',
@@ -1035,7 +1037,7 @@ class InventoryWidget extends Widget
                                     'no_sortable_columns' => [],
                                     'data_element'        => $data,
                                     'searching'           => true,
-                                    'dom_elements'        => 'frtilp',
+                                    'dom_elements'        => 'rtilp',
                                     'order'               => [
                                         'field'     => $columns[0],
                                         'direction' => 'asc',
@@ -1098,7 +1100,7 @@ class InventoryWidget extends Widget
                     'columns'         => $columns,
                     'column_names'    => $columns_names,
                     'ordering'        => $ordering,
-                    'dom_elements'    => 'frtilp',
+                    'dom_elements'    => 'rtilp',
                     'searching'       => $searching,
                     'order'           => [
                         'field'     => $columns[0],

pandora_console/include/lib/Dashboard/Widgets/single_graph.php

@@ -300,6 +300,10 @@ class SingleGraphWidget extends Widget
             $values['period'] = SECONDS_1DAY;
         }
 
+        if (isset($values['period_projection']) === false) {
+            $values['period_projection'] = SECONDS_1DAY;
+        }
+
         if (isset($values['showLegend']) === false) {
             $values['showLegend'] = 1;
         }
@@ -439,7 +443,7 @@ class SingleGraphWidget extends Widget
         $trickHight = 0;
         if ($this->values['showLegend'] === 1) {
             // Needed for legend.
-            $trickHight = 40;
+            $trickHight = 60;
         }
 
         $output = '<div class="container-center widget-mrgn-0px">';
@@ -448,10 +452,16 @@ class SingleGraphWidget extends Widget
                 'period'             => $this->values['period'],
                 'date'               => strtotime(date('Y-m-d H:i:s')),
                 'only_image'         => false,
-                'homeurl'            => ui_get_full_url(false, false, false, false).'/',
                 'height'             => ((int) $size['height'] - $trickHight),
                 'landscape'          => $content['landscape'],
                 'return_img_base_64' => true,
+                'show_legend'        => $this->values['showLegend'],
+                'width'              => '100%',
+                'height'             => ((int) $size['height'] - $trickHight),
+                'title'              => $module_name,
+                'unit'               => $units_name,
+                'homeurl'            => $config['homeurl'],
+                'menu'               => false,
             ];
 
             $params_combined = [

pandora_console/include/styles/dashboards.css

@@ -949,3 +949,7 @@ input.resize_button {
   bottom: 3%;
   right: 6%;
 }
+
+.parent_graph > .graph {
+  margin-left: 10px;
+}

pandora_console/include/styles/pandora.css

@@ -1292,6 +1292,11 @@ p.center {
   margin: 0 5px;
 }
 
+.loading-text {
+  font-size: 19px;
+  text-align: center;
+}
+
 /* Legacy spinner */
 #loading {
   position: fixed;

pandora_console/install.php

@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.773.3';
-            $build = '231024';
+            $build = '231026';
             $banner = "v$version Build $build";
             error_reporting(0);
 

pandora_console/operation/agentes/ver_agente.php

@@ -36,6 +36,7 @@ require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_groups.php';
 require_once $config['homedir'].'/include/functions_modules.php';
 require_once $config['homedir'].'/include/functions_users.php';
+require_once $config['homedir'].'/include/functions_inventory.php';
 enterprise_include_once('include/functions_metaconsole.php');
 enterprise_include_once('include/functions_omnishell.php');
 

pandora_console/operation/netflow/nf_live_view.php

@@ -87,7 +87,7 @@ if (is_ajax() === true) {
 $filter_id = (int) get_parameter('filter_id', 0);
 $filter['id_name'] = get_parameter('new_filter_name', '');
 $filter['id_group'] = (int) get_parameter('assign_group', 0);
-$filter['aggregate'] = get_parameter('aggregate', '');
+$filter['aggregate'] = get_parameter('aggregate', 'dstip');
 $filter['ip_dst'] = get_parameter('ip_dst', '');
 $filter['ip_src'] = get_parameter('ip_src', '');
 $filter['dst_port'] = get_parameter('dst_port', '');
@@ -169,7 +169,8 @@ if ($custom_date === '1') {
 $date_from = strtotime($date_init);
 $date_to = strtotime($date_end);
 // Read buttons.
-$draw = get_parameter('draw_button', '');
+// Change default value for not autoload default filter when load view.
+$draw = get_parameter('draw_button', 1);
 $save = get_parameter('save_button', '');
 $update = get_parameter('update_button', '');
 
@@ -663,6 +664,7 @@ if (empty($draw) === false) {
         // Draw the netflow chart.
         html_print_div(
             [
+                'id'      => 'container_netflow',
                 'class'   => $netflowContainerClass,
                 'content' => netflow_draw_item(
                     $date_from,
@@ -677,6 +679,22 @@ if (empty($draw) === false) {
                 ),
             ]
         );
+        $spinner = html_print_div(
+            [
+                'content' => '<span></span>',
+                'class'   => 'spinner-fixed inherit',
+                'style'   => 'position: initial;',
+            ],
+            true
+        );
+        html_print_div(
+            [
+                'id'      => 'spinner',
+                'content' => '<p class="loading-text">'.__('Loading netflow data, please wait...').'</p>'.$spinner,
+                'class'   => 'invisible',
+                'style'   => 'position: initial;',
+            ]
+        );
     }
 } else {
     ui_print_info_message(__('No data to show'));
@@ -934,6 +952,11 @@ ui_include_time_picker();
                 $('#filter_group_color').css('color', '#000000');
             }
         });
+
+        $("#button-draw_button").on('click', function(){
+            $("#container_netflow").remove();
+            $("#spinner").removeClass("invisible");
+        });
     });
     
     $("#text-time, #text-time_lower").timepicker({

pandora_console/operation/network/network_report.php

@@ -135,11 +135,53 @@ if ($advanced_filter !== '') {
     $filter['advanced_filter'] = $advanced_filter;
 }
 
+$filter_name = get_parameter('filter_name');
+
 $order_by = get_parameter('order_by', 'bytes');
 if (!in_array($order_by, ['bytes', 'pkts', 'flows'])) {
     $order_by = 'bytes';
 }
 
+
+$save = get_parameter('save_button', '');
+$update = get_parameter('update_button', '');
+
+// Save user defined filter.
+if ($save != '' && check_acl($config['id_user'], 0, 'AW')) {
+    // Save filter args.
+    $data['filter_name'] = $filter_name;
+    $data['top'] = $top;
+    $data['action'] = $action;
+    $data['advanced_filter'] = $advanced_filter;
+
+
+    $filter_id = db_process_sql_insert('tnetwork_explorer_filter', $data);
+    if ($filter_id === false) {
+        $filter_id = 0;
+        ui_print_error_message(__('Error creating filter'));
+    } else {
+        ui_print_success_message(__('Filter created successfully'));
+    }
+} else if ($update != '' && check_acl($config['id_user'], 0, 'AW')) {
+    // Update current filter.
+    // Do not update the filter name and group.
+    $data['top'] = $top;
+    $data['action'] = $action;
+    $data['advanced_filter'] = $advanced_filter;
+
+    $result = db_process_sql_update(
+        'tnetwork_explorer_filter',
+        $data,
+        ['id' => $filter_id]
+    );
+    ui_print_result_message(
+        $result,
+        __('Filter updated successfully'),
+        __('Error updating filter')
+    );
+}
+
+
 // Build the table.
 $filterTable = new stdClass();
 $filterTable->id = '';
@@ -176,6 +218,59 @@ $filterTable->data[0][1] = html_print_label_input_block(
     html_print_select_date_range('date', true)
 );
 
+$filterTable->data[1][0] = html_print_label_input_block(
+    __('Data to show'),
+    html_print_select(
+        network_get_report_actions(),
+        'action',
+        $action,
+        '',
+        '',
+        0,
+        true
+    )
+);
+
+$advanced_toggle = new stdClass();
+$advanced_toggle->class = 'filter-table-adv';
+$advanced_toggle->size = [];
+$advanced_toggle->size[0] = '50%';
+$advanced_toggle->size[1] = '50%';
+$advanced_toggle->width = '100%';
+$user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true);
+$user_groups[0] = 0;
+// Add all groups.
+$sql = 'SELECT * FROM tnetwork_explorer_filter';
+$advanced_toggle->data[0][0] = html_print_label_input_block(
+    __('Load Filter'),
+    html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true, false, true, false, 'width:100%;')
+);
+$advanced_toggle->data[0][1] = html_print_label_input_block(
+    __('Filter name'),
+    html_print_input_text('filter_name', $filter_name, false, 40, 45, true, false, false, '', 'w100p')
+);
+$advanced_toggle->colspan[1][0] = 2;
+$advanced_toggle->data[1][0] = html_print_label_input_block(
+    __('Filter').ui_print_help_icon('pcap_filter', true),
+    html_print_textarea('advanced_filter', 4, 10, $advanced_filter, 'style="width:100%"', true)
+);
+$filterTable->colspan[2][0] = 3;
+$filterTable->data[2][0] = html_print_label_input_block(
+    '',
+    ui_toggle(
+        html_print_table($advanced_toggle, true),
+        __('Advanced'),
+        '',
+        '',
+        true,
+        true,
+        '',
+        'white-box-content',
+        'box-flat white_table_graph'
+    )
+);
+
+
 $filterInputTable = '<form method="POST">';
 $filterInputTable .= html_print_input_hidden('order_by', $order_by);
 $filterInputTable .= html_print_table($filterTable, true);
@@ -262,12 +357,16 @@ $data = netflow_get_top_summary(
 
 // Get the params to return the builder.
 $hidden_main_link = [
-    'time_greater' => $time_greater,
+    'custom_date' => get_parameter('custom_date', '0'),
-    'date_greater' => $date_greater,
+    'date'        => get_parameter('date', SECONDS_1DAY),
-    'time_lower'   => $time_lower,
+    'date_init'   => get_parameter('date_init'),
-    'date_lower'   => $date_lower,
+    'time_init'   => get_parameter('time_init'),
-    'top'          => $top,
+    'date_end'    => get_parameter('date_end'),
-    'action'       => $action,
+    'time_end'    => get_parameter('time_end'),
+    'date_text'   => get_parameter('date_text'),
+    'date_units'  => get_parameter('date_units'),
+    'top'         => $top,
+    'action'      => $action,
 ];
 
 unset($table);
@@ -449,6 +548,7 @@ if (empty($data)) {
     // Print results.
     html_print_div(
         [
+            'id'      => 'content-netflow',
             'style'   => 'max-width: -webkit-fill-available; display: flex',
             'class'   => '',
             'content' => $resultsTable.$pieGraph,
@@ -456,11 +556,25 @@ if (empty($data)) {
     );
 }
 
+$spinner = html_print_div(
+    [
+        'content' => '<span></span>',
+        'class'   => 'spinner-fixed inherit',
+        'style'   => 'position: initial;',
+    ],
+    true
+);
+html_print_div(
+    [
+        'id'      => 'spinner',
+        'content' => '<p class="loading-text">'.__('Loading netflow data, please wait...').'</p>'.$spinner,
+        'class'   => 'invisible',
+        'style'   => 'position: initial;',
+    ]
+);
 ?>
 <script>
 $(document).ready(function(){
-    nf_view_click_period();
-
     $('#filter_id').change(function(){
         jQuery.post (
         "ajax.php",
@@ -473,9 +587,42 @@ $(document).ready(function(){
             $('#action').val(data.action).trigger('change');
             $('#top').val(data.top).trigger('change');
             $('#textarea_advanced_filter').val(data.advanced_filter);
+            $('#text-filter_name').val(data.filter_name);
             $('select#filter_id').select2('close');
         }, 'json');
     });
+
+    $('#button-update').on('click', function(){
+        if ($('.info_box_information').length > 0) {
+            $('.info_box_information').remove();
+        }
+        if ($('#content-netflow').length > 0) {
+            $('#content-netflow').remove();
+        }
+        if ($('#spinner').length > 0) {
+            $('#spinner').removeClass("invisible");
+        }
+        if ($('.link-with-params').length > 0) {
+            $('.link-with-params').remove();
+        }
+    });
+
+    $('.link-with-params').on('submit', function(e){
+        setTimeout(() => {
+            if ($('.info_box_information').length > 0) {
+                $('.info_box_information').remove();
+            }
+            if ($('#content-netflow').length > 0) {
+                $('#content-netflow').remove();
+            }
+            if ($('#spinner').length > 0) {
+                $('#spinner').removeClass("invisible");
+            }
+            if ($('.link-with-params').length > 0) {
+                $('.link-with-params').remove();
+            }
+        }, 100); // Prevent fields from being deleted before being sent.
+    })
 });
 
 // Configure jQuery timepickers.

pandora_console/operation/network/network_usage_map.php

@@ -336,7 +336,7 @@ ui_toggle(
 
 $has_data = false;
 
-if ((bool) get_parameter('update_netflow') === true) {
+if ((bool) get_parameter('update_netflow', 1) === true) {
     $map_data = netflow_build_map_data(
         $date_from,
         $date_to,
@@ -354,6 +354,23 @@ if ($has_data === true) {
     ui_print_info_message(__('No data to show'));
 }
 
+$spinner = html_print_div(
+    [
+        'content' => '<span></span>',
+        'class'   => 'spinner-fixed inherit',
+        'style'   => 'position: initial;',
+    ],
+    true
+);
+html_print_div(
+    [
+        'id'      => 'spinner',
+        'content' => '<p class="loading-text">'.__('Loading netflow data, please wait...').'</p>'.$spinner,
+        'class'   => 'invisible',
+        'style'   => 'position: initial;',
+    ]
+);
+
 ?>
 <style>
     .networkconsole {
@@ -363,7 +380,6 @@ if ($has_data === true) {
 <script>
 
 $(document).ready(function(){
-    nf_view_click_period();
 
     $('#filter_id').change(function(){
         jQuery.post (
@@ -380,6 +396,12 @@ $(document).ready(function(){
             $('select#filter_id').select2('close');
         }, 'json');
     });
+
+    $('#button-update_netflow').on('click', function(){
+        $('.info_box_information').remove();
+        $('.networkconsole').remove();
+        $('#spinner').removeClass("invisible");
+    });
 });
 
 // Configure jQuery timepickers.

pandora_console/pandora_console.redhat.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -277,6 +277,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
   `warning_time` INT UNSIGNED DEFAULT 0,
   `quiet_by_downtime` TINYINT NOT NULL DEFAULT 0,
   `disabled_by_downtime` TINYINT NOT NULL DEFAULT 0,
+  `last_compact` TIMESTAMP NOT NULL DEFAULT 0,
   PRIMARY KEY  (`id_agente_modulo`),
   KEY `main_idx` (`id_agente_modulo`,`id_agente`),
   KEY `tam_agente` (`id_agente`),
@@ -4473,7 +4474,7 @@ CREATE TABLE IF NOT EXISTS `tdiscovery_apps_tasks_macros` (
 -- Table `tnetwork_explorer_filter`
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tnetwork_explorer_filter` (
-  `id` INT NOT NULL,
+  `id` INT NOT NULL auto_increment,
   `filter_name` VARCHAR(45) NULL,
   `top` VARCHAR(45) NULL,
   `action` VARCHAR(45) NULL,

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773.3-231024
+Version: 7.0NG.773.3-231026
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/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.773.3-231024"
+pandora_version="7.0NG.773.3-231026"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "231024";
+my $pandora_build = "231026";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -296,9 +296,9 @@ sub pandora_load_config {
 	$pa_config->{"update_parent"} = 0; # 3.1
 	$pa_config->{"google_maps_description"} = 0;
 	$pa_config->{'openstreetmaps_description'} = 0;
-	$pa_config->{"eventserver"} = 1; # 4.0
+	$pa_config->{"eventserver"} = 0; # 4.0
 	$pa_config->{"eventserver_threads"} = 1; # 4.0
-	$pa_config->{"logserver"} = 1; # 7.774
+	$pa_config->{"logserver"} = 0; # 7.774
 	$pa_config->{"logserver_threads"} = 1; # 7.774
 	$pa_config->{"event_window"} = 3600; # 4.0
 	$pa_config->{"log_window"} = 3600; # 7.741
@@ -513,7 +513,7 @@ sub pandora_load_config {
 	$pa_config->{"clean_wux_sessions"} = 1; # 7.0.746 (only selenium 3)
 
 	# Syslog Server
-	$pa_config->{"syslogserver"} = 1; # 7.0.716
+	$pa_config->{"syslogserver"} = 0; # 7.0.716
 	$pa_config->{"syslog_file"} = '/var/log/messages/'; # 7.0.716
 	$pa_config->{"syslog_max"} = 65535; # 7.0.716
 	$pa_config->{"syslog_threads"} = 4; # 7.0.716

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "231024";
+my $pandora_build = "231026";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     231024
+%define release     231026
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773.3"
-PI_BUILD="231024"
+PI_BUILD="231026"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -26,6 +26,9 @@ use POSIX qw(strftime);
 use File::Path qw(rmtree);
 use Time::HiRes qw(usleep);
 
+use List::Util qw(min);
+use List::Util qw(sum);
+
 # Default lib dir for RPM and DEB packages
 BEGIN { push @INC, '/usr/lib/perl5'; }
 
@@ -35,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 231024";
+my $version = "7.0NG.773.3 Build 231026";
 
 # Pandora server configuration
 my %conf;
@@ -443,116 +446,187 @@ sub pandora_purgedb ($$$) {
 ###############################################################################
 # Compact agent data.
 ###############################################################################
-sub pandora_compactdb ($$$) {
+sub pandora_compactdb {
-	my ($conf, $dbh, $dbh_conf) = @_;
+    my ($conf, $dbh, $dbh_conf) = @_;
 
-	my %count_hash;
+    my $total_modules = get_db_value($dbh, "SELECT COUNT(id_agente_modulo) FROM tagente_modulo");
-	my %id_agent_hash;
-	my %value_hash;
-	my %module_proc_hash;
 
-	return if ($conf->{'_days_compact'} == 0 || $conf->{'_step_compact'} < 1);
+    # Interval in hours to compact.
+    my $compaction_interval = 24;
+    my $compaction_factor = (3600 * $compaction_interval) / 300;
+
+	# Number of agents to be proceced on this execution
+    my $agents_limit = int($total_modules / $compaction_factor);
+
+    my $last_compact_offset = pandora_get_config_value($dbh, "last_compact_offset");
+
+    unless ($last_compact_offset) {
+        db_do($dbh, "INSERT INTO tconfig (token, value) VALUES ('last_compact_offset', '0')");
+        $last_compact_offset = 0;
+    }
+
+	# Obtain a group of modules to compact.
+    my @module_groups = get_db_rows(
+		$dbh, 
+		'SELECT id_agente_modulo, id_tipo_modulo, UNIX_TIMESTAMP(last_compact) as last_compact FROM tagente_modulo WHERE id_agente_modulo > ? LIMIT ?',
+        $last_compact_offset, 
+		$agents_limit
+	);
+
+	# Compact the group of modules.
+	my $starting_time = time();
+	pandora_compact_modules($dbh, $conf, @module_groups);
+	my $ending_time = time();
+	log_message('COMPACT', "Time taken: " . ($ending_time - $starting_time) . " seconds.");
+
+	# Add the offset.
+    $last_compact_offset += $agents_limit;
+
+	# If the offset is higher than the max module start again
+    $last_compact_offset = 0 if ($last_compact_offset >= $total_modules);
+
+	# Save the new offset
+    db_do($dbh, "UPDATE tconfig SET value = ? WHERE token = 'last_compact_offset'", $last_compact_offset);
+}
+
+sub pandora_compact_modules {
+	my ($dbh, $conf, @module_groups) = @_;
+
+	# Obtain the minimun last compact from the block
+	my $min_compact = min(map { $_->{"last_compact"} } @module_groups);
+
+	# if the min has not been setted
+	if($min_compact == 0){
+		$min_compact = get_db_value(
+			$dbh, 
+			'SELECT MIN(td.utimestamp) 
+		 	 FROM tagente_datos td, tagente_modulo tm 
+		     WHERE td.id_agente_modulo = tm.id_agente_modulo
+		     AND tm.id_tipo_modulo not in (2, 6, 9, 18, 21, 31, 35, 100)
+		 	 AND td.id_agente_modulo BETWEEN ? AND ?', 
+			$module_groups[0]->{"id_agente_modulo"}, $module_groups[-1]->{"id_agente_modulo"}
+		);		
+	}
+
+	# One week of data of data as max from the last min compact.
+	my $max_compact = $min_compact + (60 * 60 * 24 * 7);
+
+	# If the last compact is on the future set the current time as max.
+	$max_compact = time() if($max_compact > time());
+
+	log_message('COMPACT', "Compacting data of agents agents $module_groups[0]->{'id_agente_modulo'} to $module_groups[-1]->{'id_agente_modulo'}, data between " . strftime('%Y-%m-%d %H:%M:%S', localtime($min_compact)) . " and " . strftime('%Y-%m-%d %H:%M:%S', localtime($max_compact)));
+
+	# Obtain all the data from the interval to avoid multiple requests
+	# Avoid pull data from modules that should be skipped.
+	my @data = get_db_rows (
+		$dbh, 
+		'SELECT td.id_agente_modulo, td.datos, td.utimestamp 
+		 FROM tagente_datos td, tagente_modulo tm 
+		 WHERE td.id_agente_modulo = tm.id_agente_modulo
+		 AND tm.id_tipo_modulo not in (2, 6, 9, 18, 21, 31, 35, 100)
+		 AND td.utimestamp < ? AND td.utimestamp >= ? 
+		 AND td.id_agente_modulo BETWEEN ? AND ?
+		', 
+		$max_compact, $min_compact, $module_groups[0]->{"id_agente_modulo"}, $module_groups[-1]->{"id_agente_modulo"}
+	);
+
+	my $total_data = scalar(@data);
+	my $proceced_total_data = 0;
+	my $progress = 0;
+	my $compactations = 0;
 
 	# Convert compact interval length from hours to seconds
 	my $step = $conf->{'_step_compact'} * 3600;
 
-	# The oldest timestamp will be the lower limit
+	# Max. 168 steps or 7 days in one hour steps. 
-	my $limit_utime = get_db_value ($dbh, 'SELECT min(utimestamp) as min FROM tagente_datos');
+    # This avoids blocking of old modules without last compact
-	return unless (defined ($limit_utime) && $limit_utime > 0);
+    my $step_limit = 24 * 7; 
 
-	# Calculate the start date
+	# Compact the modules in this block
-	my $start_utime = time() - $conf->{'_days_compact'} * 24 * 60 * 60;
+	foreach my $module (@module_groups) {
-	my $last_compact = $start_utime;
+		$progress = $total_data == 0 ? 0 : ($proceced_total_data / $total_data) * 100;
-	my $stop_utime;
+		printf(strftime("\r" . "%H:%M:%S", localtime()) . ' [COMPACT] ' . "Progress: %.2f%%", $progress);
 		
-	# Do not compact the same data twice!
+		my $id = $module->{"id_agente_modulo"};  
-	if (defined ($conf->{'_last_compact'}) && $conf->{'_last_compact'} > $limit_utime) {
+		my $module_type = $module->{"id_tipo_modulo"}; 
-		$limit_utime  = $conf->{'_last_compact'};
-	}
 
-	if ($start_utime <= $limit_utime || ( defined ($conf->{'_last_compact'}) && (($conf->{'_last_compact'} + 24 * 60 * 60) > $start_utime))) {
+        next unless defined ($module_type);
-		log_message ('COMPACT', "Data already compacted.");
+        next if ($module_type == 2 || $module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 21 || $module_type == 31 || $module_type == 35 || $module_type == 100);
-		return;
-	}
 
-	log_message ('COMPACT', "Compacting data from " . strftime ("%Y-%m-%d %H:%M:%S", localtime($limit_utime)) . " to " . strftime ("%Y-%m-%d %H:%M:%S", localtime($start_utime)) . '.', '');
+		# Obtain the data just for this module
+		my @module_data = grep { $_->{"id_agente_modulo"} == $id } @data;
+		my $total_elements = scalar(@module_data);
 
-	# Prepare the query to retrieve data from an interval
+		# No data for this module.
-	while (1) {
+		next if ($total_elements == 0);
 
-			# Calculate the stop date for the interval
+		# Obtain the last compact of this module to avoid compact something previously compacted
-			$stop_utime = $start_utime - $step;
+		my $last_compact = $module ->{"last_compact"};
 
-			# Out of limits
+		# In case that the last compact has not been defined take the minimun data as last compact
-			last if ($start_utime < $limit_utime);
+		$last_compact = min(map { $_->{"utimestamp"} } @module_data)-1 if($last_compact == 0);
 
-			# Mark the progress
+		# Create an array to store INSERT commands
-			log_message ('', ".");
+		my @insert_commands;
+	 	my $insert_command = 'INSERT INTO tagente_datos (id_agente_modulo, datos, utimestamp) VALUES (?, ?, ?)';
 		
-			my @data = get_db_rows ($dbh, 'SELECT * FROM tagente_datos WHERE utimestamp < ? AND utimestamp >= ?', $start_utime, $stop_utime);
+		my $step_number = 0;
-			# No data, move to the next interval
+		my $first_compact = $last_compact;
-			if ($#data == 0) {
+		
-				$start_utime = $stop_utime;
+		# Compact using the steps
+		while($step_number < $step_limit){
+            
+			my $next_compact = $last_compact + $step;
+			
+			last if($next_compact > time());
+
+			# Obtain the data between the last compact and the next step.
+			my @data_in_range = grep { $_->{"utimestamp"} > $last_compact && $_->{"utimestamp"} <= $next_compact } @module_data;
+
+            my $total_range_elements = scalar(@data_in_range);
+
+            # Nothing to compress, skip this step.
+			if($total_range_elements == 0){
+				$last_compact = $next_compact;
 				next;
 			}
 
-			# Get interval data
+			my $total_data = sum(map { $_->{"datos"} } @data_in_range);
-			foreach my $data (@data) {
-				my $id_module = $data->{'id_agente_modulo'};
-				if (! defined($module_proc_hash{$id_module})) {
-					my $module_type = get_db_value ($dbh, 'SELECT id_tipo_modulo FROM tagente_modulo WHERE id_agente_modulo = ?', $id_module);
-					next unless defined ($module_type);
 
-					# Mark proc modules.
+			my $avg = $total_data / $total_range_elements;
-					if ($module_type == 2 || $module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 21 || $module_type == 31 || $module_type == 35 || $module_type == 100) {
-						$module_proc_hash{$id_module} = 1;
-					}
-					else {
-						$module_proc_hash{$id_module} = 0;
-					}
-				}
 
-				# Skip proc modules!
+			$proceced_total_data += $total_range_elements;
-				next if ($module_proc_hash{$id_module} == 1);
 			
-				if (! defined($value_hash{$id_module})) {
+    		push @insert_commands, [$insert_command, $id, $avg, int($last_compact + ($step / 2))];
-					$value_hash{$id_module} = 0;
-					$count_hash{$id_module} = 0;
 
-					if (! defined($id_agent_hash{$id_module})) {
+			$last_compact = $next_compact;
-						$id_agent_hash{$id_module} = $data->{'id_agente'};
-					}
-				}
 			
-				$value_hash{$id_module} += $data->{'datos'};
+            $step_number +=1;
-				$count_hash{$id_module}++;
+			# Small sleep to don't burn the DB
-			}
+			usleep (1000); 
  
-			# Delete interval from the database
+		}
-			db_do ($dbh, 'DELETE ad FROM tagente_datos ad
-				INNER JOIN tagente_modulo am ON ad.id_agente_modulo = am.id_agente_modulo AND am.id_tipo_modulo NOT IN (2,6,9,18,21,31,35,100)
-				WHERE ad.utimestamp < ? AND ad.utimestamp >= ?', $start_utime, $stop_utime);
 
-			# Insert interval average value
+		$dbh->begin_work;
-			foreach my $key (keys(%value_hash)) {
-				$value_hash{$key} /= $count_hash{$key};
-				db_do ($dbh, 'INSERT INTO tagente_datos (id_agente_modulo, datos, utimestamp) VALUES (?, ?, ?)', $key, $value_hash{$key}, $stop_utime);
-				delete($value_hash{$key});
-				delete($count_hash{$key});
-			}
 
-			usleep (1000); # Very small usleep, just to don't burn the DB
+		db_do ($dbh, 'DELETE FROM tagente_datos WHERE utimestamp > ? AND utimestamp <= ? AND id_agente_modulo = ?', $first_compact, $last_compact, $id);
-			# Move to the next interval
+
-			$start_utime = $stop_utime;
+		# Execute the INSERT commands
+		foreach my $command (@insert_commands) {
+			my ($sql, @params) = @$command;
+			db_do($dbh, $sql, @params);
+		}
+
+		$dbh->commit;
+		# Update the last compacted timestamp.
+		db_do($dbh, "UPDATE tagente_modulo SET last_compact = FROM_UNIXTIME(?) WHERE id_agente_modulo = ?", $last_compact, $module ->{"id_agente_modulo"});
+		$compactations += $step_number;
 	}
-	log_message ('', "\n");
 
-	# Mark the last compact date
+	printf(strftime("\r" . "%H:%M:%S", localtime()) . ' [COMPACT] ' . "Progress: %.2f%%", 100);
-	if (defined ($conf->{'_last_compact'})) {
+	print("\n");
-		db_do ($dbh_conf, 'UPDATE tconfig SET value=? WHERE token=?', $last_compact, 'last_compact');
+	log_message('COMPACT', "A total of $proceced_total_data elements has been compacted into $compactations elements");
-	} else {
+
-		db_do ($dbh_conf, 'INSERT INTO tconfig (value, token) VALUES (?, ?)', $last_compact, 'last_compact');
-	}
 }
 
 ########################################################################
@@ -1234,9 +1308,8 @@ sub pandoradb_main {
 	# Only active database should be compacted. Disabled for historical database.
 	# Compact on if enable and DaysCompact are below DaysPurge 
 	if (($conf->{'_onlypurge'} == 0)
-		&& ($conf->{'_days_compact'} < $conf->{'_days_purge'})
 	) {
-		pandora_compactdb ($conf, defined ($history_dbh) ? $history_dbh : $dbh, $dbh);
+		pandora_compactdb ($conf, $dbh, $dbh);
 	}
 
 	# Update tconfig with last time of database maintance time (now)

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.773.3 Build 231024";
+my $version = "7.0NG.773.3 Build 231026";
 
 # save program name for logging
 my $progname = basename($0);