Merge branch 'develop' into ent-12977-cambio-instalador-online-para-forzar-lts-a-php8-y-por-defecto-para-no-lts-8-2

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.775-240304
+Version: 7.0NG.775-240305
 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.775-240304"
+pandora_version="7.0NG.775-240305"
 
 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

@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.775';
-use constant AGENT_BUILD => '240304';
+use constant AGENT_BUILD => '240305';
 
 # 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.775
-%define release     240304
+%define release     240305
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.redhat_bin.el8.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240304
+%define release     240305
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version

pandora_agents/unix/pandora_agent.redhat_bin.el9.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240304
+%define release     240305
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version

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.775
-%define release     240304
+%define release     240305
 
 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.775
-%define release     240304
+%define release     240305
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240304"
+PI_BUILD="240305"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{240304}
+{240305}
 
 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.775 Build 240304")
+#define PANDORA_VERSION ("7.0NG.775 Build 240305")
 
 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.775(Build 240304))"
+      VALUE "ProductVersion", "(7.0NG.775(Build 240305))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.775-240304
+Version: 7.0NG.775-240305
 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.775-240304"
+pandora_version="7.0NG.775-240305"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/demodata/dashboards/1-dashboard.prd

@@ -1,65 +1,83 @@
-[dashboard_data]
+[prd_data]
 
+type="dashboard"
 name="Demo dashboard"
-group="Demo dashboard"
 
-[dashboard_items]
+[tdashboard]
 
-title[1]="Groups status"
+id[14]="14"
-type[1]="system_group_status"
+name[14]="Demo dashboard"
-x[1]="0"
+id_user[14]=""
-y[1]="0"
+id_group[14]="0"
-width[1]="5"
+active[14]="0"
-height[1]="4"
+cells[14]="7"
+cells_slideshow[14]="0"
+date_range[14]="0"
+date_from[14]="0"
+date_to[14]="0"
 
-title[2]="Network map"
+[twidget_dashboard]
-type[2]="network_map"
-x[2]="5"
-y[2]="0"
-width[2]="7"
-height[2]="6"
-map_name[2]="Demo sunburst network map"
 
-title[3]="Module histogram"
+id[55]="55"
-type[3]="graph_module_histogram"
+position[55]="{\"x\":\"0\",\"y\":\"0\",\"width\":\"5\",\"height\":\"4\"}"
-x[3]="0"
+options[55]="{\"title\":\"Groups status\",\"background\":\"#ffffff\",\"groupId\":[\"0\"],\"status\":[\"4,1,0,2\"],\"sunburst\":false}"
-y[3]="4"
+order[55]="0"
-width[3]="5"
+id_dashboard[55]="14"
-height[3]="2"
+id_widget[55]="{\"twidget\":{\"unique_name\":\"system_group_status\"}}"
-agent_name[3]="demo-global-agent-1"
+prop_width[55]="5"
-module[3]="Host Alive"
+prop_height[55]="4"
-interval[3]="86400"
 
-title[4]="List of latest events"
+id[56]="56"
-type[4]="events_list"
+position[56]="{\"x\":\"5\",\"y\":\"0\",\"width\":\"7\",\"height\":\"6\"}"
-x[4]="0"
+options[56]="{\"title\":\"Network map\",\"background\":\"#ffffff\",\"networkmapId\":{\"tmap\":{\"name\":\"Demo sunburst network map\"}},\"xOffset\":\"0\",\"yOffset\":\"0\",\"zoomLevel\":0.5}"
-y[4]="6"
+order[56]="1"
-width[4]="12"
+id_dashboard[56]="14"
-height[4]="5"
+id_widget[56]="{\"twidget\":{\"unique_name\":\"network_map\"}}"
+prop_width[56]="7"
+prop_height[56]="6"
 
-title[5]="Top N events by agent"
+id[57]="57"
-type[5]="top_n_events_by_group"
+position[57]="{\"x\":\"0\",\"y\":\"4\",\"width\":\"5\",\"height\":\"2\"}"
-x[5]="6"
+options[57]="{\"title\":\"Module histogram\",\"background\":\"#ffffff\",\"id_group\":\"\",\"label\":\"\",\"agentId\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}},\"metaconsoleId\":\"0\",\"moduleId\":\"{\\"tagente_modulo\\":{\\"nombre\\":\\"Host Alive\\",\\"id_agente\\":{\\"tagente\\":{\\"nombre\\":\\"demo-global-agent-1\\"}}}}\",\"period\":\"86400\",\"sizeLabel\":\"30\"}"
-y[5]="11"
+order[57]="2"
-width[5]="6"
+id_dashboard[57]="14"
-height[5]="8"
+id_widget[57]="{\"twidget\":{\"unique_name\":\"graph_module_histogram\"}}"
+prop_width[57]="5"
+prop_height[57]="2"
 
-title[6]="Top N of agent modules"
+id[58]="58"
-type[6]="top_n"
+position[58]="{\"x\":\"0\",\"y\":\"6\",\"width\":\"12\",\"height\":\"5\"}"
-x[6]="0"
+options[58]="{\"title\":\"List of latest events\",\"background\":\"#ffffff\",\"eventType\":0,\"maxHours\":8,\"limit\":20,\"eventStatus\":-1,\"severity\":-1,\"groupId\":[\"\"],\"tagsId\":[\"\"],\"groupRecursion\":0,\"customFilter\":-1,\"columns_events_widget\":[\"mini_severity,evento,estado,agent_name,timestamp\",\"\"]}"
-y[6]="11"
+order[58]="3"
-width[6]="6"
+id_dashboard[58]="14"
-height[6]="4"
+id_widget[58]="{\"twidget\":{\"unique_name\":\"events_list\"}}"
-agent_name[6]="cisco-.*"
+prop_width[58]="12"
-module[6]=".*ifOutOctets"
+prop_height[58]="5"
-interval[6]="86400"
+
+id[59]="59"
+position[59]="{\"x\":\"6\",\"y\":\"11\",\"width\":\"6\",\"height\":\"8\"}"
+options[59]="{\"title\":\"Top N events by agent\",\"background\":\"#ffffff\",\"amountShow\":10,\"maxHours\":8,\"groupId\":[\"0\"],\"legendPosition\":\"bottom\",\"show_total_data\":0}"
+order[59]="5"
+id_dashboard[59]="14"
+id_widget[59]="{\"twidget\":{\"unique_name\":\"top_n_events_by_group\"}}"
+prop_width[59]="6"
+prop_height[59]="8"
+
+id[60]="60"
+position[60]="{\"x\":\"0\",\"y\":\"11\",\"width\":\"6\",\"height\":\"4\"}"
+options[60]="{\"title\":\"Top N of agent modules\",\"background\":\"#ffffff\",\"agent\":\"cisco-.*\",\"module\":\".*ifOutOctets\",\"period\":\"86400\",\"quantity\":\"10\",\"order\":\"2\",\"display\":\"0\",\"type_graph\":\"bar_vertical\",\"legend\":\"agent_module\"}"
+order[60]="4"
+id_dashboard[60]="14"
+id_widget[60]="{\"twidget\":{\"unique_name\":\"top_n\"}}"
+prop_width[60]="6"
+prop_height[60]="4"
+
+id[61]="61"
+position[61]="{\"x\":\"0\",\"y\":\"15\",\"width\":\"6\",\"height\":\"4\"}"
+options[61]="{\"title\":\"Top N of agent modules\",\"background\":\"#ffffff\",\"agent\":\"cisco-.*\",\"module\":\".*ifInOctets\",\"period\":\"86400\",\"quantity\":\"10\",\"order\":\"2\",\"display\":\"0\",\"type_graph\":\"bar_vertical\",\"legend\":\"agent_module\"}"
+order[61]="6"
+id_dashboard[61]="14"
+id_widget[61]="{\"twidget\":{\"unique_name\":\"top_n\"}}"
+prop_width[61]="6"
+prop_height[61]="4"
 
-title[7]="Top N of agent modules"
-type[7]="top_n"
-x[7]="0"
-y[7]="15"
-width[7]="6"
-height[7]="4"
-agent_name[7]="cisco-.*"
-module[7]=".*ifInOctets"
-interval[7]="86400"

pandora_console/extras/demodata/gis_maps/1-gismap.prd

@@ -1,16 +1,40 @@
-[gis_data]
+[prd_data]
 
+type="gis_map"
 name="Demo GIS map"
-group="Demo servers"
-zoom_level="6"
-initial_latitude="40"
-initial_longitude="-3"
-initial_altitude="0"
-default_latitude="40"
-default_longitude="-3"
-default_altitude="0"
 
-[gis_layers]
+[tgis_map]
+
+id_tgis_map[2]="2"
+map_name[2]="Demo GIS map"
+initial_longitude[2]="-3"
+initial_latitude[2]="40"
+initial_altitude[2]="0"
+zoom_level[2]="6"
+map_background[2]=""
+default_longitude[2]="-3"
+default_latitude[2]="40"
+default_altitude[2]="0"
+group_id[2]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+default_map[2]="0"
+
+[tgis_map_layer]
+
+id_tmap_layer[2]="2"
+layer_name[2]="Demo servers"
+view_layer[2]="1"
+layer_stack_order[2]="0"
+tgis_map_id_tgis_map[2]="2"
+tgrupo_id_grupo[2]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+
+[tgis_map_layer_groups]
+
+[tgis_map_layer_has_tagente]
+
+[tgis_map_has_tgis_map_con]
+
+tgis_map_id_tgis_map[2-1]="2"
+tgis_map_con_id_tmap_con[2-1]="{\"tgis_map_connection\":{\"conection_name\":\"OpenStreetMap (MapQuest Open)\"}}"
+modification_time[2-1]="2024-02-07 18:23:27"
+default_map_connection[2-1]="0"
 
-name[1]="Demo servers"
-group[1]="Demo servers"

pandora_console/extras/demodata/graphs/1-cpu-graph.prd

@@ -1,21 +1,59 @@
-[graph_data]
+[prd_data]
 
+type="custom_graph"
 name="Linux CPU Load"
-group="Demo servers"
-description="This is a demo custom graph for linux agents CPU Load"
-type="s_area"
-periodicity="86400"
 
-[graph_items]
+[tgraph]
 
-agent_name[1]="linux-1"
+id_graph[1]="1"
-module[1]="CPU Load"
+id_user[1]=""
+name[1]="Linux CPU Load"
+description[1]="This is a demo custom graph for linux agents CPU Load"
+period[1]="86400"
+width[1]="0"
+height[1]="0"
+private[1]="0"
+events[1]="0"
+stacked[1]="1"
+id_group[1]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+id_graph_template[1]="0"
+percentil[1]="0"
+summatory_series[1]="0"
+average_series[1]="0"
+modules_series[1]="0"
+fullscale[1]="0"
 
