tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop' 

Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
This commit is contained in:
Rafael Ameijeiras 2023-04-05 06:47:31 +00:00
parent ce43cc9bb2 490e547202
commit cc2709c42c
5 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_graph.php
View File

@ -4934,7 +4934,7 @@ function iterate_group_array($groups, &$data_agents)
break;
}
$tooltip_content = html_print_image('images/groups_small/'.$group['icon'].'.png', true).'&nbsp;'.__('Group').': <b>'.$group_aux['name'].'</b>';
$tooltip_content = html_print_image('images/'.$group['icon'], true).'&nbsp;'.__('Group').': <b>'.$group_aux['name'].'</b>';
$group_aux['tooltip_content'] = $tooltip_content;
$group_aux['children'] = [];
@ -4975,10 +4975,10 @@ function graph_monitor_wheel($width=550, $height=600, $filter=false)
if ($filter['group'] != 0) {
$filter_subgroups = '';
if (!$filter['dont_show_subgroups']) {
$filter_subgroups = ' || parent = '.$filter['group'];
$filter_subgroups = ' || parent IN ('.$filter['group'].')';
}
$groups = db_get_all_rows_sql('SELECT * FROM tgrupo where id_grupo = '.$filter['group'].$filter_subgroups);
$groups = db_get_all_rows_sql('SELECT * FROM tgrupo where id_grupo IN ('.$filter['group'].') '.$filter_subgroups);
$groups_ax = [];
foreach ($groups as $g) {

2
pandora_console/include/functions_menu.php
View File

@ -68,6 +68,8 @@ function menu_print_menu(&$menu)
$sec2 = 'godmode/alerts/alert_commands';
} else if ($sec2 === 'enterprise/godmode/setup/edit_skin') {
$sec2 = 'enterprise/godmode/setup/setup_skins';
} else if ($sec2 === 'operation/agentes/networkmap.dinamic') {
$sec2 = 'operation/agentes/pandora_networkmap';
} else if ($sec2 === 'godmode/gis_maps/configure_gis_map') {
$map_id = (string) get_parameter('map_id');
if (empty($map_id) === false) {

3
pandora_console/include/javascript/functions_pandora_networkmap.js
View File

@ -3886,6 +3886,9 @@ function draw_elements_graph() {
.attr("node_id", function(d) {
return d.id + networkmap_id;
})
.attr("style", function(d) {
return d.id === 0 ? "filter: invert(0%)" : "";
})
.attr("id", "image2995")
.classed("dragable_node", true) //own dragable
.on("mouseover", function(d) {

4
pandora_console/include/styles/networkmap.css
View File

@ -12,6 +12,10 @@
stroke-width: 5;
}
.node_image {
filter: invert(100%) brightness(125%);
}
.node_children {
stroke: #00f;
}

38
pandora_console/operation/agentes/networkmap.dinamic.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@ -11,7 +11,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
// Load global vars.
global $config;
check_login();
@ -39,7 +39,7 @@ if (defined('_activeTab_') && _activeTab_ != '_activeTab_') {
$tab = $activeTab;
}
// Networkmap id required
// Networkmap id required.
if (!isset($id)) {
db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION,
@ -49,7 +49,7 @@ if (!isset($id)) {
exit;
}
// Get the group for ACL
// Get the group for ACL.
if (!isset($store_group)) {
$store_group = db_get_value('id_group', 'tmap', 'id', $id);
if ($store_group === false) {
@ -62,7 +62,7 @@ if (!isset($store_group)) {
}
}
// ACL for the networkmap permission
// ACL for the networkmap permission.
if (!isset($networkmap_read)) {
$networkmap_read = check_acl($config['id_user'], $store_group, 'MR');
}
@ -91,12 +91,12 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use
$networkmap = db_get_row('tmap', 'id', $id);
$pure = (int) get_parameter('pure', 0);
// Main code
// Main code.
if ($pure == 1) {
$buttons['screen'] = [
'active' => false,
'text' => '<a href="index.php?sec=network&amp;'.'sec2=operation/agentes/networkmap.dinamic&amp;'.'activeTab=radial_dynamic&amp;id_networkmap='.$id.'">'.html_print_image(
'images/normal_screen.png',
'images/exit_fullscreen@svg.svg',
true,
[
'title' => __('Normal screen'),
@ -109,7 +109,7 @@ if ($pure == 1) {
$buttons['screen'] = [
'active' => false,
'text' => '<a href="index.php?sec=network&amp;'.'sec2=operation/agentes/networkmap.dinamic&amp;'.'pure=1&amp;activeTab=radial_dynamic&amp;id_networkmap='.$id.'">'.html_print_image(
'images/full_screen.png',
'images/fullscreen@svg.svg',
true,
[
'title' => __('Full screen'),
@ -120,7 +120,7 @@ if ($pure == 1) {
$buttons['list'] = [
'active' => false,
'text' => '<a href="index.php?sec=networkmapconsole&amp;'.'sec2=operation/agentes/pandora_networkmap">'.html_print_image(
'images/list.png',
'images/file-collection@svg.svg',
true,
[
'title' => __('List of networkmap'),
@ -132,16 +132,24 @@ if ($pure == 1) {
}
if ($dashboard != 1) {
ui_print_page_header(
// Header.
ui_print_standard_header(
io_safe_output($networkmap['name']),
'images/bricks.png',
false,
'network_map_enterprise_list',
false,
$buttons,
false,
'',
$config['item_title_size_text']
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Network maps'),
],
]
);
}
@ -208,14 +216,14 @@ switch ($networkmap['generation_method']) {
break;
}
// Set filter
// Set filter.
$filter = networkmap_get_filter($layout);
if (!isset($text_filter)) {
$text_filter = '';
}
// Generate dot file
// Generate dot file.
$graph = networkmap_generate_hash(
__('Pandora FMS'),
$group,