Merge branch 'develop' into ent-13148-vistas-vacias

This commit is contained in:
Pablo Aragon 2024-04-05 08:30:52 +02:00
commit 220e5e0c0a
35 changed files with 153 additions and 28 deletions

View File

@ -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"

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.776-240404
Version: 7.0NG.776-240405
Architecture: all
Priority: optional
Section: admin

View File

@ -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

View File

@ -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;

View File

@ -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}

View File

@ -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

View File

@ -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

View File

@ -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}

View File

@ -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}

View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.776"
PI_BUILD="240404"
PI_BUILD="240405"
OS_NAME=`uname -s`
FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{240404}
{240405}
ViewReadme
{Yes}

View File

@ -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;

View File

@ -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

View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.776-240404
Version: 7.0NG.776-240405
Architecture: all
Priority: optional
Section: admin

View File

@ -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

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / dotted corner@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-dotted-corner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,-8.8817842e-16 10,-8.8817842e-16 C9.44771525,-8.8817842e-16 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M11.9475734,11.0046923 L12.1206389,11.0088292 L14.0125056,11 C14.5647843,10.997423 15.0104053,10.5476233 15.0078502,9.9953446 C15.0052507,9.44306587 14.555451,8.99744483 14.0031722,9.00002215 L12.0524764,9.00744533 C11.5009519,8.97847716 11.0303696,9.40209278 11.0014014,9.9536173 C10.9724333,10.5051418 11.3960489,10.9757241 11.9475734,11.0046923 Z M17.0046669,11.0093338 L19.0046451,10.9999893 C19.5569239,10.997412 20.0025449,10.5476123 19.9999787,9.99533358 C19.9973902,9.44305484 19.5475905,8.9974338 18.9953118,9 L16.9953336,9.00934444 C16.4430548,9.01192177 15.9974338,9.46172148 16,10.0140002 C16.0025884,10.5662789 16.4523882,11.0119 17.0046669,11.0093338 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / dotted corner@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-dotted-corner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,-8.8817842e-16 10,-8.8817842e-16 C9.44771525,-8.8817842e-16 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M11.9475734,11.0046923 L12.1206389,11.0088292 L14.0125056,11 C14.5647843,10.997423 15.0104053,10.5476233 15.0078502,9.9953446 C15.0052507,9.44306587 14.555451,8.99744483 14.0031722,9.00002215 L12.0524764,9.00744533 C11.5009519,8.97847716 11.0303696,9.40209278 11.0014014,9.9536173 C10.9724333,10.5051418 11.3960489,10.9757241 11.9475734,11.0046923 Z M17.0046669,11.0093338 L19.0046451,10.9999893 C19.5569239,10.997412 20.0025449,10.5476123 19.9999787,9.99533358 C19.9973902,9.44305484 19.5475905,8.9974338 18.9953118,9 L16.9953336,9.00934444 C16.4430548,9.01192177 15.9974338,9.46172148 16,10.0140002 C16.0025884,10.5662789 16.4523882,11.0119 17.0046669,11.0093338 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
<g id="Dark-/-20-/-dotted-straight" stroke="none" stroke-width="1" fill="none"
fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,0 10,0 C9.44771525,0 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M9,11 L9,13 C9,13.5522847 9.44771525,14 10,14 C10.5522847,14 11,13.5522847 11,13 L11,11 C11,10.4477153 10.5522847,10 10,10 C9.44771525,10 9,10.4477153 9,11 Z M9,16 L9,18 C9,18.5522847 9.44771525,19 10,19 C10.5522847,19 11,18.5522847 11,18 L11,16 C11,15.4477153 10.5522847,15 10,15 C9.44771525,15 9,15.4477153 9,16 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / dotted corner@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-dotted-corner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,-8.8817842e-16 10,-8.8817842e-16 C9.44771525,-8.8817842e-16 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M11.9475734,11.0046923 L12.1206389,11.0088292 L14.0125056,11 C14.5647843,10.997423 15.0104053,10.5476233 15.0078502,9.9953446 C15.0052507,9.44306587 14.555451,8.99744483 14.0031722,9.00002215 L12.0524764,9.00744533 C11.5009519,8.97847716 11.0303696,9.40209278 11.0014014,9.9536173 C10.9724333,10.5051418 11.3960489,10.9757241 11.9475734,11.0046923 Z M17.0046669,11.0093338 L19.0046451,10.9999893 C19.5569239,10.997412 20.0025449,10.5476123 19.9999787,9.99533358 C19.9973902,9.44305484 19.5475905,8.9974338 18.9953118,9 L16.9953336,9.00934444 C16.4430548,9.01192177 15.9974338,9.46172148 16,10.0140002 C16.0025884,10.5662789 16.4523882,11.0119 17.0046669,11.0093338 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
<g id="Dark-/-20-/-dotted-straight" stroke="none" stroke-width="1" fill="none"
fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,0 10,0 C9.44771525,0 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M9,11 L9,13 C9,13.5522847 9.44771525,14 10,14 C10.5522847,14 11,13.5522847 11,13 L11,11 C11,10.4477153 10.5522847,10 10,10 C9.44771525,10 9,10.4477153 9,11 Z M9,16 L9,18 C9,18.5522847 9.44771525,19 10,19 C10.5522847,19 11,18.5522847 11,18 L11,16 C11,15.4477153 10.5522847,15 10,15 C9.44771525,15 9,15.4477153 9,16 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
<path fill="#444444" class="st1"
d="M 323.217 324.737 L 323.217 255.824 C 323.217 250.901 329.256 247.209 337.309 247.209 C 345.361 247.209 351.4 250.901 351.4 255.824 L 351.4 324.122 C 351.4 329.044 345.361 332.737 337.309 332.737 C 329.256 333.351 323.217 329.66 323.217 324.737 Z"
style=""></path>
<circle fill="#aaaaaa" class="st0" cx="10" cy="10" r="5" />
<rect x="7" y="9" width="6px" height="2px" fill="#333333"></rect>
</svg>

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / dotted corner@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-dotted-corner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,-8.8817842e-16 10,-8.8817842e-16 C9.44771525,-8.8817842e-16 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M11.9475734,11.0046923 L12.1206389,11.0088292 L14.0125056,11 C14.5647843,10.997423 15.0104053,10.5476233 15.0078502,9.9953446 C15.0052507,9.44306587 14.555451,8.99744483 14.0031722,9.00002215 L12.0524764,9.00744533 C11.5009519,8.97847716 11.0303696,9.40209278 11.0014014,9.9536173 C10.9724333,10.5051418 11.3960489,10.9757241 11.9475734,11.0046923 Z M17.0046669,11.0093338 L19.0046451,10.9999893 C19.5569239,10.997412 20.0025449,10.5476123 19.9999787,9.99533358 C19.9973902,9.44305484 19.5475905,8.9974338 18.9953118,9 L16.9953336,9.00934444 C16.4430548,9.01192177 15.9974338,9.46172148 16,10.0140002 C16.0025884,10.5662789 16.4523882,11.0119 17.0046669,11.0093338 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
<g id="Dark-/-20-/-dotted-straight" stroke="none" stroke-width="1" fill="none"
fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,0 10,0 C9.44771525,0 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M9,11 L9,13 C9,13.5522847 9.44771525,14 10,14 C10.5522847,14 11,13.5522847 11,13 L11,11 C11,10.4477153 10.5522847,10 10,10 C9.44771525,10 9,10.4477153 9,11 Z M9,16 L9,18 C9,18.5522847 9.44771525,19 10,19 C10.5522847,19 11,18.5522847 11,18 L11,16 C11,15.4477153 10.5522847,15 10,15 C9.44771525,15 9,15.4477153 9,16 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
<path fill="#444444" class="st1"
d="M 323.217 324.737 L 323.217 255.824 C 323.217 250.901 329.256 247.209 337.309 247.209 C 345.361 247.209 351.4 250.901 351.4 255.824 L 351.4 324.122 C 351.4 329.044 345.361 332.737 337.309 332.737 C 329.256 333.351 323.217 329.66 323.217 324.737 Z"
style=""></path>
<circle fill="#aaaaaa" class="st0" cx="10" cy="10" r="5" />
<rect x="7" y="9" width="6px" height="2px" fill="#333333"></rect>
<rect x="9" y="7" width="2px" height="6px" fill="#333333"></rect>
</svg>

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / dotted straight@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-dotted-straight" stroke="none" stroke-width="1" fill="none"
fill-rule="evenodd">
<path
d="M9,1 L9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 L11,1 C11,0.44771525 10.5522847,0 10,0 C9.44771525,0 9,0.44771525 9,1 Z M9,6 L9,8 C9,8.55228475 9.44771525,9 10,9 C10.5522847,9 11,8.55228475 11,8 L11,6 C11,5.44771525 10.5522847,5 10,5 C9.44771525,5 9,5.44771525 9,6 Z M9,11 L9,13 C9,13.5522847 9.44771525,14 10,14 C10.5522847,14 11,13.5522847 11,13 L11,11 C11,10.4477153 10.5522847,10 10,10 C9.44771525,10 9,10.4477153 9,11 Z M9,16 L9,18 C9,18.5522847 9.44771525,19 10,19 C10.5522847,19 11,18.5522847 11,18 L11,16 C11,15.4477153 10.5522847,15 10,15 C9.44771525,15 9,15.4477153 9,16 Z"
id="Path-53" fill="#444444" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -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.

View File

@ -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;
}

View File

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

View File

@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.776
%define release 240404
%define release 240405
# User and Group under which Apache is running
%define httpd_name httpd

View File

@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.776
%define release 240404
%define release 240405
# User and Group under which Apache is running
%define httpd_name httpd

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.776
%define release 240404
%define release 240405
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.776-240404
Version: 7.0NG.776-240405
Architecture: all
Priority: optional
Section: admin

View File

@ -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_cpan=0
package_pandora=1

View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.776";
my $pandora_build = "240404";
my $pandora_build = "240405";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.776";
my $pandora_build = "240404";
my $pandora_build = "240405";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

View File

@ -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}

View File

@ -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}

View File

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

View File

@ -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;

View File

@ -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);