-agent_name[2]="linux-2"
+[tgraph_source]
-module[2]="CPU Load"
 
-agent_name[3]="linux-3"
+id_gs[1]="1"
-module[3]="CPU Load"
+id_graph[1]="1"
+id_server[1]="0"
+id_agent_module[1]="{\"tagente_modulo\":{\"nombre\":\"CPU Load\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-1\"}}}}"
+weight[1]="1"
+label[1]=""
+field_order[1]="0"
+
+id_gs[2]="2"
+id_graph[2]="1"
+id_server[2]="0"
+id_agent_module[2]="{\"tagente_modulo\":{\"nombre\":\"CPU Load\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-2\"}}}}"
+weight[2]="1"
+label[2]=""
+field_order[2]="0"
+
+id_gs[3]="3"
+id_graph[3]="1"
+id_server[3]="0"
+id_agent_module[3]="{\"tagente_modulo\":{\"nombre\":\"CPU Load\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-3\"}}}}"
+weight[3]="1"
+label[3]=""
+field_order[3]="0"
+
+id_gs[4]="4"
+id_graph[4]="1"
+id_server[4]="0"
+id_agent_module[4]="{\"tagente_modulo\":{\"nombre\":\"CPU Load\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-4\"}}}}"
+weight[4]="1"
+label[4]=""
+field_order[4]="0"
 
-agent_name[4]="linux-4"
-module[4]="CPU Load"

pandora_console/extras/demodata/graphs/2-disks-graph.prd

@@ -1,21 +1,59 @@
-[graph_data]
+[prd_data]
 
+type="custom_graph"
 name="Linux Disk Usage"
-group="Demo servers"
-description="This is a demo custom graph for linux agents Disk Usage"
-type="line"
-periodicity="86400"
 
-[graph_items]
+[tgraph]
 
-agent_name[1]="linux-1"
+id_graph[2]="2"
-module[1]="Disk Usage"
+id_user[2]=""
+name[2]="Linux Disk Usage"
+description[2]="This is a demo custom graph for linux agents Disk Usage"
+period[2]="86400"
+width[2]="0"
+height[2]="0"
+private[2]="0"
+events[2]="0"
+stacked[2]="2"
+id_group[2]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+id_graph_template[2]="0"
+percentil[2]="0"
+summatory_series[2]="0"
+average_series[2]="0"
+modules_series[2]="0"
+fullscale[2]="0"
 
-agent_name[2]="linux-2"
+[tgraph_source]
-module[2]="Disk Usage"
 
-agent_name[3]="linux-3"
+id_gs[5]="5"
-module[3]="Disk Usage"
+id_graph[5]="2"
+id_server[5]="0"
+id_agent_module[5]="{\"tagente_modulo\":{\"nombre\":\"Disk Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-1\"}}}}"
+weight[5]="1"
+label[5]=""
+field_order[5]="0"
+
+id_gs[6]="6"
+id_graph[6]="2"
+id_server[6]="0"
+id_agent_module[6]="{\"tagente_modulo\":{\"nombre\":\"Disk Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-2\"}}}}"
+weight[6]="1"
+label[6]=""
+field_order[6]="0"
+
+id_gs[7]="7"
+id_graph[7]="2"
+id_server[7]="0"
+id_agent_module[7]="{\"tagente_modulo\":{\"nombre\":\"Disk Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-3\"}}}}"
+weight[7]="1"
+label[7]=""
+field_order[7]="0"
+
+id_gs[8]="8"
+id_graph[8]="2"
+id_server[8]="0"
+id_agent_module[8]="{\"tagente_modulo\":{\"nombre\":\"Disk Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-4\"}}}}"
+weight[8]="1"
+label[8]=""
+field_order[8]="0"
 
-agent_name[4]="linux-4"
-module[4]="Disk Usage"

pandora_console/extras/demodata/graphs/3-network-usage-graph.prd

@@ -1,27 +1,75 @@
-[graph_data]
+[prd_data]
 
+type="custom_graph"
 name="Network Usage"
-group="Demo servers"
-description="This is a demo custom graph for linux and windows agents Network Usage"
-type="s_area"
-periodicity="86400"
 
-[graph_items]
+[tgraph]
 
-agent_name[1]="linux-1"
+id_graph[3]="3"
-module[1]="Network Usage"
+id_user[3]=""
+name[3]="Network Usage"
+description[3]="This is a demo custom graph for linux and windows agents Network Usage"
+period[3]="86400"
+width[3]="0"
+height[3]="0"
+private[3]="0"
+events[3]="0"
+stacked[3]="1"
+id_group[3]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+id_graph_template[3]="0"
+percentil[3]="0"
+summatory_series[3]="0"
+average_series[3]="0"
+modules_series[3]="0"
+fullscale[3]="0"
 
-agent_name[2]="linux-2"
+[tgraph_source]
-module[2]="Network Usage"
 
-agent_name[3]="linux-3"
+id_gs[9]="9"
-module[3]="Network Usage"
+id_graph[9]="3"
+id_server[9]="0"
+id_agent_module[9]="{\"tagente_modulo\":{\"nombre\":\"Network Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-1\"}}}}"
+weight[9]="1"
+label[9]=""
+field_order[9]="0"
 
-agent_name[4]="linux-4"
+id_gs[10]="10"
-module[4]="Network Usage"
+id_graph[10]="3"
+id_server[10]="0"
+id_agent_module[10]="{\"tagente_modulo\":{\"nombre\":\"Network Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-2\"}}}}"
+weight[10]="1"
+label[10]=""
+field_order[10]="0"
 
-agent_name[5]="windows-1"
+id_gs[11]="11"
-module[5]="Network Usage"
+id_graph[11]="3"
+id_server[11]="0"
+id_agent_module[11]="{\"tagente_modulo\":{\"nombre\":\"Network Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-3\"}}}}"
+weight[11]="1"
+label[11]=""
+field_order[11]="0"
+
+id_gs[12]="12"
+id_graph[12]="3"
+id_server[12]="0"
+id_agent_module[12]="{\"tagente_modulo\":{\"nombre\":\"Network Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-4\"}}}}"
+weight[12]="1"
+label[12]=""
+field_order[12]="0"
+
+id_gs[13]="13"
+id_graph[13]="3"
+id_server[13]="0"
+id_agent_module[13]="{\"tagente_modulo\":{\"nombre\":\"Network Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"windows-1\"}}}}"
+weight[13]="1"
+label[13]=""
+field_order[13]="0"
+
+id_gs[14]="14"
+id_graph[14]="3"
+id_server[14]="0"
+id_agent_module[14]="{\"tagente_modulo\":{\"nombre\":\"Network Usage\",\"id_agente\":{\"tagente\":{\"nombre\":\"windows-2\"}}}}"
+weight[14]="1"
+label[14]=""
+field_order[14]="0"
 
-agent_name[6]="windows-2"
-module[6]="Network Usage"

pandora_console/extras/demodata/network_maps/1-networkmap.prd

@@ -1,143 +1,670 @@
-[map_data]
+[prd_data]
 
+type="network_map"
 name="Demo network map"
-group="Demo network"
-description="This is a demo network map"
-node_radius="40"
-generation_method="circular"
 
-[map_items]
+[tmap]
 
-agent_name[1]="cisco-1"
+id[2]="2"
+id_group[2]="{\"tgrupo\":{\"nombre\":\"Demo network\"}}"
+id_user[2]=""
+type[2]="0"
+subtype[2]="0"
+name[2]="Demo network map"
+description[2]="This is a demo network map"
+height[2]="0"
+width[2]="0"
+center_x[2]="0"
+center_y[2]="0"
+background[2]=""
+background_options[2]="0"
+source_period[2]="0"
+source[2]="0"
+source_data[2]="{\"tgrupo\":{\"nombre\":\"Demo network\"}}"
+generation_method[2]="0"
+generated[2]="0"
+filter[2]="{\"dont_show_subgroups\":0,\"node_radius\":\"40\",\"x_offs\":0,\"y_offs\":0,\"z_dash\":\"0.5\",\"node_sep\":\"0.25\",\"rank_sep\":\"0.25\",\"mindist\":1,\"kval\":\"0.3\"}"
+id_group_map[2]="{\"tgrupo\":{\"nombre\":\"Demo network\"}}"
+refresh_time[2]="300"
+
+[titem]
+
+id[1]="1"
+id_map[1]="2"
 x[1]="854"
 y[1]="221"
+z[1]="0"
+deleted[1]="0"
+type[1]="0"
+refresh[1]="0"
+source[1]="0"
+source_data[1]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+options[1]=""
+style[1]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/cisco@os.svg\",\"width\":null,\"height\":null,\"label\":\"cisco-1\"}"
 
-agent_name[2]="freebsd-1"
+id[2]="2"
+id_map[2]="2"
 x[2]="1184"
 y[2]="-25"
-parent[2]="1"
+z[2]="0"
+deleted[2]="0"
+type[2]="0"
+refresh[2]="0"
+source[2]="0"
+source_data[2]="{\"tagente\":{\"nombre\":\"freebsd-1\"}}"
+options[2]=""
+style[2]="{\"shape\":\"circle\",\"image\":\"images/networkmap/freebsd@os.svg\",\"width\":null,\"height\":null,\"label\":\"freebsd-1\"}"
 
-agent_name[3]="macos-1"
+id[3]="3"
+id_map[3]="2"
 x[3]="1268"
 y[3]="235"
-parent[3]="1"
+z[3]="0"
+deleted[3]="0"
+type[3]="0"
+refresh[3]="0"
+source[3]="0"
+source_data[3]="{\"tagente\":{\"nombre\":\"macos-1\"}}"
+options[3]=""
+style[3]="{\"shape\":\"circle\",\"image\":\"images/networkmap/apple@os.svg\",\"width\":null,\"height\":null,\"label\":\"macos-1\"}"
 
-agent_name[4]="windows-1"
+id[4]="4"
+id_map[4]="2"
 x[4]="528"
 y[4]="-37"
-parent[4]="1"
+z[4]="0"
+deleted[4]="0"
+type[4]="0"
+refresh[4]="0"
+source[4]="0"
+source_data[4]="{\"tagente\":{\"nombre\":\"windows-1\"}}"
+options[4]=""
+style[4]="{\"shape\":\"circle\",\"image\":\"images/networkmap/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-1\"}"
 
-agent_name[5]="windows-2"
+id[5]="5"
+id_map[5]="2"
 x[5]="514"
 y[5]="389"
-parent[5]="1"
+z[5]="0"
+deleted[5]="0"
+type[5]="0"
+refresh[5]="0"
+source[5]="0"
+source_data[5]="{\"tagente\":{\"nombre\":\"windows-2\"}}"
+options[5]=""
+style[5]="{\"shape\":\"circle\",\"image\":\"images/networkmap/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-2\"}"
 
