diff --git a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh index 1d8d554314..64beb74eb2 100644 --- a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh +++ b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh @@ -601,6 +601,7 @@ EOF_PARAM a2enmod ssl &>> "$LOGFILE" a2enmod headers &>> "$LOGFILE" +a2enmod rewrite &>> "$LOGFILE" a2enconf ssl-params &>> "$LOGFILE" a2ensite default-ssl &>> "$LOGFILE" a2enconf ssl-params &>> "$LOGFILE" diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 49a0183938..d9f39051c1 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-240404 +Version: 7.0NG.776-240405 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 8bb7b260a7..58061ca21f 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-240404" +pandora_version="7.0NG.776-240405" 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 5d3739cf0a..58d67e967e 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 => '240404'; +use constant AGENT_BUILD => '240405'; # 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 b0ba0ab82d..2d78b25776 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 240404 +%define release 240405 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 a367cc3aad..02a5ac81c9 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 240404 +%define release 240405 %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 abf4fb7654..301ae017c6 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 240404 +%define release 240405 %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 a4079517e7..4618abe7d8 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 240404 +%define release 240405 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 f16c6773a5..2692fd86e0 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 240404 +%define release 240405 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 6393c44e2f..024143fda1 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="240404" +PI_BUILD="240405" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 3c78f290ea..eadebab010 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240404} +{240405} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c3675292b4..053c8d970f 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 240404") +#define PANDORA_VERSION ("7.0NG.776 Build 240405") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 374f404f59..3d5b2b3912 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 240404))" + VALUE "ProductVersion", "(7.0NG.776(Build 240405))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d651c78e45..569ea4ac3f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240404 +Version: 7.0NG.776-240405 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 5e4f8f1baa..3946802c4a 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-240404" +pandora_version="7.0NG.776-240405" package_pear=0 package_pandora=1 diff --git a/pandora_console/images/tree/corner@tree-dark.svg b/pandora_console/images/tree/corner@tree-dark.svg new file mode 100644 index 0000000000..66aa81f0e6 --- /dev/null +++ b/pandora_console/images/tree/corner@tree-dark.svg @@ -0,0 +1,12 @@ + + + + Dark / 20 / dotted corner@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/tree/corner_straight@tree-dark.svg b/pandora_console/images/tree/corner_straight@tree-dark.svg new file mode 100644 index 0000000000..5a958e59a5 --- /dev/null +++ b/pandora_console/images/tree/corner_straight@tree-dark.svg @@ -0,0 +1,18 @@ + + + + Dark / 20 / dotted corner@svg + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/tree/corner_straight_minus@tree-dark.svg b/pandora_console/images/tree/corner_straight_minus@tree-dark.svg new file mode 100644 index 0000000000..092cf40252 --- /dev/null +++ b/pandora_console/images/tree/corner_straight_minus@tree-dark.svg @@ -0,0 +1,26 @@ + + + + Dark / 20 / dotted corner@svg + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/tree/corner_straight_plus@tree-dark.svg b/pandora_console/images/tree/corner_straight_plus@tree-dark.svg new file mode 100644 index 0000000000..e9840c7b08 --- /dev/null +++ b/pandora_console/images/tree/corner_straight_plus@tree-dark.svg @@ -0,0 +1,27 @@ + + + + Dark / 20 / dotted corner@svg + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/tree/straight@tree-dark.svg b/pandora_console/images/tree/straight@tree-dark.svg new file mode 100644 index 0000000000..c5a47a2f9a --- /dev/null +++ b/pandora_console/images/tree/straight@tree-dark.svg @@ -0,0 +1,13 @@ + + + + Dark / 20 / dotted straight@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index cf561c9b3c..37b251825f 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240404'; +$build_version = 'PC240405'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 8c4112065c..0ef04c1634 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1920,6 +1920,34 @@ div.events-refresh-pure { background-color: #333; } +#general-tactical-view * { + border-color: #333 !important; +} + +#tree-controller-recipient .node-icon { + border-right-color: #333; +} + +.tree-node { + background-image: url(../../images/tree/straight@tree-dark.svg); +} + +#tree-controller-recipient .tree-node.leaf-closed > .leaf-icon { + background-image: url(../../images/tree/corner_straight_plus@tree-dark.svg); +} + +#tree-controller-recipient .tree-node.leaf-open > .leaf-icon { + background-image: url(../../images/tree/corner_straight_minus@tree-dark.svg); +} + +#tree-controller-recipient .tree-node > .leaf-icon { + background-image: url(../../images/tree/corner_straight@tree-dark.svg); +} + +#tree-controller-recipient .tree-node:last-of-type > .leaf-icon { + background-image: url(../../images/tree/corner@tree-dark.svg); +} + .empty-view-buttons { border-color: #94a1bb14; } diff --git a/pandora_console/install.php b/pandora_console/install.php index 952d8931b5..349ad1e87e 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 39c69c63d7..70d0ebd142 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240404 +%define release 240405 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index bfb5725669..a0a408ba07 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240404 +%define release 240405 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 7e1d429362..74388cdb06 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240404" +PI_BUILD="240405" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 101a9a9ddb..6f9f336ad9 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240404"; +my $version = "7.0NG.776 Build 240405"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index dec9a6b9f8..d67e8336a0 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/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.776 Build 240404"; +my $version = "7.0NG.776 Build 240405"; # save program name for logging my $progname = basename($0);