';
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index b28b43f502..43fb9138c7 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -1340,6 +1340,10 @@ class NetworkMap
if ($rel['parent_type'] == NODE_MODULE
&& $rel['child_type'] == NODE_MODULE
) {
+ // Keep std references.
+ $ref_id_parent = $id_parent;
+ $ref_id_child = $id_child;
+
// Module information available.
$id_parent = $rel['id_parent_source_data'];
$id_child = $rel['id_child_source_data'];
@@ -1374,6 +1378,12 @@ class NetworkMap
'index' => $index,
'priority' => $priority,
];
+
+ // Keep node reference mapping - low precedence relationship.
+ $rel_map[$ref_id_parent.'_'.$ref_id_child] = [
+ 'index' => $index,
+ 'priority' => $priority,
+ ];
}
} else if ($rel['parent_type'] == NODE_AGENT
&& $rel['child_type'] == NODE_AGENT
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9585142299..391e652262 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 = 'PC200115';
+$build_version = 'PC200116';
$pandora_version = 'v7.0NG.742';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index dda25538ee..56172331c6 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1453,6 +1453,20 @@ function networkmap_delete_nodes($id_map)
}
+/**
+ * Delete relations given id_map
+ *
+ * @param integer $id_map
+ * @return integer result
+ */
+function networkmap_delete_relations($id_map)
+{
+ $result = db_process_sql_delete('trel_item', ['id_map' => $id_map]);
+
+ return $result;
+}
+
+
function get_networkmaps($id)
{
$groups = array_keys(users_get_groups(null, 'IW'));
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 4049df62c9..a3649994fc 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -919,9 +919,10 @@ function servers_get_info($id_server=-1)
// Remote servers LAG Calculation (server_type != 0).
if ($server['server_type'] != 0) {
+ // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
$result = db_get_row_sql(
'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
- AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS lag
+ AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS "lag"
FROM tagente_estado, tagente_modulo, tagente
WHERE utimestamp > 0
AND tagente.disabled = 0
@@ -935,9 +936,10 @@ function servers_get_info($id_server=-1)
);
} else {
// Local/Dataserver server LAG calculation.
+ // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
$result = db_get_row_sql(
'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
- AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS lag
+ AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS "lag"
FROM tagente_estado, tagente_modulo, tagente
WHERE utimestamp > 0
AND tagente.disabled = 0
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index be2c47afd6..9f559afa2d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4990,11 +4990,10 @@ input:checked + .p-slider:before {
.action_buttons input[type="image"],
.action_button_img {
border-radius: 4px;
- border: 1px solid #dcdcdc;
- padding: 1px;
+ border: 1px solid #dcdcdc !important;
+ padding: 1px !important;
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
max-width: 21px;
- background-color: transparent; /*BORRAR*/
}
/* This class is for only one icon to be a button type. */
diff --git a/pandora_console/install.php b/pandora_console/install.php
index dd26d01916..d42fc41a5f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
$random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
");
diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php
index 7f698d8653..d719df08cd 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.editor.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php
@@ -81,8 +81,8 @@ if ($edit_networkmap) {
$id_group = $values['id_group'];
// ACL for the network map.
- $networkmap_write = check_acl($config['id_user'], $id_group, 'MW');
- $networkmap_manage = check_acl($config['id_user'], $id_group, 'MM');
+ $networkmap_write = check_acl($config['id_user'], $id_group_map, 'MW');
+ $networkmap_manage = check_acl($config['id_user'], $id_group_map, 'MM');
if (!$networkmap_write && !$networkmap_manage) {
db_pandora_audit(
@@ -95,6 +95,9 @@ if ($edit_networkmap) {
$name = io_safe_output($values['name']);
+ // Id group of the map itself, not data source.
+ $id_group_map = $values['id_group_map'];
+
$description = $values['description'];
$filter = json_decode($values['filter'], true);
@@ -267,8 +270,8 @@ if ($not_found) {
$config['id_user'],
'AR',
true,
- 'id_group',
- $id_group,
+ 'id_group_map',
+ $id_group_map,
'',
'',
'',
@@ -329,6 +332,28 @@ if ($not_found) {
$table->data['source_data_ip_mask'][0] = __('Source from CIDR IP mask');
$table->data['source_data_ip_mask'][1] = html_print_input_text('ip_mask', $ip_mask, '', 20, 255, true, $disabled_source);
+ $table->data['source_data_group'][0] = __('Source group');
+ $table->data['source_data_group'][1] = html_print_select_groups(
+ $config['id_user'],
+ 'AR',
+ true,
+ 'id_group',
+ $id_group,
+ '',
+ '',
+ '',
+ true
+ );
+ $table->data['source_data_group'][1] .= html_print_image(
+ 'images/error.png',
+ true,
+ [
+ 'id' => 'group_change_warning',
+ 'title' => __('Source id group changed. All elements in networkmap will be lost.'),
+ 'style' => 'display : none',
+ ]
+ );
+
$table->data['source_data_dont_show_subgroups'][0] = __('Don\'t show subgroups:');
$table->data['source_data_dont_show_subgroups'][1] = html_print_checkbox(
'dont_show_subgroups',
@@ -379,7 +404,7 @@ if ($not_found) {
$table->data['kval'][0] = __('Default ideal node separation');
$table->data['kval'][1] = html_print_input_text('kval', $kval, '', 5, 10, true, $disabled_source, false, $itemClass).ui_print_help_tip(__('Only fdp. Default ideal node separation in the layout. By default 0.3'), true);
- echo '