-agent_name[6]="linux-1"
+id[6]="6"
+id_map[6]="2"
 x[6]="342"
 y[6]="-273"
-parent[6]="4"
+z[6]="0"
+deleted[6]="0"
+type[6]="0"
+refresh[6]="0"
+source[6]="0"
+source_data[6]="{\"tagente\":{\"nombre\":\"linux-1\"}}"
+options[6]=""
+style[6]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-1\"}"
 
-agent_name[7]="linux-2"
+id[7]="7"
+id_map[7]="2"
 x[7]="240"
 y[7]="-7"
-parent[7]="4"
+z[7]="0"
+deleted[7]="0"
+type[7]="0"
+refresh[7]="0"
+source[7]="0"
+source_data[7]="{\"tagente\":{\"nombre\":\"linux-2\"}}"
+options[7]=""
+style[7]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-2\"}"
 
-agent_name[8]="linux-3"
+id[8]="8"
+id_map[8]="2"
 x[8]="214"
 y[8]="275"
-parent[8]="5"
+z[8]="0"
+deleted[8]="0"
+type[8]="0"
+refresh[8]="0"
+source[8]="0"
+source_data[8]="{\"tagente\":{\"nombre\":\"linux-3\"}}"
+options[8]=""
+style[8]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-3\"}"
 
-agent_name[9]="linux-4"
+id[9]="9"
+id_map[9]="2"
 x[9]="226"
 y[9]="595"
-parent[9]="5"
+z[9]="0"
+deleted[9]="0"
+type[9]="0"
+refresh[9]="0"
+source[9]="0"
+source_data[9]="{\"tagente\":{\"nombre\":\"linux-4\"}}"
+options[9]=""
+style[9]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-4\"}"
 
-agent_name[10]="cisco-2"
+id[10]="10"
+id_map[10]="2"
 x[10]="1036"
 y[10]="711"
-parent[10]="1"
+z[10]="0"
+deleted[10]="0"
+type[10]="0"
+refresh[10]="0"
+source[10]="0"
+source_data[10]="{\"tagente\":{\"nombre\":\"cisco-2\"}}"
+options[10]=""
+style[10]="{\"shape\":\"circle\",\"image\":\"images/networkmap/cisco@os.svg\",\"width\":null,\"height\":null,\"label\":\"cisco-2\"}"
 
-agent_name[11]="freebsd-2"
+id[11]="11"
+id_map[11]="2"
 x[11]="892"
 y[11]="-47"
-parent[11]="1"
+z[11]="0"
+deleted[11]="0"
+type[11]="0"
+refresh[11]="0"
+source[11]="0"
+source_data[11]="{\"tagente\":{\"nombre\":\"freebsd-2\"}}"
+options[11]=""
+style[11]="{\"shape\":\"circle\",\"image\":\"images/networkmap/freebsd@os.svg\",\"width\":null,\"height\":null,\"label\":\"freebsd-2\"}"
 
-agent_name[12]="macos-2"
+id[12]="12"
+id_map[12]="2"
 x[12]="1150"
 y[12]="409"
-parent[12]="1"
+z[12]="0"
+deleted[12]="0"
+type[12]="0"
+refresh[12]="0"
+source[12]="0"
+source_data[12]="{\"tagente\":{\"nombre\":\"macos-2\"}}"
+options[12]=""
+style[12]="{\"shape\":\"circle\",\"image\":\"images/networkmap/apple@os.svg\",\"width\":null,\"height\":null,\"label\":\"macos-2\"}"
 
-agent_name[13]="windows-3"
+id[13]="13"
+id_map[13]="2"
 x[13]="686"
 y[13]="875"
-parent[13]="10"
+z[13]="0"
+deleted[13]="0"
+type[13]="0"
+refresh[13]="0"
+source[13]="0"
+source_data[13]="{\"tagente\":{\"nombre\":\"windows-3\"}}"
+options[13]=""
+style[13]="{\"shape\":\"circle\",\"image\":\"images/networkmap/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-3\"}"
 
-agent_name[14]="windows-4"
+id[14]="14"
+id_map[14]="2"
 x[14]="1452"
 y[14]="847"
-parent[14]="10"
+z[14]="0"
+deleted[14]="0"
+type[14]="0"
+refresh[14]="0"
+source[14]="0"
+source_data[14]="{\"tagente\":{\"nombre\":\"windows-4\"}}"
+options[14]=""
+style[14]="{\"shape\":\"circle\",\"image\":\"images/networkmap/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-4\"}"
 
-agent_name[15]="linux-5"
+id[15]="15"
+id_map[15]="2"
 x[15]="314"
 y[15]="845"
-parent[15]="13"
+z[15]="0"
+deleted[15]="0"
+type[15]="0"
+refresh[15]="0"
+source[15]="0"
+source_data[15]="{\"tagente\":{\"nombre\":\"linux-5\"}}"
+options[15]=""
+style[15]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-5\"}"
 
-agent_name[16]="linux-6"
+id[16]="16"
+id_map[16]="2"
 x[16]="474"
 y[16]="1043"
-parent[16]="13"
+z[16]="0"
+deleted[16]="0"
+type[16]="0"
+refresh[16]="0"
+source[16]="0"
+source_data[16]="{\"tagente\":{\"nombre\":\"linux-6\"}}"
+options[16]=""
+style[16]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-6\"}"
 
-agent_name[17]="linux-7"
+id[17]="17"
+id_map[17]="2"
 x[17]="1812"
 y[17]="1011"
-parent[17]="14"
+z[17]="0"
+deleted[17]="0"
+type[17]="0"
+refresh[17]="0"
+source[17]="0"
+source_data[17]="{\"tagente\":{\"nombre\":\"linux-7\"}}"
+options[17]=""
+style[17]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-7\"}"
 
-agent_name[18]="linux-8"
+id[18]="18"
+id_map[18]="2"
 x[18]="1828"
 y[18]="723"
-parent[18]="14"
+z[18]="0"
+deleted[18]="0"
+type[18]="0"
+refresh[18]="0"
+source[18]="0"
+source_data[18]="{\"tagente\":{\"nombre\":\"linux-8\"}}"
+options[18]=""
+style[18]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-8\"}"
 
-agent_name[19]="cisco-3"
+id[19]="19"
+id_map[19]="2"
 x[19]="1824"
 y[19]="285"
-parent[19]="3"
+z[19]="0"
+deleted[19]="0"
+type[19]="0"
+refresh[19]="0"
+source[19]="0"
+source_data[19]="{\"tagente\":{\"nombre\":\"cisco-3\"}}"
+options[19]=""
+style[19]="{\"shape\":\"circle\",\"image\":\"images/networkmap/cisco@os.svg\",\"width\":null,\"height\":null,\"label\":\"cisco-3\"}"
 
-agent_name[20]="freebsd-3"
+id[20]="20"
+id_map[20]="2"
 x[20]="-82"
 y[20]="583"
-parent[20]="9"
+z[20]="0"
+deleted[20]="0"
+type[20]="0"
+refresh[20]="0"
+source[20]="0"
+source_data[20]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+options[20]=""
+style[20]="{\"shape\":\"circle\",\"image\":\"images/networkmap/freebsd@os.svg\",\"width\":null,\"height\":null,\"label\":\"freebsd-3\"}"
 
-agent_name[21]="macos-3"
+id[21]="21"
+id_map[21]="2"
 x[21]="-140"
 y[21]="299"
-parent[21]="20"
+z[21]="0"
+deleted[21]="0"
+type[21]="0"
+refresh[21]="0"
+source[21]="0"
+source_data[21]="{\"tagente\":{\"nombre\":\"macos-3\"}}"
+options[21]=""
+style[21]="{\"shape\":\"circle\",\"image\":\"images/networkmap/apple@os.svg\",\"width\":null,\"height\":null,\"label\":\"macos-3\"}"
 
-agent_name[22]="windows-5"
+id[22]="22"
+id_map[22]="2"
 x[22]="-390"
 y[22]="385"
-parent[22]="20"
+z[22]="0"
+deleted[22]="0"
+type[22]="0"
+refresh[22]="0"
+source[22]="0"
+source_data[22]="{\"tagente\":{\"nombre\":\"windows-5\"}}"
+options[22]=""
+style[22]="{\"shape\":\"circle\",\"image\":\"images/networkmap/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-5\"}"
 
-agent_name[23]="windows-6"
+id[23]="23"
+id_map[23]="2"
 x[23]="-470"
 y[23]="671"
-parent[23]="20"
+z[23]="0"
+deleted[23]="0"
+type[23]="0"
+refresh[23]="0"
+source[23]="0"
+source_data[23]="{\"tagente\":{\"nombre\":\"windows-6\"}}"
+options[23]=""
+style[23]="{\"shape\":\"circle\",\"image\":\"images/networkmap/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-6\"}"
 
-agent_name[24]="linux-9"
+id[24]="24"
+id_map[24]="2"
 x[24]="-296"
 y[24]="899"
-parent[24]="20"
+z[24]="0"
+deleted[24]="0"
+type[24]="0"
+refresh[24]="0"
+source[24]="0"
+source_data[24]="{\"tagente\":{\"nombre\":\"linux-9\"}}"
+options[24]=""
+style[24]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-9\"}"
 
-agent_name[25]="linux-10"
+id[25]="25"
+id_map[25]="2"
 x[25]="-25"
 y[25]="961"
-parent[25]="20"
+z[25]="0"
+deleted[25]="0"
+type[25]="0"
+refresh[25]="0"
+source[25]="0"
+source_data[25]="{\"tagente\":{\"nombre\":\"linux-10\"}}"
+options[25]=""
+style[25]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-10\"}"
 
-agent_name[26]="linux-11"
+id[26]="26"
+id_map[26]="2"
 x[26]="1683"
 y[26]="13"
-parent[26]="19"
+z[26]="0"
+deleted[26]="0"
+type[26]="0"
+refresh[26]="0"
+source[26]="0"
+source_data[26]="{\"tagente\":{\"nombre\":\"linux-11\"}}"
+options[26]=""
+style[26]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-11\"}"
 
-agent_name[27]="linux-12"
+id[27]="27"
+id_map[27]="2"
 x[27]="2135"
 y[27]="51"
