'.html_print_input_text_extended(
'fullname',
$user_info['fullname'],
@@ -1931,24 +1938,87 @@ if (is_metaconsole() === false) {
}
});
});
-
+
$('input:image[name="del"]').click(function(e) {
- if ($(json_profile).length > 0) return;
- if (!confirm('Are you sure?')) return;
- e.preventDefault();
- var rows = $("#table_profiles tr").length;
- if (((is_metaconsole === '1' && rows <= 4) || (is_metaconsole === '' && rows <= 3)) && user_is_global_admin !== '1') {
- if (!confirm('' + '. ' + '')) {
- return;
- }
- }
+
+ var rows = $("#table_profiles tr").length;
+ let deleteuser = 0;
+ e.preventDefault();
var id_user_profile = $(this).siblings();
id_user_profile = id_user_profile[1].value;
var row = $(this).closest('tr');
+ if (((is_metaconsole === '1' && rows <= 3) || (is_metaconsole !== '1' && rows <= 3)) && user_is_global_admin !== '1') {
+ $("#delete_profile_modal")
+ .empty()
+ .html("");
+ // Set the title.
+ $("#delete_profile_modal").prop("title", "");
+ // Build the dialog for show the mesage.
+ $("#delete_profile_modal").dialog({
+ resizable: true,
+ draggable: true,
+ modal: true,
+ width: 500,
+ buttons: [
+ {
+ text: "Cancel",
+ click: function() {
+ $(this).dialog("close");
+ return false;
+ }
+ },
+ {
+ text: "Delete",
+ click: function() {
+ $(this).dialog("close");
+ deleteuser = 1;
+ delete_user_profile(id_user_profile, row, id_user, deleteuser);
+ }
+ },
+ {
+ text: "Preserve",
+ click: function() {
+ $(this).dialog("close");
+ deleteuser = 0;
+ delete_user_profile(id_user_profile, row, id_user, deleteuser)
+ }
+ }
+ ],
+ overlay: {
+ opacity: 0.5,
+ background: "black"
+ },
+ closeOnEscape: false,
+ open: function(event, ui) {
+ $(".ui-dialog-titlebar-close").hide();
+ }
+ });
+ } else {
+ if (((is_metaconsole === '1' && rows <= 3) || (is_metaconsole === '' && rows <= 3)) && user_is_global_admin !== '1') {
+ if (!confirm('' + '. ' + '')) {
+ return false;
+ } else {
+ delete_user_profile(id_user_profile, row, id_user, deleteuser);
+ }
+ } else {
+ if (!confirm('Are you sure?')) {
+ return false;
+ } else {
+ delete_user_profile(id_user_profile, row, id_user, deleteuser);
+ }
+ }
+ }
+
+ if ($(json_profile).length > 0) return;
+ });
+
+ function delete_user_profile(id_user_profile, row, id_user, deleteuser){
var params = [];
params.push("delete_profile=1");
+ params.push("edit_user=1");
+ params.push("delete_user=" + deleteuser);
params.push("id_user=" + id_user);
params.push("id_user_profile=" + id_user_profile);
params.push("page=godmode/users/configure_user");
@@ -1959,15 +2029,14 @@ if (is_metaconsole() === false) {
success: function(data) {
row.remove();
var rows = $("#table_profiles tr").length;
-
- if (is_metaconsole === '' && rows <= 2 && user_is_global_admin !== '1') {
+ if (is_metaconsole === '' && rows <= 2 && user_is_global_admin !== '1' && deleteuser == '1') {
window.location.replace("");
- } else if (is_metaconsole === '1' && rows <= 3 && user_is_global_admin !== '1') {
+ } else if (is_metaconsole === '1' && rows <= 2 && user_is_global_admin !== '1' && deleteuser == '1') {
window.location.replace("");
}
}
});
- });
+ }
function checkProfiles(e) {
e.preventDefault();
diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index ab6269d0b8..b1212c11ec 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -81,6 +81,11 @@ $customHomeScreenAddition[HOME_SCREEN_DASHBOARD] = html_print_select(
false,
'width: 100%'
);
+// Home screen. Visual consoles.
+$customHomeScreenAddition[HOME_SCREEN_VISUAL_CONSOLE] = html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true, false, true, 'w100p', false, 'width: 100%');
+// Home screen. External link and Other.
+$customHomeScreenAddition[HOME_SCREEN_EXTERNAL_LINK] = html_print_input_text('data_section_external', $user_info['data_section'], '', 60, 255, true);
+$customHomeScreenAddition[HOME_SCREEN_OTHER] = html_print_input_text('data_section_other', $user_info['data_section'], '', 60, 255, true);
$layouts = visual_map_get_user_layouts($config['id_user'], true);
$layouts_aux = [];
@@ -859,50 +864,56 @@ $userManagementTable->data['fields_addSettings'][0] = html_print_textarea(
''
);
-$userManagementTable->data['captions_addSettings'][1] = __('Login allowed IP list');
-$userManagementTable->data['fields_addSettings'][1] = html_print_div(
- [
- 'class' => 'edit_user_allowed_ip',
- 'content' => html_print_textarea(
- 'allowed_ip_list',
- 5,
- 65,
- ($user_info['allowed_ip_list'] ?? ''),
- (((bool) $view_mode === true) ? 'readonly="readonly"' : ''),
- true
- ),
- ],
- true
-);
+if (users_is_admin($config['id_user']) === true || (bool) check_acl($config['id_user'], 0, 'PM') === true) {
+ $allowAllIpsContent = [];
+ $allowAllIpsContent[] = '
'.__('Enable IP allowlist').'';
+ $allowAllIpsContent[] = html_print_div(
+ [
+ 'content' => html_print_checkbox_switch(
+ 'allowed_ip_active',
+ 0,
+ ($user_info['allowed_ip_active'] ?? 0),
+ true,
+ false,
+ 'handleIpAllowlist(this)'
+ ),
+ ],
+ true
+ );
-$userManagementTable->data['fields_addSettings'][1] .= ui_print_input_placeholder(
- __('Add the source IPs that will allow console access. Each IP must be separated only by comma. * allows all.'),
- true
-);
+ $userManagementTable->data['captions_addSettings'][1] = html_print_div(
+ [
+ 'class' => 'margin-top-10',
+ 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;',
+ 'content' => implode('', $allowAllIpsContent),
+ ],
+ true
+ );
-$allowAllIpsContent = [];
-$allowAllIpsContent[] = '
'.__('Allow all IPs').'';
-$allowAllIpsContent[] = html_print_div(
- [
- 'content' => html_print_checkbox_switch(
- 'allowed_ip_active',
- 0,
- ($user_info['allowed_ip_active'] ?? 0),
- true
- ),
- ],
- true
-);
-
-$userManagementTable->data['fields_addSettings'][1] .= html_print_div(
- [
- 'class' => 'margin-top-10',
- 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;',
- 'content' => implode('', $allowAllIpsContent),
- ],
- true
-);
+ $userManagementTable->data['fields_addSettings'][1] .= html_print_div(
+ [
+ 'class' => 'edit_user_allowed_ip '.(((int) $user_info['allowed_ip_active'] === 1) ? '' : 'invisible'),
+ 'content' => html_print_textarea(
+ 'allowed_ip_list',
+ 5,
+ 65,
+ ($user_info['allowed_ip_list'] ?? ''),
+ (((bool) $view_mode === true) ? 'readonly="readonly"' : ''),
+ true
+ ),
+ ],
+ true
+ );
+ $userManagementTable->data['fields_addSettings'][1] .= ui_print_input_placeholder(
+ __('Add the source IPs that will allow console access. Each IP must be separated only by comma. * allows all.'),
+ true,
+ [
+ 'id' => 'info_allowed_ip',
+ 'class' => ((int) $user_info['allowed_ip_active'] === 1) ? 'input_sub_placeholder' : 'input_sub_placeholder invisible',
+ ]
+ );
+}
if ($config['ITSM_enabled'] && $config['ITSM_user_level_conf']) {
// Pandora ITSM user remote login.
@@ -1040,4 +1051,14 @@ $(document).ready(function () {
}
})
});
+
+function handleIpAllowlist(e){
+ if(e.checked === true) {
+ $('.edit_user_allowed_ip').show();
+ $('#info_allowed_ip').show();
+ } else {
+ $('.edit_user_allowed_ip').hide();
+ $('#info_allowed_ip').hide();
+ }
+}
\ No newline at end of file
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index b93d51b522..f3e6627388 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1168,7 +1168,9 @@ if (check_login()) {
);
}
+ $data[2] .= '
';
$data[2] .= ui_print_truncate_text($module['nombre'], 'module_medium', false, true, true, '…', 'font-size: 9pt;');
+ $data[2] .= '';
if (empty($module['extended_info']) === false) {
$data[2] .= ui_print_help_tip($module['extended_info'], true, '/images/default_list.png');
}
diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php
index e55566f469..70c1ff9e3c 100644
--- a/pandora_console/include/class/AgentsAlerts.class.php
+++ b/pandora_console/include/class/AgentsAlerts.class.php
@@ -457,9 +457,7 @@ class AgentsAlerts extends HTML
$template2 = get_parameter('template');
$module_action_threshold = get_parameter('module_action_threshold');
$action_select = get_parameter('action_select', 0);
-
- $id_alert = alerts_create_alert_agent_module($this->create_alert, $template2);
-
+ $id_alert = alerts_create_alert_agent_module($this->createAlert, $template2);
if ($id_alert !== false) {
if ($action_select != 0) {
$values = [];
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index aa5d5995af..ea3caaf276 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -737,7 +737,7 @@ class Diagnostics extends Wizard
$cpuModelName = 'cat /proc/cpuinfo | grep "model name" | tail -1 | cut -f 2 -d ":"';
$cpuProcessor = 'cat /proc/cpuinfo | grep "processor" | wc -l';
$ramMemTotal = 'cat /proc/meminfo | grep "MemTotal"';
-
+ $distroInfo = 'cat /etc/os-release | grep "PRETTY_NAME" | cut -f 2 -d "="';
exec(
"ifconfig | awk '{ print $2}' | grep -E -o '([0-9]{1,3}[\.]){3}[0-9]{1,3}'",
$output
@@ -756,6 +756,10 @@ class Diagnostics extends Wizard
'name' => __('RAM'),
'value' => exec($ramMemTotal),
],
+ 'distroInfo' => [
+ 'name' => __('Distro'),
+ 'value' => str_replace('"', '', exec($distroInfo)),
+ ],
'osInfo' => [
'name' => __('Os'),
'value' => exec('uname -a'),
diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php
index 3b49e1a56f..dec741c3f0 100644
--- a/pandora_console/include/class/WelcomeWindow.class.php
+++ b/pandora_console/include/class/WelcomeWindow.class.php
@@ -372,7 +372,7 @@ class WelcomeWindow extends Wizard
$flag_um = true;
}
- if (empty($config['welcome_mail_configured']) === false) {
+ if (empty($config['email_username']) === false && empty($config['email_password']) === false) {
$btn_configure_mail_class = '';
$li_configure_mail_class = 'row_green';
$flag_cm = true;
@@ -1135,7 +1135,7 @@ class WelcomeWindow extends Wizard
}
function configureEmail() {
- window.location = '';
+ window.location = '';
}
function serversUp() {
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index efb2c99128..317a84b39f 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 = 'PC231127';
+$build_version = 'PC231129';
$pandora_version = 'v7.0NG.774';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 195b509106..2d6803ccd4 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -4752,7 +4752,7 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
$secondary_groups = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
$secondaryLinks = [];
if (empty($secondary_groups['for_select']) === true) {
- $secondaryLinks[] = '
'.__('N/A').'';
+ $secondaryLinks = [];
} else {
foreach ($secondary_groups['for_select'] as $id => $name) {
$secondaryLinks[] = html_print_anchor(
@@ -4811,22 +4811,22 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
'content' => groups_get_name($agent['id_grupo']),
],
true
- );
+ ).' '.ui_print_group_icon($agent['id_grupo'], true, '', 'margin-left: 2%;', true, false, false, '', true);
$table_contact->data[] = $data;
// Secondary groups.
$data = [];
- $data[0] = '
'.__('Secondary groups').'';
- $data[1] = implode(', ', $secondaryLinks);
- $table_contact->data[] = $data;
+ if (!empty($secondaryLinks) === true) {
+ $data[0] = '
'.__('Secondary groups').'';
+ $data[1] = implode(', ', $secondaryLinks);
+ $table_contact->data[] = $data;
+ }
// Parent agent line.
if (enterprise_installed() === true) {
- $data = [];
- $data[0] = '
'.__('Parent').'';
- if ((int) $agent['id_parent'] === 0) {
- $data[1] = '
'.__('N/A').'';
- } else {
+ if ((int) $agent['id_parent'] !== 0) {
+ $data = [];
+ $data[0] = '
'.__('Parent').'';
$data[1] = html_print_anchor(
[
'href' => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_parent'],
@@ -4834,9 +4834,9 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
],
true
);
- }
- $table_contact->data[] = $data;
+ $table_contact->data[] = $data;
+ }
}
// Last status change line.
@@ -4845,6 +4845,44 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
$data[1] = $time_elapsed;
$table_contact->data[] = $data;
+ $has_remote_conf = enterprise_hook(
+ 'config_agents_has_remote_configuration',
+ [$agent['id_agente']]
+ );
+
+ if ((bool) $has_remote_conf) {
+ $data = [];
+ $data[0] = __('Remote configuration');
+ $data[1] = '
'.__('Enabled').'';
+ $data[1] .= html_print_menu_button(
+ [
+ 'href' => ui_get_full_url('index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1'),
+ 'image' => 'images/remote-configuration@svg.svg',
+ 'title' => __('Edit remote config'),
+ ],
+ true
+ );
+
+ $satellite_server = (int) db_get_value_filter(
+ 'satellite_server',
+ 'tagente',
+ ['id_agente' => $id_agente]
+ );
+
+ if (empty($satellite_server) === false) {
+ $satellite_name = db_get_value_filter(
+ 'name',
+ 'tserver',
+ ['id_server' => $satellite_server]
+ );
+
+ $data[0] = __('Satellite server');
+ $data[1] = $satellite_name;
+ }
+
+ $table_contact->data[] = $data;
+ }
+
if (enterprise_installed() === true) {
// SecurityMon line.
$id_module_group = db_get_value('id_mg', 'tmodule_group', 'name', 'Security');
@@ -4887,6 +4925,43 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
}
}
+ // Optional data
+ // Position Information.
+ if ((bool) $config['activate_gis'] === true) {
+ $data = [];
+
+ $dataPositionAgent = gis_get_data_last_position_agent(
+ $agent['id_agente']
+ );
+ if (is_array($dataPositionAgent) === true && $dataPositionAgent['stored_longitude'] !== '' && $dataPositionAgent['stored_latitude'] !== '') {
+ $data[0] = __('Position (Long, Lat)');
+
+ $dataOptionalOutput = html_print_anchor(
+ [
+ 'href' => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente,
+ 'content' => $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'],
+ ],
+ true
+ );
+
+ if (empty($dataPositionAgent['description']) === false) {
+ $dataOptionalOutput .= ' ('.$dataPositionAgent['description'].')';
+ }
+
+ $data[1] = $dataOptionalOutput;
+ }
+
+ $table_contact->data[] = $data;
+ }
+
+ // Timezone Offset.
+ if ((int) $agent['timezone_offset'] !== 0) {
+ $data = [];
+ $data[0] = __('Timezone Offset');
+ $data[1] = $agent['timezone_offset'];
+ $table_contact->data[] = $data;
+ }
+
$agent_contact = html_print_div(
[
'class' => 'agent_details_header',
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index bfdd131748..0e8c347e83 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -371,6 +371,10 @@ function config_update_config()
$error_update[] = __('show_experimental_features');
}
+ if (config_update_value('number_modules_queue', get_parameter('number_modules_queue'), true) === false) {
+ $error_update[] = __('number_modules_queue');
+ }
+
if (config_update_value('console_log_enabled', get_parameter('console_log_enabled'), true) === false) {
$error_update[] = __('Console log enabled');
}
@@ -2441,6 +2445,10 @@ function config_process_config()
config_update_value('show_experimental_features', 0);
}
+ if (!isset($config['number_modules_queue'])) {
+ config_update_value('number_modules_queue', 500);
+ }
+
if (!isset($config['agent_vulnerabilities'])) {
config_update_value('agent_vulnerabilities', 1);
}
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 69f16182e6..5b37dc51d2 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -774,6 +774,7 @@ function html_print_select(
$select2_multiple_enable_all=false,
$form='',
$order=false,
+ $custom_id=null
) {
$output = "\n";
@@ -789,6 +790,10 @@ function html_print_select(
$id = preg_replace('/[^a-z0-9\:\;\-\_]/i', '', $name.($idcounter[$name] ? $idcounter[$name] : ''));
+ if ($custom_id !== null) {
+ $id = $custom_id;
+ }
+
$attributes = '';
if (!empty($script)) {
$attributes .= ' onchange="'.$script.'"';
@@ -1740,20 +1745,37 @@ function html_print_select_multiple_modules_filtered(array $data):string
}
}
- $output .= html_print_input(
- [
- 'label' => __('Agents'),
- 'label_class' => 'font-title-font',
- 'type' => 'select_from_sql',
- 'sql' => 'SELECT `id_agente`,`alias` FROM tagente',
- 'name' => 'filtered-module-agents-'.$uniqId,
- 'selected' => explode(',', $data['mAgents']),
- 'return' => true,
- 'multiple' => true,
- 'style' => 'min-width: 200px;max-width:200px;',
- 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
- ]
- );
+ if (is_metaconsole() === true) {
+ $output .= html_print_input(
+ [
+ 'label' => __('Agents'),
+ 'label_class' => 'font-title-font',
+ 'type' => 'select',
+ 'fields' => $agents,
+ 'name' => 'filtered-module-agents-'.$uniqId,
+ 'selected' => explode(',', $data['mAgents']),
+ 'return' => true,
+ 'multiple' => true,
+ 'style' => 'min-width: 200px;max-width:200px;',
+ 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
+ ]
+ );
+ } else {
+ $output .= html_print_input(
+ [
+ 'label' => __('Agents'),
+ 'label_class' => 'font-title-font',
+ 'type' => 'select_from_sql',
+ 'sql' => 'SELECT `id_agente`,`alias` FROM tagente',
+ 'name' => 'filtered-module-agents-'.$uniqId,
+ 'selected' => explode(',', $data['mAgents']),
+ 'return' => true,
+ 'multiple' => true,
+ 'style' => 'min-width: 200px;max-width:200px;',
+ 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
+ ]
+ );
+ }
$commonModules = 0;
if (empty($data['mShowCommonModules']) === false) {
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 346dee04b5..1df84f6025 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -1170,6 +1170,14 @@ if (is_ajax()) {
'.$sys_info->data->ramInfo->value.'
+
+ |
+ '.$sys_info->data->distroInfo->name.'
+ |
+
+ '.$sys_info->data->distroInfo->value.'
+ |
+
|
'.$sys_info->data->osInfo->name.'
diff --git a/pandora_console/include/functions_messages.php b/pandora_console/include/functions_messages.php
index 189844c174..fe35d5b5a6 100644
--- a/pandora_console/include/functions_messages.php
+++ b/pandora_console/include/functions_messages.php
@@ -122,6 +122,7 @@ function messages_create_message(
'id_usuario_origen' => $usuario_origen,
'subject' => $subject,
'mensaje' => $mensaje,
+ 'subtype' => 'NOTIF.MESSAGE',
'id_source' => get_notification_source_id('message'),
'timestamp' => get_system_time(),
]
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index de618605c8..090bb8bdb9 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -4735,7 +4735,7 @@ function export_agents_module_csv($filters)
$query_filter .= ' AND tam.nombre IN '.$module_filter.' ';
} else {
$module_filter = '('.implode(', ', $filter).')';
- $query_filter .= ' AND tam.id_tipo_modulo IN '.$module_filter.' ';
+ $query_filter .= ' AND tam.id_agente_modulo IN '.$module_filter.' ';
}
}
break;
diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php
index 7cdbd1c461..d97edf17aa 100644
--- a/pandora_console/include/functions_profile.php
+++ b/pandora_console/include/functions_profile.php
@@ -308,7 +308,7 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
'del',
'images/delete.svg',
1,
- '',
+ 'background-color: transparent !important;',
true,
[
'onclick' => 'delete_profile(event, this)',
@@ -316,8 +316,15 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
]
);
} else {
- $data['actions'] = '';
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 64e6c5670b..dce7dd9efc 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -42,6 +42,7 @@ require_once $config['homedir'].'/include/functions_users.php';
enterprise_include_once('include/functions_reporting.php');
enterprise_include_once('include/functions_metaconsole.php');
enterprise_include_once('include/functions_inventory.php');
+require_once $config['homedir'].'/include/functions_inventory.php';
enterprise_include_once('include/functions_cron.php');
require_once $config['homedir'].'/include/functions_forecast.php';
require_once $config['homedir'].'/include/functions_ui.php';
@@ -1023,6 +1024,62 @@ function reporting_make_reporting_data(
);
break;
+ case 'vuls_severity_graph':
+ $report['contents'][] = reporting_vuls_severity_graph(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
+ case 'vuls_attack_complexity':
+ $report['contents'][] = reporting_vuls_attack_complexity_graph(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
+ case 'vuls_by_packages':
+ $report['contents'][] = reporting_vuls_by_packages_graph(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
+ case 'vuls_by_agent':
+ $report['contents'][] = reporting_vuls_by_agent(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
+ case 'vuls_info_agent':
+ $report['contents'][] = reporting_vuls_info_agent(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
+ case 'top_n_agents_vuls':
+ $report['contents'][] = reporting_top_n_agents_vuls(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
+ case 'top_n_vuls_count':
+ $report['contents'][] = reporting_top_n_vuls_count(
+ $report,
+ $content,
+ $type
+ );
+ break;
+
default:
// Default.
break;
@@ -13641,38 +13698,47 @@ function reporting_tiny_stats(
}
if ($modern === true) {
- $out .= '';
if (isset($fired_count) && $fired_count > 0) {
+ $out .= ' ';
$out .= ' ';
$out .= ' '.$fired_count.'';
+ $out .= ' ';
}
if (isset($critical_count) && $critical_count > 0) {
+ $out .= ' ';
$out .= ' ';
$out .= ' '.$critical_count.'';
+ $out .= ' ';
}
if (isset($warning_count) && $warning_count > 0) {
+ $out .= ' ';
$out .= ' ';
$out .= ' '.$warning_count.'';
+ $out .= ' ';
}
if (isset($unknown_count) && $unknown_count > 0) {
+ $out .= ' ';
$out .= ' ';
$out .= ' '.$unknown_count.'';
+ $out .= ' ';
}
if (isset($not_init_count) && $not_init_count > 0) {
+ $out .= ' ';
$out .= ' ';
$out .= ' '.$not_init_count.'';
+ $out .= ' ';
}
if (isset($normal_count) && $normal_count > 0) {
+ $out .= ' ';
$out .= ' ';
$out .= ' '.$normal_count.'';
+ $out .= ' ';
}
-
- $out .= ' ';
+ $output .= \ui_print_info_message(
+ __('Invalid regex'),
+ '',
+ true
+ );
+ $output .= ' ';
+ return $output;
+ }
+
// This function check ACL.
$agents = @agents_get_group_agents(0, ['aliasRegex' => $agentRegex]);
$agentsId = \array_keys($agents);
diff --git a/pandora_console/include/styles/agent_view.css b/pandora_console/include/styles/agent_view.css
index d4a1d89a4e..1df8efdb84 100644
--- a/pandora_console/include/styles/agent_view.css
+++ b/pandora_console/include/styles/agent_view.css
@@ -6,6 +6,10 @@ div#bullets_modules span {
font-weight: 700;
}
+div.bullets_modules span {
+ font-weight: 700;
+}
+
div.agent_details_agent_caption {
flex: 1;
}
diff --git a/pandora_console/include/styles/form.css b/pandora_console/include/styles/form.css
index a0e5957358..c212d459f6 100644
--- a/pandora_console/include/styles/form.css
+++ b/pandora_console/include/styles/form.css
@@ -279,8 +279,8 @@ form.modal ul.wizard li {
flex-wrap: nowrap;
}
-form.modal-dashboard ul.wizard li *,
-form.modal ul.wizard li *:not(.tox.tox-tinymce *) {
+form.modal-dashboard ul.wizard li > *,
+form.modal ul.wizard li > *:not(.tox.tox-tinymce *) {
flex: 1 1 50%;
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 50d3ec4778..0879c38f88 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -6043,18 +6043,18 @@ div.switch_radio_button label:last-of-type {
margin-top: -2px;
}
-/*
-div#bullets_modules {
- display: flex;
- margin-left: 2em;
-}
-*/
div#bullets_modules div {
display: flex;
align-items: center;
margin: 0 5px;
}
+div.bullets_modules div {
+ display: flex;
+ align-items: center;
+ margin: 0 10px;
+}
+
.orange_background {
background: #ffa631;
}
@@ -6225,7 +6225,7 @@ div#status_pie {
display: flex;
align-items: flex-start;
padding: 20px;
- padding-bottom: 0;
+ padding-bottom: 1%;
}
.agent_details_content_cluster {
@@ -6315,6 +6315,7 @@ div#status_pie {
flex-direction: column;
justify-content: center;
align-items: center;
+ width: 100%;
}
.agent_details_agent_data {
@@ -6344,23 +6345,45 @@ div#status_pie {
justify-content: flex-start;
}
+.agent_details_bullets .bullets_modules {
+ display: flex;
+ justify-content: flex-start;
+}
+
.agent_details_bullets_cluster #bullets_modules {
display: flex;
justify-content: flex-start;
flex-direction: column;
}
+.agent_details_bullets_cluster .bullets_modules {
+ display: flex;
+ justify-content: flex-start;
+ flex-direction: column;
+}
+
.agent_details_bullets_cluster #bullets_modules > div {
padding: 0px;
margin-bottom: 10px;
}
+.agent_details_bullets_cluster .bullets_modules > div {
+ padding: 0px;
+ margin-bottom: 10px;
+}
+
.agent_details_bullets #bullets_modules > div {
display: flex;
align-items: center;
padding-bottom: 20px;
}
+.agent_details_bullets .bullets_modules > div {
+ display: flex;
+ align-items: center;
+ padding-bottom: 20px;
+}
+
#agent_contact_main tr td img {
max-width: 100%;
}
@@ -6412,6 +6435,11 @@ div#status_pie {
float: right;
}
+.white_table_graph_header div.bullets_modules {
+ display: flex;
+ float: right;
+}
+
.white_table_graph_header img,
.white_table_graph_header span {
vertical-align: middle;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index e2f5eb1639..1e2cc377fc 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -1471,6 +1471,10 @@ ul.datatable_filter:has(li > div.action-buttons) {
background-color: #222 !important;
}
+ul.datatable_filter {
+ background-color: #222 !important;
+}
+
span.ui-dialog-title {
color: #fff !important;
}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 4f340b32d9..c0be0717ff 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -653,6 +653,7 @@ div.advanced-options-events > div.filter_input {
.vert-align-bottom {
vertical-align: bottom;
+ font-size: 8pt;
}
label.vert-align-bottom > a.tip {
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 4522b758cf..36fe3a8ea4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
';
+
// Strict user hidden.
echo ' ';
html_print_input_text('strict_user_hidden', $strict_user);
@@ -565,6 +568,10 @@ function alerts_table_controls() {
}
$(document).ready ( function () {
+ if ($('#filter_applied').val() == 0){
+ $('#button-form_alerts_status_datatable_search_bt').trigger('click');
+ $('#filter_applied').val(1);
+ }
alerts_table_controls();
$('#button-alert_validate').on('click', function () {
validateAlerts();
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 156fc32c3d..dd4effe693 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -102,17 +102,37 @@ $agentCountModules = html_print_div(
$table_status = new stdClass();
$table_status->id = 'agent_status_main';
-$table_status->width = '100%';
+$table_status->width = '90%';
+$table_status->height = 'auto';
$table_status->cellspacing = 0;
$table_status->cellpadding = 0;
$table_status->class = 'floating_form';
-$table_status->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end; vertical-align: top';
-$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter; vertical-align: top';
-$table_status->data['agent_os'][0] = __('OS');
-$agentOS = [];
-$agentOS[] = html_print_div([ 'content' => (empty($agent['os_version']) === true) ? get_os_name((int) $agent['id_os']) : $agent['os_version']], true);
-$agentOS[] = html_print_div([ 'style' => 'width: 16px;padding-left: 5px', 'content' => ui_print_os_icon($agent['id_os'], false, true, true, false, false, false, ['width' => '16px'])], true);
-$table_status->data['agent_os'][1] = html_print_div(['class' => 'agent_details_agent_data', 'content' => implode('', $agentOS)], true);
+$table_status->style[0] = 'height: 28px; width: 30%; padding-right: 5px; text-align: end; vertical-align: top';
+$table_status->style[1] = 'height: 28px; width: 70%; padding-left: 5px; font-weight: lighter; vertical-align: top';
+
+$os_agent_text = '';
+$os_name = get_os_name((int) $agent['id_os']);
+if (empty($agent['os_version']) !== true) {
+ $agent['os_version'] = io_safe_output($agent['os_version']);
+ if (strpos($agent['os_version'], '(') !== false) {
+ $os_name = preg_split('/[0-9]|[\(]/', $agent['os_version'])[0];
+ $os_version = explode($os_name, explode('(', $agent['os_version'])[0])[1];
+ $os_version_name = preg_split('/[\(]|[\)]/', $agent['os_version']);
+ $os_agent_text = $os_version.' ('.$os_version_name[1].')';
+ } else {
+ $os_name = preg_split('/[0-9]/', $agent['os_version'])[0];
+ $os_version = explode($os_name, explode('(', $agent['os_version'])[0])[1];
+ $os_agent_text = $os_version;
+ }
+}
+
+$table_status->data['agent_os'][0] = html_print_div([ 'style' => 'width: 16px; position: relative; left: 75%', 'content' => ui_print_os_icon($agent['id_os'], false, true, true, false, false, false, ['width' => '16px'])], true);
+$table_status->data['agent_os'][1] = $os_name;
+
+if (empty($agent['os_version']) !== true) {
+ $table_status->data['agent_os_version'][0] = __('OS Version');
+ $table_status->data['agent_os_version'][1] = $os_agent_text;
+}
$addresses = agents_get_addresses($id_agente);
$address = agents_get_address($id_agente);
@@ -124,43 +144,48 @@ foreach ($addresses as $k => $add) {
}
if (empty($address) === false) {
+ $address_text = ' '.$address.'';
+ if (!empty($addresses) === true) {
+ foreach ($addresses as $sec_address) {
+ $address_text .= ' '.$sec_address.'';
+ }
+ }
+
$table_status->data['ip_address'][0] = __('IP address');
- $table_status->data['ip_address'][1] = (empty($address) === true) ? ' '.__('N/A').'' : $address;
+ $table_status->data['ip_address'][1] = (empty($address) === true) ? ' '.__('N/A').'' : $address_text;
}
$table_status->data['agent_version'][0] = __('Agent Version');
$table_status->data['agent_version'][1] = (empty($agent['agent_version']) === true) ? ' '.__('N/A').'' : $agent['agent_version'];
$table_status->data['description'][0] = __('Description');
-$table_status->data['description'][1] = (empty($agent['comentarios']) === true) ? ' '.__('N/A').'' : $agent['comentarios'];
+$table_status->data['description'][1] = (empty($agent['comentarios']) === true) ? ' '.__('N/A').'' : ui_print_truncate_text($agent['comentarios'], 'description', true);
-$has_remote_conf = enterprise_hook(
- 'config_agents_has_remote_configuration',
- [$agent['id_agente']]
+$agentEventsHeader = html_print_div(
+ [
+ 'class' => 'agent_details_header',
+ 'content' => '',
+ ],
+ true
);
-if ((bool) $has_remote_conf) {
- $table_status->data['remote_config'][0] = __('Remote configuration');
- $table_status->data['remote_config'][1] = __('Enabled');
-
- $satellite_server = (int) db_get_value_filter(
- 'satellite_server',
- 'tagente',
- ['id_agente' => $id_agente]
- );
-
- if (empty($satellite_server) === false) {
- $satellite_name = db_get_value_filter(
- 'name',
- 'tserver',
- ['id_server' => $satellite_server]
- );
-
- $table_status->data['remote_config'][0] = __('Satellite server');
- $table_status->data['remote_config'][1] = $satellite_name;
- }
-}
-
+$agentEventsGraph = html_print_div(
+ [
+ 'class' => 'white-table-graph-content',
+ 'content' => graph_graphic_agentevents(
+ $id_agente,
+ 95,
+ 50,
+ SECONDS_1DAY,
+ '',
+ true,
+ true,
+ 500
+ ),
+ 'style' => 'margin-top: -25px',
+ ],
+ true
+);
$table_agent = $agentStatusHeader.'
@@ -170,6 +195,9 @@ $table_agent = $agentStatusHeader.'
'.$alive_animation.html_print_table($table_status, true).'
+
+
+ '.$agentEventsHeader.$agentEventsGraph.'
';
@@ -189,11 +217,12 @@ $data_opcional->class = 'floating_form';
// Gis and url address.
$agentAdditionalContent = '';
// Position Information.
-if ((bool) $config['activate_gis'] === true) {
+/*
+ if ((bool) $config['activate_gis'] === true) {
$dataPositionAgent = gis_get_data_last_position_agent(
$agent['id_agente']
);
- if (is_array($dataPositionAgent) === true && $dataPositionAgent['stored_longitude'] !== '' && $dataPositionAgent['stored_longitude'] !== '') {
+ if (is_array($dataPositionAgent) === true && $dataPositionAgent['stored_longitude'] !== '' && $dataPositionAgent['stored_latitude'] !== '') {
$data_opcional->data['agent_position'][0] = __('Position (Long, Lat)');
$dataOptionalOutput = html_print_anchor(
@@ -210,10 +239,11 @@ if ((bool) $config['activate_gis'] === true) {
$data_opcional->data['agent_position'][1] = $dataOptionalOutput;
}
-}
+}*/
// If the url description is set.
-if (empty($agent['url_address']) === false) {
+/*
+ if (empty($agent['url_address']) === false) {
$data_opcional->data['url_address'][0] = __('Url address');
$data_opcional->data['url_address'][1] = html_print_anchor(
[
@@ -222,11 +252,12 @@ if (empty($agent['url_address']) === false) {
],
true
);
-}
+}*/
// Other IP address and timezone offset.
-if (empty($addresses) === false) {
+/*
+ if (empty($addresses) === false) {
$data_opcional->data['other_ip_address'][0] = __('Other IP addresses');
$data_opcional->data['other_ip_address'][1] = html_print_div(
[
@@ -235,13 +266,14 @@ if (empty($addresses) === false) {
],
true
);
-}
-
+ }
+*/
// Timezone Offset.
-if ((int) $agent['timezone_offset'] !== 0) {
+/*
+ if ((int) $agent['timezone_offset'] !== 0) {
$data_opcional->data['timezone_offset'][0] = __('Timezone Offset');
$data_opcional->data['timezone_offset'][1] = $agent['timezone_offset'];
-}
+}*/
// Custom fields.
$fields = db_get_all_rows_filter(
@@ -485,39 +517,6 @@ $agentContact = html_print_div(
true
);
-$agentEventsHeader = html_print_div(
- [
- 'class' => 'agent_details_header',
- 'content' => '',
- ],
- true
-);
-
-$agentEventsGraph = html_print_div(
- [
- 'class' => 'white-table-graph-content',
- 'content' => graph_graphic_agentevents(
- $id_agente,
- 95,
- 70,
- SECONDS_1DAY,
- '',
- true,
- true,
- 500
- ),
- ],
- true
-);
-
-$agentEvents = html_print_div(
- [
- 'class' => 'box-flat agent_details_col w50p',
- 'content' => $agentEventsHeader.$agentEventsGraph,
- ],
- true
-);
-
/*
* EVENTS TABLE END.
*/
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 1767b33c37..4bddd880c5 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -541,19 +541,6 @@ if (is_ajax() === true) {
);
}
- if (empty($tmp->module_name) === false) {
- $tmp->module_name = ui_print_truncate_text(
- $tmp->module_name,
- 'module_medium',
- false,
- true,
- false,
- '…',
- true,
- true,
- );
- }
-
if (empty($tmp->comments) === false) {
$tmp->comments = ui_print_comments($tmp->comments, 20);
}
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 3794a30ae3..c800d9b372 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -819,13 +819,6 @@ if ($access_console_node === true) {
}
}
}
-
- if (!empty($sub)) {
- $menu_operation['extensions']['text'] = __('Tools');
- $menu_operation['extensions']['sec2'] = 'operation/extensions';
- $menu_operation['extensions']['id'] = 'oper-extensions';
- $menu_operation['extensions']['sub'] = $sub;
- }
}
// ~ }
diff --git a/pandora_console/operation/search_modules.getdata.php b/pandora_console/operation/search_modules.getdata.php
index e83c6035ef..a278ca8cd0 100644
--- a/pandora_console/operation/search_modules.getdata.php
+++ b/pandora_console/operation/search_modules.getdata.php
@@ -19,17 +19,25 @@ require_once $config['homedir'].'/include/functions_users.php';
$searchModules = check_acl($config['id_user'], 0, 'AR');
-$selectModuleNameUp = '';
-$selectModuleNameDown = '';
-$selectAgentNameUp = '';
-$selectAgentNameDown = '';
+if ($config['style'] === 'pandora_black') {
+ $selectModuleNameUp = '';
+ $selectModuleNameDown = '';
+ $selectAgentNameUp = '';
+ $selectAgentNameDown = '';
+} else {
+ $selectModuleNameUp = '_black';
+ $selectModuleNameDown = '_black';
+ $selectAgentNameUp = '_black';
+ $selectAgentNameDown = '_black';
+}
+
$is_admin = (bool) db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
switch ($sortField) {
case 'module_name':
switch ($sort) {
case 'up':
- $selectModuleNameUp = $selected;
+ $selectModuleNameUp = $selected_module;
$order = [
'field' => 'module_name',
'order' => 'ASC',
@@ -37,7 +45,7 @@ switch ($sortField) {
break;
case 'down':
- $selectModuleNameDown = $selected;
+ $selectModuleNameDown = $selected_module;
$order = [
'field' => 'module_name',
'order' => 'DESC',
@@ -49,7 +57,7 @@ switch ($sortField) {
case 'agent_name':
switch ($sort) {
case 'up':
- $selectAgentNameUp = $selected;
+ $selectAgentNameUp = $selected_module;
$order = [
'field' => 'agent_name',
'order' => 'ASC',
@@ -57,7 +65,7 @@ switch ($sortField) {
break;
case 'down':
- $selectAgentNameDown = $selected;
+ $selectAgentNameDown = $selected_module;
$order = [
'field' => 'agent_name',
'order' => 'DESC',
@@ -67,7 +75,7 @@ switch ($sortField) {
break;
default:
- $selectModuleNameUp = $selected;
+ $selectModuleNameUp = $selected_module;
$order = [
'field' => 'module_name',
'order' => 'ASC',
diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index 6d35064b68..e2ae260d3c 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -30,10 +30,9 @@ if (!$modules || !$searchModules) {
$table->cellspacing = 4;
$table->width = '98%';
$table->class = 'info_table';
-
$table->head = [];
- $table->head[0] = __('Module').' '.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp]).''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown]).'';
- $table->head[1] = __('Agent').' '.html_print_image('images/sort_up.png', true, ['style' => $selectAgentNameUp]).''.html_print_image('images/sort_down.png', true, ['style' => $selectAgentNameDown]).'';
+ $table->head[0] = __('Module').' '.html_print_image('images/sort_up'.$selectModuleNameUp.'.png', true).''.html_print_image('images/sort_down'.$selectModuleNameDown.'.png', true).'';
+ $table->head[1] = __('Agent').' '.html_print_image('images/sort_up'.$selectAgentNameUp.'.png', true).''.html_print_image('images/sort_down'.$selectAgentNameDown.'.png', true).'';
$table->head[2] = __('Type');
$table->head[3] = __('Interval');
$table->head[4] = __('Status');
@@ -80,6 +79,9 @@ if (!$modules || !$searchModules) {
$module['datos'] = modules_get_last_value($module['id_agente_modulo']);
$module['module_name'] = $module['nombre'];
+ $linked_module_name = ' ';
+ $linked_module_name .= $module['module_name'];
+ $linked_module_name .= '';
// To search the monitor status
$status_sql = sprintf('SELECT estado from tagente_estado where id_agente_modulo ='.$module['id_agente_modulo']);
$status_sql = db_process_sql($status_sql);
@@ -217,7 +219,7 @@ if (!$modules || !$searchModules) {
$url_edit = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$module['id_agente'].'&tab=module&id_agent_module='.$module['id_agente_modulo'].'&edit_module=1';
- $edit_module = ' '.html_print_image('images/edit.svg', true).'';
+ $edit_module = ' '.html_print_image('images/edit.svg', true, ['class' => 'invert_filter main_menu_icon']).'';
} else {
$edit_module = '';
}
@@ -226,7 +228,7 @@ if (!$modules || !$searchModules) {
array_push(
$table->data,
[
- $module['module_name'],
+ $linked_module_name,
$agentCell,
$typeCell,
$intervalCell,
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index cef9788be0..76638e3525 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -60,7 +60,7 @@ $order = null;
$sortField = get_parameter('sort_field');
$sort = get_parameter('sort', 'none');
$selected = 'border: 1px solid black;';
-
+$selected_module = '_green';
if ($searchMain) {
$main_tab = [
'text' => " ".html_print_image(
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index ff98edb48f..7e159b2cbb 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.774
-%define release 231127
+%define release 231129
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 9f828af5fe..ba6b971a18 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.774
-%define release 231127
+%define release 231129
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index eb68cdae6a..fe2fce0746 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.774
-%define release 231127
+%define release 231129
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index bfb1d0ee96..645c74013c 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -1167,9 +1167,9 @@ INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field
INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`) VALUES (6,'Create Pandora ITSM ticket',16);
INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (7, 'Pandora Google chat', 17, "", "data=_data_", "[PANDORA] Alert FIRED on _agent_ / _module_", "_agent_ | _module_ | _data_ | _timestamp_", "", "", "", "", "", "", 0, 0, "", "data=_data_", "[PANDORA] Alert RECOVERED on _agent_ / _module_", "_agent_ | _module_ | _data_ | _timestamp_", "", "", "", "", "", "");
INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (8, 'Pandora Slack', 18, "data=_data_", "", ":red_circle:", "[PANDORA] Alert FIRED on _agent_ / _module_", "_agent_ | _module_ | _data_ | _timestamp_", "", "", "", "", "", 0, 0, "data=_data_", "", ":green_circle:", "[PANDORA] Alert RECOVERED on _agent_ / _module_", "_agent_ | _module_ | _data_ | _timestamp_", "", "", "", "", "");
-INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (9, 'Pandora Telegram', 19, "", "[PANDORA] Alert FIRED on _agent_ / _module_ / _tiemstamp_ / _data_", "", "", "", "", "", "", "", "", 0, 0, "", "[PANDORA] Alert RECOVERED on _agent_ / _module_ / _tiemstamp_ / _data_", "", "", "", "", "", "", "", "");
+INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (9, 'Pandora Telegram', 19, "", "[PANDORA] Alert FIRED on _agent_ / _module_ / _timestamp_ / _data_", "", "", "", "", "", "", "", "", 0, 0, "", "[PANDORA] Alert RECOVERED on _agent_ / _module_ / _timestamp_ / _data_", "", "", "", "", "", "", "", "");
INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (10, 'Pandora ilert', 20, "alert", "", "[PANDORA] Alert FIRED on _agent_ / _module_", "_agent_ | _module_ | _data_ | _timestamp_", "", "", "", "", "", "", 0, 0, "resolved", "", "[PANDORA] Alert RECOVERED on _agent_ / _module_", "_agent_ | _module_ | _data_ | _timestamp_", "", "", "", "", "", "");
-INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (11, 'Pandora Vonage', 21, "", "[PANDORA] Alert FIRED on _agent_ / _module_ / _tiemstamp_ / _data_", "", "", "", "", "", "", "", "", 0, 0, "", "[PANDORA] Alert RECOVERED on _agent_ / _module_ / _tiemstamp_ / _data_", "", "", "", "", "", "", "", "");
+INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES (11, 'Pandora Vonage', 21, "", "[PANDORA] Alert FIRED on _agent_ / _module_ / _timestamp_ / _data_", "", "", "", "", "", "", "", "", 0, 0, "", "[PANDORA] Alert RECOVERED on _agent_ / _module_ / _timestamp_ / _data_", "", "", "", "", "", "", "", "");
-- alert templates (default)
@@ -1194,7 +1194,7 @@ INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALU
INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (2, 'Discovery.Cloud', 'Discovery Cloud script to monitor Cloud technologies (AWS.EC2, AWS.S3, AWS.RDS, RDS,ȊWS.EKS)', '/usr/share/pandora_server/util/recon_scripts/pcm_client.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
-- IPAM is 3.
-INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (4, 'IPMI Recon','Specific Pandora FMS Intel DCM Discovery (c) Artica ST 2011 <info@artica.es>
Usage: ./ipmi-recon.pl <task_id> <group_id> <custom_field1> <custom_field2> <custom_field3> <custom_field4>
* custom_field1 = Network i.e.: 192.168.100.0/24
* custom_field2 = Username
* custom_field3 = Password
* custom_field4 = Additional parameters i.e.: -D LAN_2_0','/usr/share/pandora_server/util/recon_scripts/ipmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"i.e.: 192.168.100.0/24\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Username\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"3\":{\"macro\":\"_field3_\",\"desc\":\"Password\",\"help\":\"\",\"value\":\"\",\"hide\":\"1\"},\"4\":{\"macro\":\"_field4_\",\"desc\":\"Additional parameters\",\"help\":\"Optional additional parameters such as -D LAN_2_0 to use IPMI ver 2.0 instead of 1.5. These options will also be passed to the IPMI plugin when the current values are read.\",\"value\":\"\",\"hide\":\"\"}}');
+INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (4, 'IPMI Recon','Specific Pandora FMS Intel DCM Discovery (c) Artica ST 2011 <info@pandorafms.com>
Usage: ./ipmi-recon.pl <task_id> <group_id> <custom_field1> <custom_field2> <custom_field3> <custom_field4>
* custom_field1 = Network i.e.: 192.168.100.0/24
* custom_field2 = Username
* custom_field3 = Password
* custom_field4 = Additional parameters i.e.: -D LAN_2_0','/usr/share/pandora_server/util/recon_scripts/ipmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"i.e.: 192.168.100.0/24\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Username\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"3\":{\"macro\":\"_field3_\",\"desc\":\"Password\",\"help\":\"\",\"value\":\"\",\"hide\":\"1\"},\"4\":{\"macro\":\"_field4_\",\"desc\":\"Additional parameters\",\"help\":\"Optional additional parameters such as -D LAN_2_0 to use IPMI ver 2.0 instead of 1.5. These options will also be passed to the IPMI plugin when the current values are read.\",\"value\":\"\",\"hide\":\"\"}}');
INSERT INTO `trecon_script` (`type`,`name`,`description`,`script`,`macros`) VALUES (3, 'IPAM Recon', 'This script is used to automatically detect network hosts availability and name, used as Recon Custom Script in the recon task. Parameters used are:\n\n* custom_field1 = network. i.e.: 192.168.100.0/24\n* custom_field2 = associated IPAM network id. i.e.: 4. Please do not change this value, it is assigned automatically in IPAM management.\n\nSee documentation for more information.', '/usr/share/pandora_server/util/recon_scripts/IPAMrecon.pl', '{"1":{"macro":"_field1_","desc":"Network","help":"i.e.: 192.168.100.0/24","value":"","hide":""}}');
@@ -1214,7 +1214,7 @@ INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `max_retries`
INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,'',0),(2,'Department',0,0,'',0),(3,'Additional ID',0,0,'',0),(4,'eHorusID',0,0,'',0);
-INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','','',''),(2,'critical','Critical modules','','','',''),(3,'dmz','DMZ Network Zone','','','',''),(4,'performance','Performance anda capacity modules','','','',''),(5,'configuration','','','','','');
+INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://pandorafms.com','','',''),(2,'critical','Critical modules','','','',''),(3,'dmz','DMZ Network Zone','','','',''),(4,'performance','Performance anda capacity modules','','','',''),(5,'configuration','','','','','');
INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0,90,0),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0,90,0),(5,'Restart agent','Restart the agent with using UDP protocol.
To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0,90,0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0,90,0),(7,'Create ticket in Pandora ITSM from event','Create a ticket in Pandora ITSM from an event','index.php?sec=manageTickets&sec2=operation/ITSM/itsm&operation=edit&from_event=_event_id_','url',0,0,0,1,'',0,90,1);
@@ -2775,7 +2775,7 @@ SET @short_name = 'pandorafms.oracle';
SET @name = 'Oracle';
SET @section = 'app';
SET @description = 'Monitor Oracle databases';
-SET @version = '1.0';
+SET @version = '1.1';
INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
index c75c84fefb..a0ca625009 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
@@ -1378,6 +1378,34 @@ class Client
}
+ private function getDirectorySize($directory)
+ {
+ if (is_string($directory) === false || is_dir($directory) === false) {
+ throw new \InvalidArgumentException('Invalid directory path');
+ }
+
+ $size = 0;
+
+ if ($handle = opendir($directory)) {
+ while (false !== ($file = readdir($handle))) {
+ if ($file != '.' && $file != '..') {
+ $path = $directory.DIRECTORY_SEPARATOR.$file;
+ if (is_dir($path) === true) {
+ // Recursive call for subdirectories.
+ $size += $this->getDirectorySize($path);
+ } else {
+ $size += filesize($path);
+ }
+ }
+ }
+
+ closedir($handle);
+ }
+
+ return $size;
+ }
+
+
/**
* Update files.
*
@@ -1395,7 +1423,8 @@ class Client
string $from,
string $to,
bool $test=false,
- bool $classic=false
+ bool $classic=false,
+ bool $called_recursively=false
) :void {
if (is_dir($from) !== true || is_readable($from) !== true) {
throw new \Exception('Cannot access patch files '.$from);
@@ -1416,6 +1445,18 @@ class Client
throw new \Exception('Files are not readable');
}
+ if ($test === true && $called_recursively === false) {
+ // Get size of folder and its subfolders corresponding to "from" path containing those files
+ // that will be updated in product.
+ // Do once.
+ $source_size = $this->getDirectorySize($from);
+
+ // Check available disk space before writing files.
+ if (disk_free_space($to) < $source_size) {
+ throw new \Exception('Not enough disk space to write the files');
+ }
+ }
+
$created_directories = [];
while (($pf = readdir($pd)) !== false) {
@@ -1440,11 +1481,13 @@ class Client
$created_directories[] = $dest;
}
- $this->updateFiles($version, $pf.'/', $to, $test, $classic);
+ $this->updateFiles($version, $pf.'/', $to, $test, $classic, true);
} else {
// It's a file.
if ($test === true) {
- if (is_writable($target_folder) !== true) {
+ if (is_writable($target_folder) !== true
+ || (file_exists($dest) === true && is_writable($dest) !== true)
+ ) {
throw new \Exception($dest.' is not writable');
}
} else {
diff --git a/pandora_console/views/dashboard/cell.php b/pandora_console/views/dashboard/cell.php
index 919ce9e07e..7816f79351 100644
--- a/pandora_console/views/dashboard/cell.php
+++ b/pandora_console/views/dashboard/cell.php
@@ -34,9 +34,8 @@ if ($redraw === false) {
$output .= ' |