diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 8364d887e0..49968aff95 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240325 +Version: 7.0NG.776-240326 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index ff7dd84f27..747e9899e7 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/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.776-240325" +pandora_version="7.0NG.776-240326" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 063cf136c3..3af86f333a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240325'; +use constant AGENT_BUILD => '240326'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 587cad9a58..851b6c2c85 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/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.776 -%define release 240325 +%define release 240326 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index f71ab1e99e..5de72b2e89 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/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.776 -%define release 240325 +%define release 240326 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 5f7bf6d3e2..1c6192f08e 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/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.776 -%define release 240325 +%define release 240326 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index f7b2fcad4e..fcfc96c8e2 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/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.776 -%define release 240325 +%define release 240326 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 13901819b7..de189c8c44 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240325 +%define release 240326 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 766a5d0aad..02d493eaf1 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240325" +PI_BUILD="240326" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d0871dc287..84af1757d9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240325} +{240326} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 6b9df236f5..ce803f8907 100644 --- a/pandora_agents/win32/pandora.cc +++ b/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.776 Build 240325") +#define PANDORA_VERSION ("7.0NG.776 Build 240326") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 26a4b29c79..8712d35874 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/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.776(Build 240325))" + VALUE "ProductVersion", "(7.0NG.776(Build 240326))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a61d740369..ee2f075ad5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240325 +Version: 7.0NG.776-240326 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index ffe4dfa835..0c9e638f55 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/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.776-240325" +pandora_version="7.0NG.776-240326" package_pear=0 package_pandora=1 diff --git a/pandora_console/extras/demodata/network_maps/1-networkmap.prd b/pandora_console/extras/demodata/network_maps/1-networkmap.prd index bcadf421bd..df1adcbc1c 100644 --- a/pandora_console/extras/demodata/network_maps/1-networkmap.prd +++ b/pandora_console/extras/demodata/network_maps/1-networkmap.prd @@ -53,7 +53,7 @@ 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\"}" +style[2]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/freebsd@os.svg\",\"width\":null,\"height\":null,\"label\":\"freebsd-1\"}" id[3]="3" id_map[3]="2" @@ -66,7 +66,7 @@ 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\"}" +style[3]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/apple@os.svg\",\"width\":null,\"height\":null,\"label\":\"macos-1\"}" id[4]="4" id_map[4]="2" @@ -79,7 +79,7 @@ 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\"}" +style[4]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-1\"}" id[5]="5" id_map[5]="2" @@ -92,7 +92,7 @@ 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\"}" +style[5]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-2\"}" id[6]="6" id_map[6]="2" @@ -105,7 +105,7 @@ 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\"}" +style[6]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-1\"}" id[7]="7" id_map[7]="2" @@ -118,7 +118,7 @@ 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\"}" +style[7]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-2\"}" id[8]="8" id_map[8]="2" @@ -131,7 +131,7 @@ 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\"}" +style[8]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-3\"}" id[9]="9" id_map[9]="2" @@ -144,7 +144,7 @@ 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\"}" +style[9]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-4\"}" id[10]="10" id_map[10]="2" @@ -157,7 +157,7 @@ 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\"}" +style[10]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/cisco@os.svg\",\"width\":null,\"height\":null,\"label\":\"cisco-2\"}" id[11]="11" id_map[11]="2" @@ -170,7 +170,7 @@ 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\"}" +style[11]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/freebsd@os.svg\",\"width\":null,\"height\":null,\"label\":\"freebsd-2\"}" id[12]="12" id_map[12]="2" @@ -183,7 +183,7 @@ 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\"}" +style[12]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/apple@os.svg\",\"width\":null,\"height\":null,\"label\":\"macos-2\"}" id[13]="13" id_map[13]="2" @@ -196,7 +196,7 @@ 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\"}" +style[13]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-3\"}" id[14]="14" id_map[14]="2" @@ -209,7 +209,7 @@ 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\"}" +style[14]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-4\"}" id[15]="15" id_map[15]="2" @@ -222,7 +222,7 @@ 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\"}" +style[15]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-5\"}" id[16]="16" id_map[16]="2" @@ -235,7 +235,7 @@ 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\"}" +style[16]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-6\"}" id[17]="17" id_map[17]="2" @@ -248,7 +248,7 @@ 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\"}" +style[17]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-7\"}" id[18]="18" id_map[18]="2" @@ -261,7 +261,7 @@ 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\"}" +style[18]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-8\"}" id[19]="19" id_map[19]="2" @@ -274,7 +274,7 @@ 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\"}" +style[19]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/cisco@os.svg\",\"width\":null,\"height\":null,\"label\":\"cisco-3\"}" id[20]="20" id_map[20]="2" @@ -287,7 +287,7 @@ 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\"}" +style[20]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/freebsd@os.svg\",\"width\":null,\"height\":null,\"label\":\"freebsd-3\"}" id[21]="21" id_map[21]="2" @@ -300,7 +300,7 @@ 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\"}" +style[21]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/apple@os.svg\",\"width\":null,\"height\":null,\"label\":\"macos-3\"}" id[22]="22" id_map[22]="2" @@ -313,7 +313,7 @@ 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\"}" +style[22]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-5\"}" id[23]="23" id_map[23]="2" @@ -326,7 +326,7 @@ 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\"}" +style[23]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/windows@os.svg\",\"width\":null,\"height\":null,\"label\":\"windows-6\"}" id[24]="24" id_map[24]="2" @@ -339,7 +339,7 @@ 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\"}" +style[24]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-9\"}" id[25]="25" id_map[25]="2" @@ -352,7 +352,7 @@ 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\"}" +style[25]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-10\"}" id[26]="26" id_map[26]="2" @@ -365,7 +365,7 @@ 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\"}" +style[26]="{\"shape\":\"circle\",\"image\":\"images\/networkmap\/linux@os.svg\",\"width\":null,\"height\":null,\"label\":\"linux-11\"}" id[27]="27" id_map[27]="2" @@ -378,13 +378,13 @@ 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\"}" +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_parent[1]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[1]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-1\"}},\"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\"}}" @@ -394,8 +394,8 @@ 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_parent[2]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[2]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"macos-1\"}},\"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\"}}" @@ -405,8 +405,8 @@ 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_parent[3]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[3]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-1\"}},\"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\"}}" @@ -416,8 +416,8 @@ 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_parent[4]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[4]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-2\"}},\"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\"}}" @@ -427,8 +427,8 @@ 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_parent[5]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-1\"}},\"x\":\"528\",\"y\":\"-37\",\"z\":\"0\"}}" +id_child[5]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-1\"}},\"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\"}}" @@ -438,8 +438,8 @@ 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_parent[6]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-1\"}},\"x\":\"528\",\"y\":\"-37\",\"z\":\"0\"}}" +id_child[6]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-2\"}},\"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\"}}" @@ -449,8 +449,8 @@ 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_parent[7]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-2\"}},\"x\":\"514\",\"y\":\"389\",\"z\":\"0\"}}" +id_child[7]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-3\"}},\"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\"}}" @@ -460,8 +460,8 @@ 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_parent[8]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-2\"}},\"x\":\"514\",\"y\":\"389\",\"z\":\"0\"}}" +id_child[8]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-4\"}},\"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\"}}" @@ -471,8 +471,8 @@ 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_parent[9]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[9]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-2\"}},\"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\"}}" @@ -482,8 +482,8 @@ 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_parent[10]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[10]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-2\"}},\"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\"}}" @@ -493,8 +493,8 @@ 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_parent[11]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-1\"}},\"x\":\"854\",\"y\":\"221\",\"z\":\"0\"}}" +id_child[11]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"macos-2\"}},\"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\"}}" @@ -504,8 +504,8 @@ 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_parent[12]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-2\"}},\"x\":\"1036\",\"y\":\"711\",\"z\":\"0\"}}" +id_child[12]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-3\"}},\"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\"}}" @@ -515,8 +515,8 @@ 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_parent[13]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-2\"}},\"x\":\"1036\",\"y\":\"711\",\"z\":\"0\"}}" +id_child[13]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-4\"}},\"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\"}}" @@ -526,8 +526,8 @@ 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_parent[14]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-3\"}},\"x\":\"686\",\"y\":\"875\",\"z\":\"0\"}}" +id_child[14]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-5\"}},\"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\"}}" @@ -537,8 +537,8 @@ 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_parent[15]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-3\"}},\"x\":\"686\",\"y\":\"875\",\"z\":\"0\"}}" +id_child[15]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-6\"}},\"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\"}}" @@ -548,8 +548,8 @@ 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_parent[16]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-4\"}},\"x\":\"1452\",\"y\":\"847\",\"z\":\"0\"}}" +id_child[16]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-7\"}},\"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\"}}" @@ -559,8 +559,8 @@ 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_parent[17]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-4\"}},\"x\":\"1452\",\"y\":\"847\",\"z\":\"0\"}}" +id_child[17]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-8\"}},\"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\"}}" @@ -570,8 +570,8 @@ 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_parent[18]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"macos-1\"}},\"x\":\"1268\",\"y\":\"235\",\"z\":\"0\"}}" +id_child[18]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-3\"}},\"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\"}}" @@ -581,8 +581,8 @@ 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_parent[19]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-4\"}},\"x\":\"226\",\"y\":\"595\",\"z\":\"0\"}}" +id_child[19]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-3\"}},\"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\"}}" @@ -592,8 +592,8 @@ 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_parent[20]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-3\"}},\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}" +id_child[20]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"macos-3\"}},\"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\"}}" @@ -603,8 +603,8 @@ 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_parent[21]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-3\"}},\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}" +id_child[21]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-5\"}},\"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\"}}" @@ -614,8 +614,8 @@ 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_parent[22]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-3\"}},\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}" +id_child[22]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"windows-6\"}},\"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\"}}" @@ -625,8 +625,8 @@ 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_parent[23]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-3\"}},\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}" +id_child[23]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-9\"}},\"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\"}}" @@ -636,8 +636,8 @@ 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_parent[24]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"freebsd-3\"}},\"x\":\"-82\",\"y\":\"583\",\"z\":\"0\"}}" +id_child[24]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-10\"}},\"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\"}}" @@ -647,8 +647,8 @@ 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_parent[25]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-3\"}},\"x\":\"1824\",\"y\":\"285\",\"z\":\"0\"}}" +id_child[25]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-11\"}},\"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\"}}" @@ -658,8 +658,8 @@ 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_parent[26]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"cisco-3\"}},\"x\":\"1824\",\"y\":\"285\",\"z\":\"0\"}}" +id_child[26]="{\"titem\":{\"id_map\":\"2\",\"type\":\"0\",\"source_data\":{\"tagente\":{\"nombre\":\"linux-12\"}},\"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\"}}" diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql index 91dc80032c..11562f9ded 100644 --- a/pandora_console/extras/mr/69.sql +++ b/pandora_console/extras/mr/69.sql @@ -2,6 +2,9 @@ START TRANSACTION; DROP TABLE tskin; +ALTER TABLE `tusuario` +ADD COLUMN `stop_lts_modal` TINYINT NOT NULL DEFAULT 0 AFTER `session_max_time_expire`; + -- START MIGRATION MSSQL -- SET @current_app_type = 12; SET @short_name = 'pandorafms.mssql'; @@ -7673,4 +7676,35 @@ UPDATE `trecon_task` -- END MIGRATION SAP DESET -- + +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/03_monitoring/06_web_monitoring' WHERE title = '¿Sabías que puedes monitorizar webs?'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/03_monitoring/03_remote_monitoring#monitorizacion_snmp' WHERE title = 'Monitorización remota de dispositivos SNMP'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/03_monitoring/03_remote_monitoring#monitorizacion_de_rutas' WHERE title = 'Monitorizar rutas desde una IP a otra'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/04_using/11_managing_and_administration#paradas_de_servicio_planificadas' WHERE title = 'Paradas planificadas'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/pandorafms/management_and_operation/01_alerts#configuracion_de_correos_para_alertas_en_pandora_fms' WHERE title = 'Personalizar los emails de alerta '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/start?id=es/documentation/04_using/05_data_presentation_visual_maps' WHERE title = 'Usando iconos personalizados en consolas visuales '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/04_using/05_data_presentation_visual_maps#mapa_de_calor_o_nube_de_color' WHERE title = 'Consolas visuales: mapas de calor '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/04_using/11_managing_and_administration#log_de_auditoria' WHERE title = 'Auditoría interna de la consola '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/start?id=es/documentation/02_installation/05_configuration_agents#configuracion_automatica_de_agentes' WHERE title = 'Sistema de provisión automática de agentes '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/04_using/05_data_presentation_visual_maps#enlace_de_red' WHERE title = 'Enlaces de red en la consola visual '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/04_using/08_data_presentation_reports#grafico_de_disponibilidad' WHERE title = 'Gráficas de disponibilidad '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/es/documentation/04_using/12_console_setup?s%5B%5D%3Dcontrase%25C3%25B1as#password_policy' WHERE title = 'Política de contraseñas'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/12_console_setup?s%5B%5D%3Dgoogle%26s%5B%5D%3Dauth#authentication' WHERE title = 'Autenticación de doble factor '; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/03_monitoring/06_web_monitoring' WHERE title = 'Did you know that you can monitor websites?'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/11_managing_and_administration#log_de_auditoria' WHERE title = 'Console Internal Audit'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/12_console_setup?s%5B%5D%3Dgoogle%26s%5B%5D%' WHERE title = 'Two-factor authentication'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/05_data_presentation_visual_maps#mapa_de_cal' WHERE title = 'Visual consoles: heat maps'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/05_data_presentation_visual_maps#enlace_de_red' WHERE title = 'Network links in the visual console'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/08_data_presentation_reports#grafico_de_disp' WHERE title = 'Availability graphs'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/03_monitoring/03_remote_monitoring#monitorizacion_snmp' WHERE title = 'Remote monitoring of SNMP devices'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/03_monitoring/03_remote_monitoring#monitorizacion_de_rutas' WHERE title = 'Monitor routes from one IP to another'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/11_managing_and_administration#scheduled_downtimes' WHERE title = 'Scheduled downtimes'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/01_alerts#editing_an_action' WHERE title = 'Customize alert emails'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/en/documentation/04_using/12_console_setup?s%5B%5D%3Dcontrase%25C3%25B' WHERE title = 'password policy'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/start?id=en/documentation/02_installation/05_configuration_agents#conf' WHERE title = 'Automatic agent provision system'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/start?id=en/documentation/02_installation/05_configuration_agents#conf' WHERE title = 'Automatic agent provision system'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/start?id=en/documentation/02_installation/05_configuration_agents#conf' WHERE title = 'Automatic agent provision system'; +UPDATE `twelcome_tip` SET url = 'https://pandorafms.com/manual/!current/start?id=en/documentation/04_using/05_data_presentation_visual_maps' WHERE title = 'Using custom icons in visual consoles'; + + COMMIT; \ No newline at end of file diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 396098359c..1596ec7d80 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -1049,8 +1049,10 @@ echo sprintf('
', $menuTypeClass); }) } }, + closeOnEscape: true, onload: () => { $(document).ready(function () { + $(".ui-dialog-titlebar-close").hide(); var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix"); $(buttonpane).append(`
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index c69cf0de52..eb3b49c055 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -662,13 +662,16 @@ if ($modules !== false) { $table->width = '100%'; $table->class = 'tactical_table info_table'; $table->head = []; - $table->head['checkbox'] = html_print_checkbox( - 'all_delete', - 0, - false, - true, - false - ); + if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') === true) { + $table->head['checkbox'] = html_print_checkbox( + 'all_delete', + 0, + false, + true, + false + ); + } + $table->head[0] = ''.__('Name').''.ui_get_sorting_arrows( $url_name.'up', $url_name.'down', @@ -1262,23 +1265,11 @@ html_print_div( $('#modal').dialog("close"); }); - $('[id^=checkbox-id_delete]').change(function(){ - if($(this).parent().parent().hasClass('checkselected')){ - $(this).parent().parent().removeClass('checkselected'); - } - else{ - $(this).parent().parent().addClass('checkselected'); - } - }); - - $('[id^=checkbox-all_delete]').change(function(){ if ($("#checkbox-all_delete").prop("checked")) { - $('[id^=checkbox-id_delete]').parent().parent().addClass('checkselected'); $("[name^=id_delete").prop("checked", true); } else{ - $('[id^=checkbox-id_delete]').parent().parent().removeClass('checkselected'); $("[name^=id_delete").prop("checked", false); } }); diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 1cba97ca1e..191c1bad69 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -259,12 +259,12 @@ $table->data[3][1] = html_print_label_input_block( $table->data[4][0] = html_print_label_input_block( __('Contact').ui_print_help_tip(__('Contact information accessible through the _groupcontact_ macro'), true), - html_print_textarea('contact', 4, 40, $contact, "class='min-height-0px'", true) + html_print_input_text('contact', $contact, '', false, '', true) ); $table->data[4][1] = html_print_label_input_block( __('Other').ui_print_help_tip(__('Information accessible through the _group_other_ macro'), true), - html_print_textarea('other', 4, 40, $other, "class='min-height-0px'", true) + html_print_input_text('other', $other, '', false, '', true) ); $table->data[5][0] = html_print_label_input_block( diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 8669b9f257..c039193fb2 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -804,8 +804,10 @@ $("#conf_wizard").click(function() { }) } }, + closeOnEscape: true, onload: () => { $(document).ready(function () { + $(".ui-dialog-titlebar-close").hide(); var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix"); $(buttonpane).append(`
diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php index 7ed4e20eb5..a5e0b0572e 100644 --- a/pandora_console/godmode/reporting/graph_builder.main.php +++ b/pandora_console/godmode/reporting/graph_builder.main.php @@ -319,7 +319,7 @@ $ActionButtons[] = html_print_button( __('Go back'), 'back', false, - "window.location.href = 'index.php?sec=reporting&sec2=godmode/reporting/graphs'", + 'history.go(-1)', [ 'class' => 'sub ok submitButton', 'icon' => 'back', diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index fe08aaa9fb..04b042dea3 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -553,6 +553,10 @@ if (!$maps && is_metaconsole() === false) { ['class' => 'main_menu_icon invert_filter'] ).''; } else { + $table->cellclass[] = [ + 3 => 'table_action_buttons', + 4 => 'table_action_buttons', + ]; $data[3] = ''.html_print_image( 'images/copy.svg', true, diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index b30f1d6c43..806e9e980d 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -2860,20 +2860,32 @@ if (is_metaconsole() === true) { if (!empty($style_button_create_custom_graph)) { $style_create = [ - 'mode' => 'link', + 'mode' => 'mini', + 'icon' => 'next', + 'class' => 'mrgn_lft_10px', 'style' => 'display:none', ]; } else { - $style_create = [ 'mode' => 'link' ]; + $style_create = [ + 'mode' => 'mini', + 'icon' => 'next', + 'class' => 'mrgn_lft_10px', + ]; } if (!empty($style_button_edit_custom_graph)) { $style_edit = [ - 'mode' => 'link', + 'mode' => 'mini', + 'icon' => 'update', + 'class' => 'mrgn_lft_10px', 'style' => 'display:none', ]; } else { - $style_edit = [ 'mode' => 'link' ]; + $style_edit = [ + 'mode' => 'mini', + 'icon' => 'update', + 'class' => 'mrgn_lft_10px', + ]; } html_print_button( diff --git a/pandora_console/godmode/reporting/schedule.php b/pandora_console/godmode/reporting/schedule.php index 8f01c85cfd..cc665fa9d0 100644 --- a/pandora_console/godmode/reporting/schedule.php +++ b/pandora_console/godmode/reporting/schedule.php @@ -157,7 +157,7 @@ if ((bool) users_is_admin() === false) { $where = sprintf(' AND id_usuario = "%s"', $config['id_user']); } -$sql = 'SELECT * FROM tuser_task_scheduled WHERE id_user_task IN (1,2,3,4) '.$where; +$sql = 'SELECT * FROM tuser_task_scheduled WHERE id_user_task IN (1,2,3) '.$where; $reports = db_get_all_rows_sql($sql); if ($reports !== false) { $table = new stdClass(); diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php index 6a54b2c049..24b0c3f9bf 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php +++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php @@ -145,6 +145,11 @@ $table->data['all_0'][0] = html_print_label_input_block( $table->rowstyle['staticgraph'] = 'display: none;'; $table->colspan['staticgraph'][0] = 2; +$src = $config['homeurl'].'/images/console/icons/appliance_ok.png'; +if (is_metaconsole() === true) { + $src = $config['homeurl'].'../../images/console/icons/appliance_ok.png'; +} + $table->data['staticgraph'][0] = html_print_label_input_block( __('Image'), '
'.html_print_select( @@ -160,7 +165,7 @@ $table->data['staticgraph'][0] = html_print_label_input_block( '', false, 'width: 49%' - ).'
' + ).'
' ); $table->rowstyle['all_1'] = 'display: none;'; @@ -902,10 +907,15 @@ function findInSelect(selectid, find){ }) } -$('#image').on('change', function(){ +$('#image').on('change', function() { var img = $(this).val(); - $('#image_prev').html(''); -}) + var src = ""+`/images/console/icons/${img}.png`; + if (metaconsole_enabled) { + src = ""+`../../images/console/icons/${img}.png`; + } + + $('#image_prev').html(``); +});