-parent[27]="19"
+z[27]="0"
+deleted[27]="0"
+type[27]="0"
+refresh[27]="0"
+source[27]="0"
+source_data[27]="{\"tagente\":{\"nombre\":\"linux-12\"}}"
+options[27]=""
+style[27]="{\"shape\":\"circle\",\"image\":\"images/networkmap/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-12\"}"
+
+[trel_item]
+
+id[1]="1"
+id_parent[1]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[1]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"11\",\"x\":\"1184\",\"y\":\"-25\",\"z\":\"0\"}}"
+id_map[1]="2"
+id_parent_source_data[1]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[1]="{\"tagente\":{\"nombre\":\"freebsd-1\"}}"
+parent_type[1]="0"
+child_type[1]="0"
+id_item[1]="0"
+deleted[1]="0"
+
+id[2]="2"
+id_parent[2]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[2]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"10\",\"x\":\"1268\",\"y\":\"235\",\"z\":\"0\"}}"
+id_map[2]="2"
+id_parent_source_data[2]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[2]="{\"tagente\":{\"nombre\":\"macos-1\"}}"
+parent_type[2]="0"
+child_type[2]="0"
+id_item[2]="0"
+deleted[2]="0"
+
+id[3]="3"
+id_parent[3]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[3]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"8\",\"x\":\"528\",\"y\":\"-37\",\"z\":\"0\"}}"
+id_map[3]="2"
+id_parent_source_data[3]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[3]="{\"tagente\":{\"nombre\":\"windows-1\"}}"
+parent_type[3]="0"
+child_type[3]="0"
+id_item[3]="0"
+deleted[3]="0"
+
+id[4]="4"
+id_parent[4]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[4]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"9\",\"x\":\"514\",\"y\":\"389\",\"z\":\"0\"}}"
+id_map[4]="2"
+id_parent_source_data[4]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[4]="{\"tagente\":{\"nombre\":\"windows-2\"}}"
+parent_type[4]="0"
+child_type[4]="0"
+id_item[4]="0"
+deleted[4]="0"
+
+id[5]="5"
+id_parent[5]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"8\",\"x\":\"528\",\"y\":\"-37\",\"z\":\"0\"}}"
+id_child[5]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"4\",\"x\":\"342\",\"y\":\"-273\",\"z\":\"0\"}}"
+id_map[5]="2"
+id_parent_source_data[5]="{\"tagente\":{\"nombre\":\"windows-1\"}}"
+id_child_source_data[5]="{\"tagente\":{\"nombre\":\"linux-1\"}}"
+parent_type[5]="0"
+child_type[5]="0"
+id_item[5]="0"
+deleted[5]="0"
+
+id[6]="6"
+id_parent[6]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"8\",\"x\":\"528\",\"y\":\"-37\",\"z\":\"0\"}}"
+id_child[6]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"5\",\"x\":\"240\",\"y\":\"-7\",\"z\":\"0\"}}"
+id_map[6]="2"
+id_parent_source_data[6]="{\"tagente\":{\"nombre\":\"windows-1\"}}"
+id_child_source_data[6]="{\"tagente\":{\"nombre\":\"linux-2\"}}"
+parent_type[6]="0"
+child_type[6]="0"
+id_item[6]="0"
+deleted[6]="0"
+
+id[7]="7"
+id_parent[7]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"9\",\"x\":\"514\",\"y\":\"389\",\"z\":\"0\"}}"
+id_child[7]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"6\",\"x\":\"214\",\"y\":\"275\",\"z\":\"0\"}}"
+id_map[7]="2"
+id_parent_source_data[7]="{\"tagente\":{\"nombre\":\"windows-2\"}}"
+id_child_source_data[7]="{\"tagente\":{\"nombre\":\"linux-3\"}}"
+parent_type[7]="0"
+child_type[7]="0"
+id_item[7]="0"
+deleted[7]="0"
+
+id[8]="8"
+id_parent[8]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"9\",\"x\":\"514\",\"y\":\"389\",\"z\":\"0\"}}"
+id_child[8]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"7\",\"x\":\"226\",\"y\":\"595\",\"z\":\"0\"}}"
+id_map[8]="2"
+id_parent_source_data[8]="{\"tagente\":{\"nombre\":\"windows-2\"}}"
+id_child_source_data[8]="{\"tagente\":{\"nombre\":\"linux-4\"}}"
+parent_type[8]="0"
+child_type[8]="0"
+id_item[8]="0"
+deleted[8]="0"
+
+id[9]="9"
+id_parent[9]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[9]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"22\",\"x\":\"1036\",\"y\":\"711\",\"z\":\"0\"}}"
+id_map[9]="2"
+id_parent_source_data[9]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[9]="{\"tagente\":{\"nombre\":\"cisco-2\"}}"
+parent_type[9]="0"
+child_type[9]="0"
+id_item[9]="0"
+deleted[9]="0"
+
+id[10]="10"
+id_parent[10]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[10]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"21\",\"x\":\"892\",\"y\":\"-47\",\"z\":\"0\"}}"
+id_map[10]="2"
+id_parent_source_data[10]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[10]="{\"tagente\":{\"nombre\":\"freebsd-2\"}}"
+parent_type[10]="0"
+child_type[10]="0"
+id_item[10]="0"
+deleted[10]="0"
+
+id[11]="11"
+id_parent[11]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"12\",\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}"
+id_child[11]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"20\",\"x\":\"1150\",\"y\":\"409\",\"z\":\"0\"}}"
+id_map[11]="2"
+id_parent_source_data[11]="{\"tagente\":{\"nombre\":\"cisco-1\"}}"
+id_child_source_data[11]="{\"tagente\":{\"nombre\":\"macos-2\"}}"
+parent_type[11]="0"
+child_type[11]="0"
+id_item[11]="0"
+deleted[11]="0"
+
+id[12]="12"
+id_parent[12]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"22\",\"x\":\"1036\",\"y\":\"711\",\"z\":\"0\"}}"
+id_child[12]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"18\",\"x\":\"686\",\"y\":\"875\",\"z\":\"0\"}}"
+id_map[12]="2"
+id_parent_source_data[12]="{\"tagente\":{\"nombre\":\"cisco-2\"}}"
+id_child_source_data[12]="{\"tagente\":{\"nombre\":\"windows-3\"}}"
+parent_type[12]="0"
+child_type[12]="0"
+id_item[12]="0"
+deleted[12]="0"
+
+id[13]="13"
+id_parent[13]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"22\",\"x\":\"1036\",\"y\":\"711\",\"z\":\"0\"}}"
+id_child[13]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"19\",\"x\":\"1452\",\"y\":\"847\",\"z\":\"0\"}}"
+id_map[13]="2"
+id_parent_source_data[13]="{\"tagente\":{\"nombre\":\"cisco-2\"}}"
+id_child_source_data[13]="{\"tagente\":{\"nombre\":\"windows-4\"}}"
+parent_type[13]="0"
+child_type[13]="0"
+id_item[13]="0"
+deleted[13]="0"
+
+id[14]="14"
+id_parent[14]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"18\",\"x\":\"686\",\"y\":\"875\",\"z\":\"0\"}}"
+id_child[14]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"14\",\"x\":\"314\",\"y\":\"845\",\"z\":\"0\"}}"
+id_map[14]="2"
+id_parent_source_data[14]="{\"tagente\":{\"nombre\":\"windows-3\"}}"
+id_child_source_data[14]="{\"tagente\":{\"nombre\":\"linux-5\"}}"
+parent_type[14]="0"
+child_type[14]="0"
+id_item[14]="0"
+deleted[14]="0"
+
+id[15]="15"
+id_parent[15]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"18\",\"x\":\"686\",\"y\":\"875\",\"z\":\"0\"}}"
+id_child[15]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"15\",\"x\":\"474\",\"y\":\"1043\",\"z\":\"0\"}}"
+id_map[15]="2"
+id_parent_source_data[15]="{\"tagente\":{\"nombre\":\"windows-3\"}}"
+id_child_source_data[15]="{\"tagente\":{\"nombre\":\"linux-6\"}}"
+parent_type[15]="0"
+child_type[15]="0"
+id_item[15]="0"
+deleted[15]="0"
+
+id[16]="16"
+id_parent[16]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"19\",\"x\":\"1452\",\"y\":\"847\",\"z\":\"0\"}}"
+id_child[16]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"16\",\"x\":\"1812\",\"y\":\"1011\",\"z\":\"0\"}}"
+id_map[16]="2"
+id_parent_source_data[16]="{\"tagente\":{\"nombre\":\"windows-4\"}}"
+id_child_source_data[16]="{\"tagente\":{\"nombre\":\"linux-7\"}}"
+parent_type[16]="0"
+child_type[16]="0"
+id_item[16]="0"
+deleted[16]="0"
+
+id[17]="17"
+id_parent[17]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"19\",\"x\":\"1452\",\"y\":\"847\",\"z\":\"0\"}}"
+id_child[17]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"17\",\"x\":\"1828\",\"y\":\"723\",\"z\":\"0\"}}"
+id_map[17]="2"
+id_parent_source_data[17]="{\"tagente\":{\"nombre\":\"windows-4\"}}"
+id_child_source_data[17]="{\"tagente\":{\"nombre\":\"linux-8\"}}"
+parent_type[17]="0"
+child_type[17]="0"
+id_item[17]="0"
+deleted[17]="0"
+
+id[18]="18"
+id_parent[18]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"10\",\"x\":\"1268\",\"y\":\"235\",\"z\":\"0\"}}"
+id_child[18]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"32\",\"x\":\"1824\",\"y\":\"285\",\"z\":\"0\"}}"
+id_map[18]="2"
+id_parent_source_data[18]="{\"tagente\":{\"nombre\":\"macos-1\"}}"
+id_child_source_data[18]="{\"tagente\":{\"nombre\":\"cisco-3\"}}"
+parent_type[18]="0"
+child_type[18]="0"
+id_item[18]="0"
+deleted[18]="0"
+
+id[19]="19"
+id_parent[19]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"7\",\"x\":\"226\",\"y\":\"595\",\"z\":\"0\"}}"
+id_child[19]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"31\",\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}"
+id_map[19]="2"
+id_parent_source_data[19]="{\"tagente\":{\"nombre\":\"linux-4\"}}"
+id_child_source_data[19]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+parent_type[19]="0"
+child_type[19]="0"
+id_item[19]="0"
+deleted[19]="0"
+
+id[20]="20"
+id_parent[20]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"31\",\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}"
+id_child[20]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"30\",\"x\":\"-140\",\"y\":\"299\",\"z\":\"0\"}}"
+id_map[20]="2"
+id_parent_source_data[20]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+id_child_source_data[20]="{\"tagente\":{\"nombre\":\"macos-3\"}}"
+parent_type[20]="0"
+child_type[20]="0"
+id_item[20]="0"
+deleted[20]="0"
+
+id[21]="21"
+id_parent[21]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"31\",\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}"
+id_child[21]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"28\",\"x\":\"-390\",\"y\":\"385\",\"z\":\"0\"}}"
+id_map[21]="2"
+id_parent_source_data[21]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+id_child_source_data[21]="{\"tagente\":{\"nombre\":\"windows-5\"}}"
+parent_type[21]="0"
+child_type[21]="0"
+id_item[21]="0"
+deleted[21]="0"
+
+id[22]="22"
+id_parent[22]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"31\",\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}"
+id_child[22]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"29\",\"x\":\"-470\",\"y\":\"671\",\"z\":\"0\"}}"
+id_map[22]="2"
+id_parent_source_data[22]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+id_child_source_data[22]="{\"tagente\":{\"nombre\":\"windows-6\"}}"
+parent_type[22]="0"
+child_type[22]="0"
+id_item[22]="0"
+deleted[22]="0"
+
+id[23]="23"
+id_parent[23]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"31\",\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}"
+id_child[23]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"24\",\"x\":\"-296\",\"y\":\"899\",\"z\":\"0\"}}"
+id_map[23]="2"
+id_parent_source_data[23]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+id_child_source_data[23]="{\"tagente\":{\"nombre\":\"linux-9\"}}"
+parent_type[23]="0"
+child_type[23]="0"
+id_item[23]="0"
+deleted[23]="0"
+
+id[24]="24"
+id_parent[24]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"31\",\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}"
+id_child[24]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"25\",\"x\":\"-25\",\"y\":\"961\",\"z\":\"0\"}}"
+id_map[24]="2"
+id_parent_source_data[24]="{\"tagente\":{\"nombre\":\"freebsd-3\"}}"
+id_child_source_data[24]="{\"tagente\":{\"nombre\":\"linux-10\"}}"
+parent_type[24]="0"
+child_type[24]="0"
+id_item[24]="0"
+deleted[24]="0"
+
+id[25]="25"
+id_parent[25]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"32\",\"x\":\"1824\",\"y\":\"285\",\"z\":\"0\"}}"
+id_child[25]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"26\",\"x\":\"1683\",\"y\":\"13\",\"z\":\"0\"}}"
+id_map[25]="2"
+id_parent_source_data[25]="{\"tagente\":{\"nombre\":\"cisco-3\"}}"
+id_child_source_data[25]="{\"tagente\":{\"nombre\":\"linux-11\"}}"
+parent_type[25]="0"
+child_type[25]="0"
+id_item[25]="0"
+deleted[25]="0"
+
+id[26]="26"
+id_parent[26]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"32\",\"x\":\"1824\",\"y\":\"285\",\"z\":\"0\"}}"
+id_child[26]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":\"27\",\"x\":\"2135\",\"y\":\"51\",\"z\":\"0\"}}"
+id_map[26]="2"
+id_parent_source_data[26]="{\"tagente\":{\"nombre\":\"cisco-3\"}}"
+id_child_source_data[26]="{\"tagente\":{\"nombre\":\"linux-12\"}}"
+parent_type[26]="0"
+child_type[26]="0"
+id_item[26]="0"
+deleted[26]="0"
+

