'',
+ 'content' => '
To detect and find systems on your network we will need access credentials. The SNMP community for network devices, and at least one set of credentials for Linux and Windows environments (they do not need to be super administrators, but they do need to be able to connect remotely). Without the credentials, we will only be able to detect if the devices are connected to the network.
',
+ ],
+ true
+ );
+
+ // SNMP Communities
+ echo html_print_label_input_block(
+ __('SNMP communities to try with').ui_print_help_tip(
+ __(
+ 'You can specify several values, separated by commas, for example: public,mysecret,1234'
+ ),
+ true
+ ),
+ html_print_input(
+ [
+ 'name' => 'community',
+ 'type' => 'text',
+ 'value' => 'public',
+ 'size' => 25,
+ 'return' => true,
+ ],
+ 'div',
+ true
+ ),
+ ['div_id' => 'snmp-communities-div']
+ );
+ ui_require_jquery_file('tag-editor.min', 'include/javascript/', true);
+ ui_require_jquery_file('caret.min', 'include/javascript/', true);
+ ui_require_css_file('jquery.tag-editor', 'include/styles/', true);
+
+ echo '
';
+
+ $spacing = '';
+ for ($i = 0; $i < 12; $i++) {
+ $spacing .= ' ';
+ }
+
+ // WMI Credentials
+ echo '
';
+ echo ''.__('WMI credentials').' ';
+ echo html_print_div(
+ [
+ 'id' => 'wmi-creds',
+ 'content' => '',
+ ],
+ true
+ );
+ echo html_print_div(
+ [
+ 'id' => 'wmi-cred-form',
+ 'hidden' => true,
+ 'style' => 'margin: 10px; display: flex; align-items: center;',
+ 'content' => html_print_div(
+ [
+ 'id' => 'wmi-cred-user-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ __('User').' ',
+ html_print_input_text(
+ 'wmi-cred-user',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ '',
+ 'w100p',
+ '',
+ 'off',
+ false,
+ '',
+ '',
+ '',
+ false,
+ '',
+ 'Username'
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).html_print_div(
+ [
+ 'id' => 'wmi-cred-pass-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ $spacing.__('Password').' ',
+ html_print_input_password(
+ 'wmi-cred-pass',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ 'w100p',
+ 'off',
+ false,
+ ''
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).html_print_div(
+ [
+ 'id' => 'wmi-cred-namespace-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ $spacing.__('Namespace').' ',
+ html_print_input_text(
+ 'wmi-cred-namespace',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ '',
+ 'w100p',
+ '',
+ 'off',
+ false,
+ '',
+ '',
+ '',
+ false,
+ '',
+ 'Namespace'
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).''.html_print_image(
+ 'images/delete.svg',
+ true,
+ [
+ 'title' => __('Delete'),
+ 'style' => 'cursor: pointer;',
+ 'class' => 'main_menu_icon invert_filter',
+ ]
+ ).' ',
+ ],
+ true
+ );
+ echo '
';
+ echo html_print_button(
+ __('Add'),
+ 'add-wmi-cred',
+ false,
+ 'add_discovery_credential("wmi-cred-form","wmi-creds");',
+ [
+ 'icon' => 'plus',
+ 'mode' => 'secondary',
+ 'class' => 'mini',
+ ],
+ true,
+ false,
+ false,
+ ''
+ );
+ echo ' ';
+
+ echo '
';
+
+ // RCM Credentials
+ echo '
';
+ echo ''.__('Remote commands credentials').' ';
+ echo html_print_div(
+ [
+ 'id' => 'rcmd-creds',
+ 'content' => '',
+ ],
+ true
+ );
+ echo html_print_div(
+ [
+ 'id' => 'rcmd-cred-form',
+ 'hidden' => true,
+ 'style' => 'margin: 10px; display: flex; align-items: center;',
+ 'content' => html_print_div(
+ [
+ 'id' => 'rcmd-cred-user-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ __('User').' ',
+ html_print_input_text(
+ 'rcmd-cred-user',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ '',
+ 'w100p',
+ '',
+ 'off',
+ false,
+ '',
+ '',
+ '',
+ false,
+ '',
+ 'Username'
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).html_print_div(
+ [
+ 'id' => 'rcmd-cred-pass-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ $spacing.__('Password').' ',
+ html_print_input_password(
+ 'rcmd-cred-pass',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ 'w100p',
+ 'off',
+ false,
+ ''
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).''.html_print_image(
+ 'images/delete.svg',
+ true,
+ [
+ 'title' => __('Delete'),
+ 'style' => 'cursor: pointer;',
+ 'class' => 'main_menu_icon invert_filter',
+ ]
+ ).' ',
+ ],
+ true
+ );
+ echo '
';
+ echo html_print_button(
+ __('Add'),
+ 'add-rcmd-cred',
+ false,
+ 'add_discovery_credential("rcmd-cred-form","rcmd-creds");',
+ [
+ 'icon' => 'plus',
+ 'mode' => 'secondary',
+ 'class' => 'mini',
+ ],
+ true,
+ false,
+ false,
+ ''
+ );
+ echo ' ';
+
echo html_print_submit_button(__('Create'), 'basic_net', false, ['icon' => 'next', 'style' => 'margin-top:15px; float:right;']);
?>
+
$field) {
+ // Disregard repeated whitespaces in query searched string.
$sql_search .= sprintf(
- '%s %s %s like lower("%%%s%%")',
+ '%s REGEXP_REPLACE(%s, "( \\s*)+", " ") %s like lower("%%%s%%")',
($key === 0) ? '' : $nexo,
$field,
$not_search,
- $filter['search']
+ $collapsed_spaces_search
);
$sql_search .= ' ';
}
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 7534cb5e23..c5c7090623 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -12546,7 +12546,7 @@ function reporting_get_stats_indicators($data, $width=280, $height=20, $html=tru
$table_ind = html_get_predefined_table();
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) {
@@ -12607,7 +12607,7 @@ function reporting_get_stats_indicators_mobile($data, $width=280, $height=20, $h
$table_ind = html_get_predefined_table();
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) {
@@ -16206,7 +16206,8 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
// Si viene de no iniciado busco el primer dato del modulo y si es de histórico.
$first_utimestamp = false;
$search_historydb = false;
- $extract_first_data = modules_get_first_date($content['id_agent_module'], 0);
+ // Limitamos el primer dato al rango de tiempo seleccionado por el usuario.
+ $extract_first_data = modules_get_first_date($content['id_agent_module'], $date_start);
if (empty($extract_first_data) === false) {
$first_utimestamp = $extract_first_data['first_utimestamp'];
$search_historydb = (isset($extract_first_data['search_historydb']) === true) ? $extract_first_data['search_historydb'] : false;
@@ -16311,7 +16312,8 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
$return['data_ok'] = $check_ok;
$return['data_total'] = $check_total;
if ($check_total > 0) {
- $return['percent_ok'] = (($time_ok * 100) / $content['period']);
+ $percent_ok = (($time_ok * 100) / $content['period']);
+ $return['percent_ok'] = ($percent_ok > 100) ? 100 : $percent_ok;
} else {
$return['percent_ok'] = 0;
}
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index bdc8a56fc9..8805998232 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -615,7 +615,7 @@ function servers_get_rate($avg_interval, $num_modules)
* This function will get all the server information in an array
* or a specific server.
*
- * @param integer $id_server An optional integer or array of integers
+ * @param integer|array $id_server An optional integer or array of integers
* to select specific servers.
*
* @return mixed False in case the server doesn't exist or an array with info.
@@ -624,28 +624,63 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
{
global $config;
- if (is_array($id_server)) {
- $select_id = ' WHERE id_server IN ('.implode(',', $id_server).')';
+ $select_id = '';
+ if (is_array($id_server) === true) {
+ $select_id = ' AND id_server IN ('.implode(',', $id_server).')';
} else if ($id_server > 0) {
- $select_id = ' WHERE id_server IN ('.(int) $id_server.')';
- } else {
- $select_id = '';
+ $select_id = ' AND id_server IN ('.(int) $id_server.')';
}
- $sql = '
- SELECT *
- FROM tserver '.$select_id.'
- ORDER BY server_type';
+ $types_sql = sprintf(
+ ' AND (
+ `server_type` != %d AND
+ `server_type` != %d
+ )',
+ SERVER_TYPE_AUTOPROVISION,
+ SERVER_TYPE_MIGRATION
+ );
+ if (is_metaconsole() === true && isset($config['ndbh']) === false) {
+ $types_sql = sprintf(
+ ' AND (
+ `server_type` = %d OR
+ `server_type` = %d OR
+ `server_type` = %d OR
+ `server_type` = %d
+ )',
+ SERVER_TYPE_AUTOPROVISION,
+ SERVER_TYPE_EVENT,
+ SERVER_TYPE_MIGRATION,
+ SERVER_TYPE_PREDICTION
+ );
+ }
+
+ $sql = sprintf(
+ 'SELECT *
+ FROM tserver
+ WHERE 1=1
+ %s
+ %s
+ ORDER BY server_type',
+ $select_id,
+ $types_sql
+ );
if ($sql_limit !== -1) {
- $sql = '
- SELECT *
- FROM tserver '.$select_id.'
- ORDER BY server_type'.$sql_limit;
+ $sql = sprintf(
+ 'SELECT *
+ FROM tserver
+ WHERE 1=1
+ %s
+ %s
+ ORDER BY server_type
+ %s',
+ $select_id,
+ $types_sql,
+ $sql_limit
+ );
}
$result = db_get_all_rows_sql($sql);
- $time = get_system_time();
if (empty($result)) {
return false;
@@ -1445,6 +1480,12 @@ function servers_get_server_string_name(int $server)
case SERVER_TYPE_NCM:
return __('NCM server');
+ case SERVER_TYPE_AUTOPROVISION:
+ return __('Autoprovision server');
+
+ case SERVER_TYPE_MIGRATION:
+ return __('Migration server');
+
default:
return __('N/A');
}
diff --git a/pandora_console/include/functions_welcome_wizard.php b/pandora_console/include/functions_welcome_wizard.php
index f1b8d672f1..249fa53e20 100644
--- a/pandora_console/include/functions_welcome_wizard.php
+++ b/pandora_console/include/functions_welcome_wizard.php
@@ -472,14 +472,124 @@ function create_module_packet_lost($id_agent, $id_group, $ip_target)
/**
* Create module packet lost and return module id.
*
- * @param string $ip_target Ip and red mask.
+ * @param string $ip_target Ip and red mask.
+ * @param string $snmp_communities SNMP Communities to use in recon task.
+ * @param array $wmi_credentials WMI Credentials to use in recon task.
+ * @param array $rcmd_credentials RCMD Credentials to use in recon task.
*
* @return interger Module id.
*/
-function create_net_scan($ip_target)
+function create_net_scan($ip_target, $snmp_version, $snmp_communities, $wmi_credentials, $rcmd_credentials)
{
global $config;
include_once $config['homedir'].'/godmode/wizards/HostDevices.class.php';
+ include_once $config['homedir'].'/include/functions_groups.php';
+
+ $group_name = 'AutoDiscovery';
+ $id_group = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($group_name));
+ if (!($id_group > 0)) {
+ $id_group = groups_create_group(
+ io_safe_input($group_name),
+ [
+ 'icon' => 'applications.png',
+ 'description' => '',
+ 'contact' => '',
+ 'other' => '',
+ ]
+ );
+
+ if (!($id_group > 0)) {
+ $id_group = 10;
+ }
+ }
+
+ $auth_strings = [];
+
+ $default_templates = [
+ io_safe_input('Linux System'),
+ io_safe_input('Windows System'),
+ io_safe_input('Windows Hardware'),
+ io_safe_input('Network Management'),
+ ];
+
+ $default_templates_ids = db_get_all_rows_sql(
+ 'SELECT id_np
+ FROM tnetwork_profile
+ WHERE name IN ('.implode(
+ ',',
+ array_map(
+ function ($template) {
+ return "'".$template."'";
+ },
+ $default_templates
+ )
+ ).')
+ ORDER BY name'
+ );
+
+ $id_base = 'autoDiscovery-WMI-';
+ $id = 0;
+ foreach ($wmi_credentials as $wmi) {
+ $id++;
+ $identifier = $id_base.$id;
+ while (db_get_value_sql(
+ sprintf(
+ 'SELECT COUNT(*) AS count FROM tcredential_store WHERE identifier = "%s"',
+ $identifier
+ )
+ ) > 0) {
+ $id++;
+ $identifier = $id_base.$id;
+ }
+
+ $storeKey = db_process_sql_insert(
+ 'tcredential_store',
+ [
+ 'identifier' => $identifier,
+ 'id_group' => $id_group,
+ 'product' => 'WMI',
+ 'username' => $wmi['credential']['user'],
+ 'password' => $wmi['credential']['pass'],
+ 'extra_1' => $wmi['credential']['namespace'],
+ ]
+ );
+
+ if ($storeKey !== false) {
+ $auth_strings[] = $identifier;
+ }
+ }
+
+ $id_base = 'autoDiscovery-RCMD-';
+ $id = 0;
+ foreach ($rcmd_credentials as $rcmd) {
+ $id++;
+ $identifier = $id_base.$id;
+ while (db_get_value_sql(
+ sprintf(
+ 'SELECT COUNT(*) AS count FROM tcredential_store WHERE identifier = "%s"',
+ $identifier
+ )
+ ) > 0) {
+ $id++;
+ $identifier = $id_base.$id;
+ }
+
+ $storeKey = db_process_sql_insert(
+ 'tcredential_store',
+ [
+ 'identifier' => $identifier,
+ 'id_group' => $id_group,
+ 'product' => 'CUSTOM',
+ 'username' => $rcmd['credential']['user'],
+ 'password' => $rcmd['credential']['pass'],
+ ]
+ );
+
+ if ($storeKey !== false) {
+ $auth_strings[] = $identifier;
+ }
+ }
+
$HostDevices = new HostDevices(1);
$id_recon_server = db_get_row_filter('tserver', ['server_type' => SERVER_TYPE_DISCOVERY], 'id_server')['id_server'];
@@ -493,7 +603,7 @@ function create_net_scan($ip_target)
'taskname' => __('Basic network'),
'id_recon_server' => $id_recon_server,
'network' => $ip_target,
- 'id_group' => '8',
+ 'id_group' => $id_group,
'comment' => __('Created on welcome'),
];
$task_created = $HostDevices->parseNetScan();
@@ -504,13 +614,13 @@ function create_net_scan($ip_target)
'page' => '2',
'recon_ports' => '',
'auto_monitor' => 'on',
- 'id_network_profile' => ['0' => '2'],
+ 'id_network_profile' => array_column($default_templates_ids, 'id_np'),
'review_results' => 'on',
'review_limited' => '0',
'snmp_enabled' => 'on',
- 'snmp_version' => '1',
+ 'snmp_version' => $snmp_version,
'snmp_skip_non_enabled_ifs' => 'on',
- 'community' => '',
+ 'community' => $snmp_communities,
'snmp_context' => '',
'snmp_auth_user' => '',
'snmp_security_level' => 'authNoPriv',
@@ -523,6 +633,9 @@ function create_net_scan($ip_target)
'parent_detection' => 'on',
'parent_recursion' => 'on',
'vlan_enabled' => 'on',
+ 'wmi_enabled' => 'on',
+ 'rcmd_enabled' => 'on',
+ 'auth_strings' => $auth_strings,
];
$task_final_created = $HostDevicesFinal->parseNetScan();
diff --git a/pandora_console/include/javascript/graph_analytics.js b/pandora_console/include/javascript/graph_analytics.js
index 475a310ebc..5a83c7c88f 100644
--- a/pandora_console/include/javascript/graph_analytics.js
+++ b/pandora_console/include/javascript/graph_analytics.js
@@ -253,30 +253,35 @@ function createDroppableZones(
)
);
- // Create remove button.
if (
- graphDiv
- .children()
- .children()
- .hasClass("parent_graph") === true
+ $("#hidden-section").val() ===
+ "operation/reporting/graph_analytics"
) {
- graphDiv
- .children()
- .children()
- .children(":first-child")
- .prepend(
- $(
- '
'
- )
- );
- } else {
- graphDiv
- .children()
- .append(
- $(
- '
'
- )
- );
+ // Create remove button.
+ if (
+ graphDiv
+ .children()
+ .children()
+ .hasClass("parent_graph") === true
+ ) {
+ graphDiv
+ .children()
+ .children()
+ .children(":first-child")
+ .prepend(
+ $(
+ '
'
+ )
+ );
+ } else {
+ graphDiv
+ .children()
+ .append(
+ $(
+ '
'
+ )
+ );
+ }
}
}
}
@@ -753,7 +758,7 @@ $("#button-share-modal").click(function(e) {
window.open(
configHomeurl +
- "/operation/reporting/graph_analytics_public.php?" +
+ "operation/reporting/graph_analytics_public.php?" +
queryParams
);
});
diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php
index fc54d29d2c..9c823ead01 100644
--- a/pandora_console/include/lib/Dashboard/Manager.php
+++ b/pandora_console/include/lib/Dashboard/Manager.php
@@ -1266,16 +1266,18 @@ class Manager implements PublicLogin
}
if (empty($cells) === false) {
- $result = array_reduce(
- $cells,
- function ($carry, $item) {
- $carry[$item['order']]['id'] = $item['id'];
- $carry[$item['order']]['position'] = $item['position'];
- $carry[$item['order']]['widgetId'] = $item['id_widget'];
+ $result = array_values(
+ array_reduce(
+ $cells,
+ function ($carry, $item) {
+ $carry[$item['order']]['id'] = $item['id'];
+ $carry[$item['order']]['position'] = $item['position'];
+ $carry[$item['order']]['widgetId'] = $item['id_widget'];
- return $carry;
- },
- []
+ return $carry;
+ },
+ []
+ )
);
}
diff --git a/pandora_console/include/styles/jquery.tag-editor.css b/pandora_console/include/styles/jquery.tag-editor.css
index 5d535dba1e..31040fca45 100644
--- a/pandora_console/include/styles/jquery.tag-editor.css
+++ b/pandora_console/include/styles/jquery.tag-editor.css
@@ -108,9 +108,7 @@
cursor: default;
font-size: 14px;
}
-.ui-front {
- z-index: 9999;
-}
+
.ui-menu {
list-style: none;
padding: 1px;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index a1f76eef71..2b347fd81a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1945,7 +1945,7 @@ div.title_line {
#menu_tab_frame_view_bc {
position: sticky;
top: 61px;
- z-index: 2;
+ z-index: 3;
display: flex;
align-items: flex-end;
justify-content: space-between;
@@ -10954,6 +10954,18 @@ div.status_dot {
-webkit-mask: url(../../images/status_dot.svg) no-repeat center / contain;
}
+button div.import {
+ mask: url(../../images/import.svg) no-repeat center / contain;
+ -webkit-mask: url(../../images/import.svg) no-repeat center / contain;
+ height: 1.5rem;
+}
+
+button div.export {
+ mask: url(../../images/export.svg) no-repeat center / contain;
+ -webkit-mask: url(../../images/export.svg) no-repeat center / contain;
+ height: 1.5rem;
+}
+
.status_dot.ok {
background-color: #82b92e;
}
@@ -13504,3 +13516,79 @@ tr.shown td.details-control {
mask: url(../../images/minimizar.svg) no-repeat right / contain;
-webkit-mask: url(../../images/minimizar.svg) no-repeat right / contain;
}
+
+#modules-toggle > .modules > .white-box-content div {
+ z-index: 1 !important;
+}
+
+/* Import/export */
+.div-import-export {
+ display: flex;
+ flex-direction: row;
+}
+
+.form-import {
+ width: 48%;
+ height: auto;
+ margin-right: 40px;
+}
+
+.div-import {
+ background-color: #ffffff;
+ border: 1px solid #e5e9ed;
+ border-radius: 8px;
+ width: 100%;
+ height: 180px;
+ display: flex;
+ flex-direction: row;
+ align-items: normal;
+ padding-top: 20px;
+ padding-left: 20px;
+ margin-bottom: 20px;
+}
+
+.div-export {
+ background-color: #ffffff;
+ border: 1px solid #e5e9ed;
+ border-radius: 8px;
+ width: 48%;
+ height: 180px;
+ display: flex;
+ flex-direction: row;
+ align-items: normal;
+ padding-top: 20px;
+ padding-left: 20px;
+ margin-bottom: 20px;
+}
+
+@media (max-width: 1300px) {
+ .div-import-export {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .div-export {
+ width: calc(100% - 20px);
+ }
+
+ .form-import {
+ width: calc(100% - 20px);
+ }
+}
+
+.input-file-style::file-selector-button {
+ background-color: #ffffff;
+ border: 1px solid #979797;
+ border-radius: 4px;
+ width: 120px;
+ height: 32px;
+}
+
+button.disabled {
+ background: #c0ccdc !important;
+ border: 0px;
+}
+
+.ui-draggable-handle {
+ z-index: 2 !important;
+}
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d3ae55cd59..f3cd8dfd5f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
'
- )
- );
- } else {
- graphDiv
- .children()
- .append(
- $(
- '