pandora_console/extras/demodata/network_maps/2-sunburst-networkmap.prd

@@ -1,9 +1,33 @@
-[map_data]
+[prd_data]
 
+type="network_map"
 name="Demo sunburst network map"
-group="Demo servers"
-description="This is a demo sunburst network map"
-node_radius="40"
-generation_method="radial_dynamic"
 
-[map_items]
+[tmap]
+
+id[3]="3"
+id_group[3]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+id_user[3]=""
+type[3]="0"
+subtype[3]="0"
+name[3]="Demo sunburst network map"
+description[3]="This is a demo sunburst network map"
+height[3]="0"
+width[3]="0"
+center_x[3]="0"
+center_y[3]="0"
+background[3]=""
+background_options[3]="0"
+source_period[3]="0"
+source[3]="0"
+source_data[3]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+generation_method[3]="6"
+generated[3]="0"
+filter[3]="{\"dont_show_subgroups\":0,\"node_radius\":\"40\",\"x_offs\":0,\"y_offs\":0,\"z_dash\":\"0.5\",\"node_sep\":\"0.25\",\"rank_sep\":\"0.25\",\"mindist\":1,\"kval\":\"0.3\"}"
+id_group_map[3]="{\"tgrupo\":{\"nombre\":\"Demo servers\"}}"
+refresh_time[3]="300"
+
+[titem]
+
+[trel_item]
+

pandora_console/extras/demodata/services/1-mysql-service.prd

@@ -1,26 +1,92 @@
-[service_data]
+[prd_data]
 
+type="service"
 name="MySQL service"
-group="Demo services"
-description="This is a demo service for MySQL"
-mode="smart"
-critical="50"
-warning="30"
 
-[service_items]
+[tservice]
 
-type[1]="module"
+id[1]="1"
-agent_name[1]="linux-1"
+name[1]="MySQL service"
-module[1]="Service mysqld"
+description[1]="This is a demo service for MySQL"
+id_group[1]="{\"tgrupo\":{\"nombre\":\"Demo services\"}}"
+critical[1]="50"
+warning[1]="30"
+unknown_as_critical[1]="0"
+service_interval[1]="0"
+service_value[1]="0"
+status[1]="0"
+utimestamp[1]="0"
+auto_calculate[1]="1"
+id_agent_module[1]="{\"tagente_modulo\":{\"nombre\":\"MySQL service_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_interval[1]="0"
+sla_id_module[1]="{\"tagente_modulo\":{\"nombre\":\"MySQL service_SLA_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_value_id_module[1]="{\"tagente_modulo\":{\"nombre\":\"MySQL service_SLA_Value_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_limit[1]="100"
+id_template_alert_warning[1]="0"
+id_template_alert_critical[1]="0"
+id_template_alert_unknown[1]="0"
+id_template_alert_critical_sla[1]="0"
+quiet[1]="0"
+cps[1]="0"
+cascade_protection[1]="0"
+evaluate_sla[1]="0"
+is_favourite[1]="0"
+enable_sunburst[1]="0"
+asynchronous[1]="0"
+enable_horizontal_tree[1]="0"
+rca[1]=""
 
-type[2]="module"
+[tservice_element]
-agent_name[2]="linux-2"
-module[2]="Service mysqld"
 
-type[3]="module"
+id[1]="1"
-agent_name[3]="linux-3"
+id_service[1]="1"
-module[3]="Service mysqld"
+weight_ok[1]="0"
+weight_warning[1]="0"
+weight_critical[1]="0"
+weight_unknown[1]="0"
+description[1]=""
+id_agente_modulo[1]="{\"tagente_modulo\":{\"nombre\":\"Service mysqld\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-1\"}}}}"
+id_agent[1]="{\"tagente\":{\"nombre\":\"linux-1\"}}"
+id_service_child[1]="0"
+id_server_meta[1]="0"
+rules[1]=""
+
+id[2]="2"
+id_service[2]="1"
+weight_ok[2]="0"
+weight_warning[2]="0"
+weight_critical[2]="0"
+weight_unknown[2]="0"
+description[2]=""
+id_agente_modulo[2]="{\"tagente_modulo\":{\"nombre\":\"Service mysqld\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-2\"}}}}"
+id_agent[2]="{\"tagente\":{\"nombre\":\"linux-2\"}}"
+id_service_child[2]="0"
+id_server_meta[2]="0"
+rules[2]=""
+
+id[3]="3"
+id_service[3]="1"
+weight_ok[3]="0"
+weight_warning[3]="0"
+weight_critical[3]="0"
+weight_unknown[3]="0"
+description[3]=""
+id_agente_modulo[3]="{\"tagente_modulo\":{\"nombre\":\"Service mysqld\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-3\"}}}}"
+id_agent[3]="{\"tagente\":{\"nombre\":\"linux-3\"}}"
+id_service_child[3]="0"
+id_server_meta[3]="0"
+rules[3]=""
+
+id[4]="4"
+id_service[4]="1"
+weight_ok[4]="0"
+weight_warning[4]="0"
+weight_critical[4]="0"
+weight_unknown[4]="0"
+description[4]=""
+id_agente_modulo[4]="{\"tagente_modulo\":{\"nombre\":\"Service mysqld\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-4\"}}}}"
+id_agent[4]="{\"tagente\":{\"nombre\":\"linux-4\"}}"
+id_service_child[4]="0"
+id_server_meta[4]="0"
+rules[4]=""
 
-type[4]="module"
-agent_name[4]="linux-4"
-module[4]="Service mysqld"

pandora_console/extras/demodata/services/2-http-service.prd

@@ -1,26 +1,92 @@
-[service_data]
+[prd_data]
 
+type="service"
 name="HTTP service"
-group="Demo services"
-description="This is a demo service for HTTP"
-mode="smart"
-critical="50"
-warning="30"
 
-[service_items]
+[tservice]
 
-type[1]="module"
+id[2]="2"
-agent_name[1]="linux-1"
+name[2]="HTTP service"
-module[1]="Service httpd"
+description[2]="This is a demo service for HTTP"
+id_group[2]="{\"tgrupo\":{\"nombre\":\"Demo services\"}}"
+critical[2]="50"
+warning[2]="30"
+unknown_as_critical[2]="0"
+service_interval[2]="0"
+service_value[2]="0"
+status[2]="0"
+utimestamp[2]="0"
+auto_calculate[2]="1"
+id_agent_module[2]="{\"tagente_modulo\":{\"nombre\":\"HTTP service_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_interval[2]="0"
+sla_id_module[2]="{\"tagente_modulo\":{\"nombre\":\"HTTP service_SLA_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_value_id_module[2]="{\"tagente_modulo\":{\"nombre\":\"HTTP service_SLA_Value_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_limit[2]="100"
+id_template_alert_warning[2]="0"
+id_template_alert_critical[2]="0"
+id_template_alert_unknown[2]="0"
+id_template_alert_critical_sla[2]="0"
+quiet[2]="0"
+cps[2]="0"
+cascade_protection[2]="0"
+evaluate_sla[2]="0"
+is_favourite[2]="0"
+enable_sunburst[2]="0"
+asynchronous[2]="0"
+enable_horizontal_tree[2]="0"
+rca[2]=""
 
-type[2]="module"
+[tservice_element]
-agent_name[2]="linux-2"
-module[2]="Service httpd"
 
-type[3]="module"
+id[5]="5"
-agent_name[3]="linux-3"
+id_service[5]="2"
-module[3]="Service httpd"
+weight_ok[5]="0"
+weight_warning[5]="0"
+weight_critical[5]="0"
+weight_unknown[5]="0"
+description[5]=""
+id_agente_modulo[5]="{\"tagente_modulo\":{\"nombre\":\"Service httpd\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-1\"}}}}"
+id_agent[5]="{\"tagente\":{\"nombre\":\"linux-1\"}}"
+id_service_child[5]="0"
+id_server_meta[5]="0"
+rules[5]=""
+
+id[6]="6"
+id_service[6]="2"
+weight_ok[6]="0"
+weight_warning[6]="0"
+weight_critical[6]="0"
+weight_unknown[6]="0"
+description[6]=""
+id_agente_modulo[6]="{\"tagente_modulo\":{\"nombre\":\"Service httpd\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-2\"}}}}"
+id_agent[6]="{\"tagente\":{\"nombre\":\"linux-2\"}}"
+id_service_child[6]="0"
+id_server_meta[6]="0"
+rules[6]=""
+
+id[7]="7"
+id_service[7]="2"
+weight_ok[7]="0"
+weight_warning[7]="0"
+weight_critical[7]="0"
+weight_unknown[7]="0"
+description[7]=""
+id_agente_modulo[7]="{\"tagente_modulo\":{\"nombre\":\"Service httpd\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-3\"}}}}"
+id_agent[7]="{\"tagente\":{\"nombre\":\"linux-3\"}}"
+id_service_child[7]="0"
+id_server_meta[7]="0"
+rules[7]=""
+
+id[8]="8"
+id_service[8]="2"
+weight_ok[8]="0"
+weight_warning[8]="0"
+weight_critical[8]="0"
+weight_unknown[8]="0"
+description[8]=""
+id_agente_modulo[8]="{\"tagente_modulo\":{\"nombre\":\"Service httpd\",\"id_agente\":{\"tagente\":{\"nombre\":\"linux-4\"}}}}"
+id_agent[8]="{\"tagente\":{\"nombre\":\"linux-4\"}}"
+id_service_child[8]="0"
+id_server_meta[8]="0"
+rules[8]=""
 
-type[4]="module"
-agent_name[4]="linux-4"
-module[4]="Service httpd"

pandora_console/extras/demodata/services/3-parent-service.prd

@@ -1,16 +1,66 @@
-[service_data]
+[prd_data]
 
+type="service"
 name="Web cluster service"
-group="Demo services"
-description="This is a demo service for a clustered web"
-mode="smart"
-critical="50"
-warning="50"
 
-[service_items]
+[tservice]
 
-type[1]="service"
+id[3]="3"
-service_name[1]="MySQL service"
+name[3]="Web cluster service"
+description[3]="This is a demo service for a clustered web"
+id_group[3]="{\"tgrupo\":{\"nombre\":\"Demo services\"}}"
+critical[3]="50"
+warning[3]="50"
+unknown_as_critical[3]="0"
+service_interval[3]="0"
+service_value[3]="0"
+status[3]="0"
+utimestamp[3]="0"
+auto_calculate[3]="1"
+id_agent_module[3]="{\"tagente_modulo\":{\"nombre\":\"Web cluster service_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_interval[3]="0"
+sla_id_module[3]="{\"tagente_modulo\":{\"nombre\":\"Web cluster service_SLA_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_value_id_module[3]="{\"tagente_modulo\":{\"nombre\":\"Web cluster service_SLA_Value_service\",\"id_agente\":{\"tagente\":{\"nombre\":\"demo-global-agent-1\"}}}}"
+sla_limit[3]="100"
+id_template_alert_warning[3]="0"
+id_template_alert_critical[3]="0"
+id_template_alert_unknown[3]="0"
+id_template_alert_critical_sla[3]="0"
+quiet[3]="0"
+cps[3]="0"
+cascade_protection[3]="0"
+evaluate_sla[3]="0"
+is_favourite[3]="0"
+enable_sunburst[3]="0"
+asynchronous[3]="0"
+enable_horizontal_tree[3]="0"
+rca[3]=""
+
+[tservice_element]
+
+id[9]="9"
+id_service[9]="3"
+weight_ok[9]="0"
+weight_warning[9]="0"
+weight_critical[9]="0"
+weight_unknown[9]="0"
+description[9]=""
+id_agente_modulo[9]="0"
+id_agent[9]="0"
+id_service_child[9]="{\"tservice\":{\"name\":\"MySQL service\"}}"
+id_server_meta[9]="0"
+rules[9]=""
+
+id[10]="10"
+id_service[10]="3"
+weight_ok[10]="0"
+weight_warning[10]="0"
+weight_critical[10]="0"
+weight_unknown[10]="0"
+description[10]=""
+id_agente_modulo[10]="0"
+id_agent[10]="0"
+id_service_child[10]="{\"tservice\":{\"name\":\"HTTP service\"}}"
+id_server_meta[10]="0"
+rules[10]=""
 
-type[2]="service"
-service_name[2]="HTTP service"

pandora_console/extras/mr/68.sql

@@ -74,6 +74,35 @@ ADD COLUMN `id_agent_data` int not null default 0 AFTER `script_type`;
 ALTER TABLE `tusuario` CHANGE COLUMN `metaconsole_data_section` `metaconsole_data_section` TEXT NOT NULL DEFAULT '' ;
 ALTER TABLE `tmensajes` ADD COLUMN `icon_notification` VARCHAR(250) NULL DEFAULT NULL AFTER `url`;
 
+ALTER TABLE `tdemo_data` MODIFY `item_id` TEXT NOT NULL DEFAULT '';
+
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_os": "',`item_id`,'"}') WHERE `table_name` = "tconfig_os" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_agente": "',`item_id`,'"}') WHERE `table_name` = "tagente" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_grupo": "',`item_id`,'"}') WHERE `table_name` = "tgrupo" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_agente_modulo": "',`item_id`,'"}') WHERE `table_name` = "tagente_modulo" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_module_inventory": "',`item_id`,'"}') WHERE `table_name` = "tmodule_inventory" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_agent_module_inventory": "',`item_id`,'"}') WHERE `table_name` = "tagent_module_inventory" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_graph": "',`item_id`,'"}') WHERE `table_name` = "tgraph" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tmap" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_report": "',`item_id`,'"}') WHERE `table_name` = "treport" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_rc": "',`item_id`,'"}') WHERE `table_name` = "treport_content" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "treport_content_sla_combined" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tservice" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tservice_element" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_trap": "',`item_id`,'"}') WHERE `table_name` = "ttrap" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "titem" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_gs": "',`item_id`,'"}') WHERE `table_name` = "tgraph_source" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "twidget_dashboard" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tdashboard" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tlayout" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tlayout_data" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_agente_estado": "',`item_id`,'"}') WHERE `table_name` = "tagente_estado" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "trel_item" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id": "',`item_id`,'"}') WHERE `table_name` = "tplugin" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"tagente_id_agente": "',`item_id`,'"}') WHERE `table_name` = "tgis_data_status" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_tgis_map": "',`item_id`,'"}') WHERE `table_name` = "tgis_map" AND CAST(`item_id` AS UNSIGNED) != 0;
+UPDATE `tdemo_data` SET `item_id` = CONCAT('{"id_tmap_layer": "',`item_id`,'"}') WHERE `table_name` = "tgis_map_layer" AND CAST(`item_id` AS UNSIGNED) != 0;
+
 ALTER TABLE `tagente_modulo` ADD COLUMN `disabled_by_safe_mode` TINYINT UNSIGNED NOT NULL DEFAULT 0;
 
 UPDATE `tncm_template` SET `vendors` = CONCAT('["', TRIM(BOTH '"' FROM TRIM(BOTH ']' FROM TRIM(BOTH '[' FROM vendors))), '"]'), `models` = CONCAT('["', TRIM(BOTH '"' FROM TRIM(BOTH ']' FROM TRIM(BOTH '[' FROM models))), '"]');

pandora_console/godmode/setup/demo.php

@@ -34,6 +34,9 @@ if (users_is_admin() === false) {
     return;
 }
 
+// Same styles as tactical view is required.
+ui_require_css_file('general_tactical_view');
+
 html_print_input_hidden('demo_items_count', 0);
 
 $display_loading = (bool) get_parameter('display_loading', 0);
@@ -107,33 +110,48 @@ $running_create = ($current_progress_val > 0 && $current_progress_val < 100);
 $running_delete = ($current_progress_val_delete > 0 && $current_progress_val_delete < 100);
 
 // Real time loading.
-if ($display_loading === true || $running_create === true || $running_delete) {
+if ($display_loading === true || $running_create === true || $running_delete === true) {
-    $table_load = new stdClass();
+    $operation = 'cleanup';
-    $table_load->id = 'table-demo';
+    $progress_val = (int) $current_progress_val_delete;
-    $table_load->class = 'filter-table-adv';
+
-    $table_load->width = '100%';
+    if ($create_data === true || $running_create === true) {
-    $table_load->data = [];
+        $operation = 'create';
-    $table_load->size = [];
+        $progress_val = (int) $current_progress_val;
-    $table_load->size[0] = '50%';
-    $table_load->size[1] = '50%';
-    $list_mkup = '';
-    if (isset($operation['id']) === false) {
-        $operation['id'] = 0;
     }
 
-    $table_load->data['row0'][] = progress_bar(
+    $load_mkp = ui_progress(
         0,
-        100,
+        '100%',
-        20,
+        '2.5',
-        '',
+        '#C0CCDC',
-        0,
+        true,
-        false,
+        $progress_val.' %',
-        ((int) 0 !== -1) ? false : '#f3b200',
         [
-            'class' => 'progress_bar',
+            'page'     => 'include/ajax/demo_data.ajax',
-            'id'    => 'progress_bar',
+            'interval' => 1,
-        ]
+            'simple'   => 1,
-    ).html_print_input_hidden('js_timer_'.$operation['id'], 0, true);
+            'data'     => [
+                'action'                => 'get_progress',
+                'operation'             => $operation,
+                'demo_items_to_cleanup' => $demo_items_count,
+            ],
+        ],
+        'line-height: 17pt;'
+    );
+
+
+    $load_mkp .= html_print_input_hidden('js_timer', 0, true);
+
+    $table_mkup = '<div id="load-info" class="container">
+                    <div class="title">'.__('Progress').'</div>
+                    <div class="content br-t">
+                        <div class="row">
+                            <div class="col-12">
+                                <div class="br-t">
+                                    <div class="padding20">
+                                        '.$load_mkp.'
+                                    </div>
+                                </div>';
 
     if ($create_data === true || $running_create === true) {
         // Map demo item ID to display name in page.
@@ -166,43 +184,50 @@ if ($display_loading === true || $running_create === true || $running_delete) {
         $items_ids_text_map[DEMO_PLUGIN] = 'plugin';
         $items_ids_text_map = ([DEMO_AGENT => 'agents'] + $items_ids_text_map);
 
-        $list_mkup = '<ul id="load-info">';
         foreach ($items_ids_text_map as $item_id => $item_text) {
-            $list_mkup .= '<li data-item-id="'.$item_id.'">';
+            $table_mkup .= '<div data-item-id="'.$item_id.'" class="br-t">
-            $list_mkup .= '<div class="inline vertical_middle w20px h20px" style="margin-right: 10px;">'.html_print_image(
+                                <div class="pdd_l_15px pdd_t_7px">
+                                    <div class="inline vertical_middle w20px h20px" style="margin-right: 10px;">
+                                        <div class="loader-mini">
+                                            <span></span>
+                                            <span></span>
+                                            <span></span>
+                                            <span></span>
+                                        </div>
+                                        <div class="inline vertical_middle w20px h20px" style="margin-right: 10px;">'.html_print_image(
                 'images/icono-unknown.png',
                 true,
                 [
                     'title' => __('View'),
-                    'class' => 'icon w100p h100p',
+                    'class' => 'icon invisible w100p h100p',
                 ]
-            ).'</div>';
+            ).'
-            $list_mkup .= '<span class="inline vertical_middle">Create demo '.$item_text.'</span>';
+                                        </div>
-            $list_mkup .= '<ul class="error-list error margin-bottom-10" style="margin-left: 35px;">';
+                                    </div>
-            $list_mkup .= '</ul>';
+                                    <span class="inline vertical_middle" style="padding-left: 15px;">Create demo '.$item_text.'</span>
-            $list_mkup .= '</li>';
+                                    <ul class="error-list color_888 margin-bottom-10" style="margin-left: 32px;"></ul>
+                                </div>
+                            </div>';
         }
-
-        $list_mkup .= '</ul>';
     }
 
-    echo '<form class="max_floating_element_size" method="post">';
+    $table_mkup .= '</div>
-    echo '<fieldset>';
+            </div>
-    echo '<legend>'.__('Progress').'</legend>';
+        </div>
-    html_print_table($table_load);
+    </div>';
-    echo $list_mkup;
 
-    echo '</fieldset>';
+    echo '<form class="max_floating_element_size" style="max-width: 810px;" method="post">';
+
+    echo $table_mkup;
+
+    $btn_span = __('Back');
+    $icon = 'back';
 
     if ($create_data === true || $running_create === true) {
         $btn_span = __('View summary');
         $icon = 'next';
-    } else {
-        $btn_span = __('Back');
-        $icon = 'back';
     }
 
-
     $action_btns = html_print_action_buttons(
         html_print_submit_button(
             $btn_span,
@@ -343,26 +368,6 @@ if ($display_loading === true || $running_create === true || $running_delete) {
                     true
                 )
             );
-
-
-
-            /*
-                $table_adv->data['row4'][] = html_print_label_input_block(
-                __('Services agent name').ui_print_help_tip(__('If not set, %s will be used as the default agent', 'demo-global-agent-1'), true),
-                html_print_input_text(
-                    'service_agent_name',
-                    $service_agent_name,
-                    '',
-                    50,
-                    255,
-                    true,
-                    false,
-                    false,
-                    '',
-                    'w300px'
-                )
-                );
-            */
         }
 
         $table_adv->data['row5'][] = html_print_label_input_block(
@@ -425,24 +430,6 @@ if ($display_loading === true || $running_create === true || $running_delete) {
             )
         );
 
-        /*
-            $table_adv->data['row11'][] = html_print_label_input_block(
-            __('Demo data plugin agent'),
-            html_print_input_text(
-                'plugin_agent',
-                $plugin_agent,
-                '',
-                50,
-                255,
-                true,
-                false,
-                false,
-                '',
-                'w300px'
-            )
-            );
-        */
-
         $table_adv->data['row12'][] = html_print_label_input_block(
             __('Traps target IP').ui_print_help_tip(__('All demo traps are generated using version 1'), true),
             html_print_input_text(
@@ -551,12 +538,10 @@ if ($display_loading === true || $running_create === true || $running_delete) {
             true
         );
 
-        // echo '<div id="btn-set" style="display:none;">';
         html_print_action_buttons(
             implode('', $actionButtons)
         );
 
-        // echo '</div>';
         echo '</form>';
     } else {
         // Summary data.
@@ -609,10 +594,69 @@ if ($display_loading === true || $running_create === true || $running_delete) {
         $table_summary->data[$i][1] = ($demo_dashboards_count > 0) ? $demo_dashboards_count : '-';
 
         echo '<form class="max_floating_element_size" method="post">';
-        echo '<fieldset>';
+        $table_mkup = '<div id="load-info" class="container">
-        echo '<legend>'.__('Active demo data summary').'</legend>';
+            <div class="title">'.__('Active demo data summary').'</div>
-        html_print_table($table_summary);
+            <div class="content br-t">
-        echo '</fieldset>';
+                <div class="row">
+                    <div class="col-6 br-r br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Agents').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_agents_count > 0) ? $demo_agents_count : '-').'</div>
+                        </div>
+                    </div>
+                    <div class="col-6 br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Services').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_services_count > 0) ? $demo_services_count : '-').'</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-6 br-r br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Network maps').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_nm_count > 0) ? $demo_nm_count : '-').'</div>
+                        </div>
+                    </div>
+                    <div class="col-6 br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('GIS maps').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_gis_count > 0) ? $demo_gis_count : '-').'</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-6 br-r br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Custom graphs').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_cg_count > 0) ? $demo_cg_count : '-').'</div>
+                        </div>
+                    </div>
+                    <div class="col-6 br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Custom reports').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_rep_count > 0) ? $demo_rep_count : '-').'</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-6 br-r br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Visual consoles').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_vc_count > 0) ? $demo_vc_count : '-').'</div>
+                        </div>
+                    </div>
+                    <div class="col-6 br-b">
+                        <div class="padding10 flex-row">
+                            <div>'.__('Dashboards').'</div>
+                            <div class="font_w600 font_12pt">'.(($demo_dashboards_count > 0) ? $demo_dashboards_count : '-').'</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>';
+
+        echo $table_mkup;
 
         html_print_input_hidden('delete_data', 1);
         html_print_input_hidden('display_loading', 1);
@@ -647,18 +691,6 @@ if ($display_loading === true || $running_create === true || $running_delete) {
         var agent_count_span_str = '<?php echo __('demo agents currently in the system'); ?>';
         var agents_str = '<?php echo __('agents'); ?>';
 
-        var display_progress_bar_cr = <?php echo (int) $running_create; ?>;
-
-        if (display_progress_bar_cr == 1) {
-            init_progress_bar('create');
-        }
-
-        var display_progress_bar_del = <?php echo (int) $running_delete; ?>;
-
-        if (display_progress_bar_del == 1) {
-            init_progress_bar('cleanup');
-        }
-
         $("#table-adv").hide();
 
         $('#checkbox-toggle_adv_opts').change(function() {
@@ -697,12 +729,16 @@ if ($display_loading === true || $running_create === true || $running_delete) {
 
         var create_data = '<?php echo $create_data; ?>';
         var delete_data = '<?php echo $delete_data; ?>';
+        var running_create = '<?php echo $running_create; ?>';
+        var running_delete = '<?php echo $running_delete; ?>';
+
+        if (create_data == true || running_create == true) {
+            init_progress_checker('create');
+        }
 
         // Creation operation must be done via AJAX in order to be able to run the operations in background
         // and keep it running even if we quit the page.
         if (create_data == true) {
-            init_progress_bar('create');
-
             var params = {};
             params["action"] = "create_demo_data";
             params["page"] = "include/ajax/demo_data.ajax";
@@ -727,12 +763,13 @@ if ($display_loading === true || $running_create === true || $running_delete) {
             });
         }
 
+        if (delete_data == true || running_delete == true) {
+           init_progress_checker('cleanup');
+        }
+
         // Delete operation must be done via AJAX in order to be able to run the operations in background
         // and keep it running even if we quit the page.
         if (delete_data == true) {
-           /// $("#table-demo-row2").show();
-            init_progress_bar('cleanup');
-
             var params = {};
             params["action"] = "cleanup_demo_data";
             params["page"] = "include/ajax/demo_data.ajax";
@@ -750,38 +787,15 @@ if ($display_loading === true || $running_create === true || $running_delete) {
 
     var items_checked = [];
 
-    function demo_load_progress(id_queue, operation) {
+    function demo_load_progress(operation) {
-        if (id_queue == null)
-            return;
-
-        var src_code = $('#' + id_queue).attr("src");
-        /* Check stop begin */
-        var progress_src = null;
-        var elements_src = src_code.split("&");
-
-        $.each(elements_src, function (key, value) {
-            /* Get progress of element */
-            if (value.indexOf("progress=") != -1) {
-                var tokens_src = value.split("=");
-                progress_src = tokens_src[1];
-            }
-        });
-
-        /* STOP timer condition (progress >= 100) */
-        if (progress_src >= 100) {
-            clearInterval($("#hidden-js_timer_" + id_queue).val());
-            return;
-        }
-
         var params = {};
-        params["action"] = "get_progress_bar";
+        params["action"] = "get_load_status";
         params["operation"] = operation;
         if (operation == 'cleanup') {
             var demo_items_count = '<?php echo $demo_items_count; ?>';
             params["demo_items_to_cleanup"] = demo_items_count;
         }
         params["page"] = "include/ajax/demo_data.ajax";
-        params["id_queue"] = id_queue;
 
         jQuery.ajax({
             data: params,
@@ -789,25 +803,14 @@ if ($display_loading === true || $running_create === true || $running_delete) {
             url: "ajax.php",
             dataType: "json",
             success: function(data) {
-                progress_tag_pos = src_code.indexOf("progress=");
+                if (data.current_progress_val == 100) {
-                rest_pos = src_code.indexOf("&", progress_tag_pos);
+                    clearInterval($("#hidden-js_timer").val());
-
-                pre_src = src_code.substr(0,progress_tag_pos);
-                post_src = src_code.substr(rest_pos);
-
-                /* Create new src code for progress bar */
-                new_src_code = pre_src + "progress=" + data.current_progress_val + post_src;
-
-                if (data.current_progress_val != '')
-                    $('#' + id_queue).attr("src", new_src_code);
-
-                if (data.current_progress_val == 100)
                     $('#action-btns-loading-done').show();
+                }
 
                 if (operation == 'create') {
                     var status_data = data?.demo_data_load_status;
-
+                    status_data.checked_items?.forEach(function(item_id, idx) {
-                    status_data.checked_items?.forEach(function(item_id) {
                         if (items_checked.includes(item_id)) {
                             return;
                         }
@@ -817,13 +820,17 @@ if ($display_loading === true || $running_create === true || $running_delete) {
                             && typeof status_data.errors[item_id] !== 'undefined'
                             && status_data.errors[item_id].length > 0
                         ) {
-                            status_data.errors[item_id].forEach(function(error_msg) {
+                            update_demo_status_icon(item_id, 'images/status_error@svg.svg');
-                                update_demo_status_icon(item_id, 'images/fail_circle_big.png');
+
+                            status_data.errors[item_id].forEach(function(error_msg) {                                
                                 print_error(item_id, error_msg);
                             });
                         } else {
-                            update_demo_status_icon(item_id, 'images/success_circle_big.png');
+                            update_demo_status_icon(item_id, 'images/status_check@svg.svg');
                         }
+
+                        $('div[data-item-id="' + item_id + '"] .loader-mini').hide();
+                        $('div[data-item-id="' + status_data.checked_items[idx + 1] + '"] .loader-mini').show();
                         items_checked.push(item_id);
                     });
                 }
@@ -832,32 +839,13 @@ if ($display_loading === true || $running_create === true || $running_delete) {
 
     }
 
-    function init_progress_bar(operation) {
+    function init_progress_checker(operation) {
-        /* Get progress bar */
+        clearInterval($("#hidden-js_timer").val());
-        var elements = $(".progress_bar");
-        $.each(elements, function (key, progress_bar) {
-            var elements_bar = $(progress_bar).attr("src").split("&");
-            var current_progress = null;
-            $.each(elements_bar, function (key, value) {
-                /* Get progress */
-                if (value.indexOf("progress=") != -1) {
-                    var tokens = value.split("=");
-                    current_progress = tokens[1];
-                }
-            });
 
-            /* Get Queue id */
+        /* 1 seconds between ajax request */
-            var id_bar = $(progress_bar).attr("id");
+        var id_interval = setInterval("demo_load_progress('"+operation+"')", (1 * 1000));
-            clearInterval($("#hidden-js_timer_" + id_bar).val());
+        /* This will keep timer info */
-
+        $("#hidden-js_timer").val(id_interval);
-            /* Only autorefresh incomplete bars */
-            if (current_progress < 100) {
-                /* 1 seconds between ajax request */
-                var id_interval = setInterval("demo_load_progress('"+ id_bar +"','"+operation+"')", (1 * 1000));
-                /* This will keep timer info */
-                $("#hidden-js_timer_" + id_bar).val(id_interval);
-            }
-        });
     }
 
     function update_demo_status_icon(itemId, iconName) {
@@ -865,6 +853,7 @@ if ($display_loading === true || $running_create === true || $running_delete) {
         var $icon = $listItem.find('.icon');
 
         $icon.attr('src', iconName);
+        $icon.show();
     }
 
     function print_error(item_id, error_msg) {
@@ -873,6 +862,6 @@ if ($display_loading === true || $running_create === true || $running_delete) {
         });
 
         // Append the new item to the corresponding error-list ul.
-        $('#load-info li[data-item-id="' + item_id + '"] .error-list').append(error_list_item);
+        $('#load-info div[data-item-id="' + item_id + '"] .error-list').append(error_list_item);
     }
 </script>

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@ use DI\ContainerBuilder;
 /*
  * Pandora build version and version
  */
-$build_version = 'PC240304';
+$build_version = 'PC240305';
 $pandora_version = 'v7.0NG.775';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -6943,3 +6943,39 @@ function get_defined_translation($string)
         }
     }
 }
+
+
+/**
+ * Merge any number of arrays by pairs of elements at the same index.
+ *
+ * @param array $arrays Arrays.
+ *
+ * @return array
+ */
+function createPairsFromArrays($arrays)
+{
+    $resultArray = [];
+
+    // Check if all arrays have the same length.
+    $lengths = array_map('count', $arrays);
+
+    if (count(array_unique($lengths)) === 1) {
+        $count = $lengths[0];
+
+        for ($i = 0; $i < $count; $i++) {
+            // Build pairs and add to the result array.
+            $pair = array_map(
+                function ($array) use ($i) {
+                    return $array[$i];
+                },
+                $arrays
+            );
+
+            $resultArray[] = $pair;
+        }
+
+        return $resultArray;
+    } else {
+        return [];
+    }
+}

pandora_console/include/functions_modules.php

@@ -2838,6 +2838,7 @@ function modules_get_color_status($status, $force_module=false)
         case STATUS_MODULE_NO_DATA_BALL:
         case STATUS_AGENT_NO_DATA_BALL:
         case STATUS_AGENT_NO_MONITORS_BALL:
+        case STATUS_AGENT_NO_MONITORS:
         return COL_NOTINIT;
 
         case AGENT_MODULE_STATUS_CRITICAL_BAD:

pandora_console/include/functions_ui.php

@@ -3654,7 +3654,11 @@ function ui_progress(
                             data = data_array[1];
                         }
                         try {
-                            val = JSON.parse(data);
+                            if (isNaN(data) === true) {
+                                val = JSON.parse(data);
+                            } else {
+                                val = data;
+                            }
 
                             $("#'.$id.'").attr("data-label", val + " %");
                             $("#'.$id.'_progress").width(val+"%");

pandora_console/include/styles/pandora.css

@@ -1067,6 +1067,10 @@ select:-internal-list-box {
   padding: 10px;
 }
 
+.padding20 {
+  padding: 20px;
+}
+
 .margin-soft {
   margin: 0.3em 1em;
 }
@@ -13525,6 +13529,127 @@ tr.shown td.details-control {
   -webkit-mask: url(../../images/minimizar.svg) no-repeat right / contain;
 }
 
+<<<<<<< head .table-info-light {
+  border-collapse: separate;
+  border-spacing: 0;
+  min-width: 350px;
+}
+
+.table-info-light tr td {
+  border-right: 1px solid #bbb;
+  border-bottom: 1px solid #bbb;
+  padding: 5px;
+}
+
+.table-info-light tr td:first-child {
+  border-left: 1px solid #bbb;
+  /*border-top: 1px solid #bbb;*/
+}
+
+.table-info-light tr td:last-child {
+  /*border-top: 1px solid #bbb;*/
+}
+
+.table-info-light tr {
+  text-align: left;
+  /*border-top: solid 1px #bbb;*/
+}
+
+.table-info-light tr:first-child td:first-child {
+  border-top: solid 1px #bbb;
+  border-top-left-radius: 6px;
+}
+
+.table-info-light tr:first-child td:last-child {
+  border-top: solid 1px #bbb;
+  border-top-right-radius: 6px;
+}
+
+.table-info-light tr:last-child td:first-child {
+  border-bottom-left-radius: 6px;
+}
+
+.table-info-light tr:last-child td:last-child {
+  border-bottom-right-radius: 6px;
+}
+
+.loader-small {
+  position: relative;
+  width: 40px;
+  height: 40px;
+  border-radius: 100%;
+  background: linear-gradient(#c0ccdc, #ffffff);
+  animation: animate 1.2s linear infinite;
+  margin: auto;
+}
+
+.loader-mini {
+  position: relative;
+  width: 30px;
+  height: 30px;
+  border-radius: 100%;
+  background: linear-gradient(#c0ccdc, #ffffff);
+  animation: animate 1.2s linear infinite;
+  margin: auto;
+}
+
+.loader-small span,
+.loader-mini span {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 100%;
+  background: linear-gradient(#c0ccdc, #ffffff);
+}
+.loader-small span:nth-child(1),
+.loader-mini span:nth-child(1) {
+  filter: blur(1px);
+}
+.loader-small span:nth-child(2),
+.loader-mini span:nth-child(2) {
+  filter: blur(2px);
+}
+.loader-small span:nth-child(3),
+.loader-mini span:nth-child(3) {
+  filter: blur(3px);
+}
+.loader-small span:nth-child(4),
+.loader-mini span:nth-child(4) {
+  filter: blur(4px);
+}
+.loader-small:after {
+  content: "";
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  right: 10px;
+  bottom: 10px;
+  background: white;
+  border: solid white 10px;
+  border-radius: 50%;
+}
+
+.loader-mini:after {
+  content: "";
+  position: absolute;
+  top: 5px;
+  left: 5px;
+  right: 10px;
+  bottom: 10px;
+  background: white;
+  border: solid white 10px;
+  border-radius: 50%;
+}
+
+@keyframes animate {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
 #modules-toggle > .modules > .white-box-content div {
   z-index: 1 !important;
 }

pandora_console/install.php

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

pandora_console/pandora_console.redhat.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240304
+%define release     240305
 
 # 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.775
-%define release     240304
+%define release     240305
 
 # 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.775
-%define release     240304
+%define release     240305
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -4562,7 +4562,7 @@ PRIMARY KEY (`id`)
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tdemo_data` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `item_id` INT UNSIGNED NULL DEFAULT NULL,
+  `item_id` TEXT NOT NULL DEFAULT '',
   `table_name` VARCHAR(64) NULL DEFAULT NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

pandora_console/views/tacticalView/view.php

@@ -5,9 +5,8 @@
         <span class="subtitle-welcome-message"><?php echo __('This is the latest data in your tactical view'); ?></span>
     </div>
 
-    <div class="row">
+
-        <div class="col-xl-6">
+
-            <div id="general-overview" class="pdd_5px">
                 <div class="container">
                     <div class="title">
                         <?php echo $Overview->title; ?>
@@ -15,47 +14,23 @@
                     <div class="content br-t">
                         <div class="row">
                             <div class="col-12">
-                                <div class="row">
+                                <div>
-                                    <div class="col-4">
                                         <div class="padding10">
-                                            <span class="subtitle">
-                                                <?php echo __('Pandora FMS log size'); ?>
-                                            </span>
                                             <?php echo $Overview->getLogSizeStatus(); ?>
                                         </div>
-                                    </div>
+                                </div>
-                                    <div class="col-4 br-l">
+                                <div class="br-t">
-                                        <div class="padding10">
+                                    <div class="padding10">
-                                            <span class="subtitle">
+                                        <?php echo $Overview->getLicenseUsageGraph(); ?>
-                                                <?php echo __('Server status'); ?>
-                                            </span>
-                                            <?php echo $Overview->getServerStatus(); ?>
-                                        </div>
-                                    </div>
-                                    <div class="col-4 br-l">
-                                        <div class="padding10">
-                                            <span class="subtitle">
-                                                <?php echo __('System CPU Load'); ?>
-                                            </span>
-                                            <?php echo $Overview->getCPULoadGraph(); ?>
-                                        </div>
                                     </div>
                                 </div>
-                                <?php if ($disableGeneralStatistics === false) : ?>
-                                    <div class="br-t">
-                                        <div class="padding10">
-                                            <span class="subtitle">
-                                                <?php echo __('License usage'); ?>
-                                            </span>
-                                            <?php echo $Overview->getLicenseUsageGraph(); ?>
-                                        </div>
-                                    </div>
-                                <?php endif; ?>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
+
+
+                
             <div class="row flex-nowrap height_100p">
                 <div class="col-7 pdd_5px">
                     <div class="container">
@@ -145,7 +120,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+
         <div class="col-xl-6">
             <div class="container mrgn_5px">
                 <div class="title">

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.775-240304
+Version: 7.0NG.775-240305
 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.775-240304"
+pandora_version="7.0NG.775-240305"
 
 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.775";
-my $pandora_build = "240304";
+my $pandora_build = "240305";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

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.775";
-my $pandora_build = "240304";
+my $pandora_build = "240305";
 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.775
-%define release     240304
+%define release     240305
 
 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.775
-%define release     240304
+%define release     240305
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

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

pandora_server/util/pandora_db.pl

@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240304";
+my $version = "7.0NG.775 Build 240305";
 
 # Pandora server configuration
 my %conf;

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