Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado

This commit is contained in:
Daniel Barbero Martin 2022-06-23 08:22:31 +02:00
commit b63da2066e
44 changed files with 55341 additions and 54722 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.762-220622 Version: 7.0NG.762-220623
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.762-220622" pandora_version="7.0NG.762-220623"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.762'; use constant AGENT_VERSION => '7.0NG.762';
use constant AGENT_BUILD => '220622'; use constant AGENT_BUILD => '220623';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.762 %define version 7.0NG.762
%define release 220622 %define release 220623
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.762 %define version 7.0NG.762
%define release 220622 %define release 220623
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.762" PI_VERSION="7.0NG.762"
PI_BUILD="220622" PI_BUILD="220623"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{220622} {220623}
ViewReadme ViewReadme
{Yes} {Yes}

View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.762 Build 220622") #define PANDORA_VERSION ("7.0NG.762 Build 220623")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.762(Build 220622))" VALUE "ProductVersion", "(7.0NG.762(Build 220623))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.762-220622 Version: 7.0NG.762-220623
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.762-220622" pandora_version="7.0NG.762-220623"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -1665,4 +1665,4 @@ godmode/um_client/vendor/sebastian/object-enumerator/tests
godmode/um_client/vendor/sebastian/object-enumerator godmode/um_client/vendor/sebastian/object-enumerator
godmode/um_client/vendor/sebastian godmode/um_client/vendor/sebastian
godmode/um_client/vendor godmode/um_client/vendor
/update_manager_client/resources/styles/pandora.css update_manager_client/resources/styles/pandora.css

View File

@ -35,7 +35,10 @@ ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT
ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT ''; ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT '';
ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0; ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` TINYINT NOT NULL DEFAULT 0;
ALTER TABLE `tservice` ADD COLUMN `asynchronous` TINYINT NOT NULL DEFAULT 0;
ALTER TABLE `tservice` ADD COLUMN `rca` TEXT;
ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT ''; ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT '';
ALTER TABLE `tagente` ADD COLUMN `satellite_server` INT NOT NULL default 0; ALTER TABLE `tagente` ADD COLUMN `satellite_server` INT NOT NULL default 0;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC220622'; $build_version = 'PC220623';
$pandora_version = 'v7.0NG.762'; $pandora_version = 'v7.0NG.762';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

View File

@ -2598,10 +2598,9 @@ function agents_delete_agent($id_agents, $disableACL=false)
'tagente_modulo', 'tagente_modulo',
$filter $filter
); );
if (is_array($rows) === true) { if (is_array($rows) === true) {
foreach ($rows as $row) { foreach ($rows as $row) {
$modules[] = PandoraFMS\Module::build($row); $modules[] = PandoraFMS\Module::build($row, '\PandoraFMS\Module', true);
} }
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -145,14 +145,15 @@ class Module extends Entity
/** /**
* Creates a module object from given data. Avoid query duplication. * Creates a module object from given data. Avoid query duplication.
* *
* @param array $data Module information. * @param array $data Module information.
* @param string $class_str Class type. * @param string $class_str Class type.
* * @param boolean $return_deleted_modules Check.
* @return PandoraFMS\Module Object. * @return PandoraFMS\Module Object.
*/ */
public static function build( public static function build(
array $data=[], array $data=[],
string $class_str='\PandoraFMS\Module' string $class_str='\PandoraFMS\Module',
bool $return_deleted_modules=false
) { ) {
$obj = new $class_str(); $obj = new $class_str();
@ -161,8 +162,9 @@ class Module extends Entity
$obj->{$k}($v); $obj->{$k}($v);
} }
if ($obj->nombre() === 'delete_pending' if (($obj->nombre() === 'delete_pending'
|| $obj->nombre() === 'pendingdelete' || $obj->nombre() === 'pendingdelete')
&& $return_deleted_modules === false
) { ) {
return null; return null;
} }

View File

@ -1187,14 +1187,7 @@ a.pandora_pagination,
padding-right: 35px; padding-right: 35px;
background-color: #222; background-color: #222;
} }
#box_online {
background-image: url("../../images/update_pandora_black.jpg") !important;
background-color: #000 !important;
padding: 40px 50px;
border: 1px solid #111 !important;
background-size: contain;
box-shadow: 1px 1px 4px rgba(160, 160, 160, 0.514);
}
.legend_background { .legend_background {
background-color: #222; background-color: #222;
color: #fff !important; color: #fff !important;

View File

@ -129,7 +129,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.762'; $version = '7.0NG.762';
$build = '220622'; $build = '220623';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.762 %define version 7.0NG.762
%define release 220622 %define release 220623
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.762 %define version 7.0NG.762
%define release 220622 %define release 220623
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

View File

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

View File

@ -2819,6 +2819,8 @@ CREATE TABLE IF NOT EXISTS `tservice` (
`evaluate_sla` INT NOT NULL DEFAULT 0, `evaluate_sla` INT NOT NULL DEFAULT 0,
`is_favourite` TINYINT NOT NULL DEFAULT 0, `is_favourite` TINYINT NOT NULL DEFAULT 0,
`enable_sunburst` TINYINT NOT NULL DEFAULT 0, `enable_sunburst` TINYINT NOT NULL DEFAULT 0,
`asynchronous` TINYINT NOT NULL DEFAULT 0,
`rca` TEXT,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB ) ENGINE=InnoDB
COMMENT = 'Table to define services to monitor' COMMENT = 'Table to define services to monitor'

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

View File

@ -40,15 +40,68 @@ a.update_manager_button:after {
} }
#box_online { #box_online {
background-image: url("../images/update_manager_background.jpg");
background-position: top right;
background-repeat: no-repeat;
background-color: #fff;
padding: 40px 50px; padding: 40px 50px;
border: 1px solid #f3f3f3; border: 1px solid #f3f3f3;
border-radius: 5px; border-radius: 5px;
min-height: 400px; min-height: 400px;
background-size: contain; display: flex;
flex-direction: row;
/*flex-wrap: wrap;*/
justify-content: space-around;
align-items: center;
}
#box_online .wu-bg {
position: relative;
width: 500px;
height: 450px;
background-image: url("../images/Warp-Update-bg.png");
background-position: center center;
background-size: auto;
background-repeat: no-repeat;
margin: 0px !important;
display: flex;
align-items: center;
}
#box_online .wu-gear {
animation-timing-function: linear;
animation-duration: 5s;
animation-iteration-count: infinite;
width: 202px;
margin: auto;
animation-name: ani;
}
@keyframes ani {
to {
transform: rotateZ(360deg);
}
}
#box_online .wu-box {
animation-timing-function: linear;
animation-duration: 1s;
animation-iteration-count: infinite;
width: 69px;
left: 215px;
z-index: 2;
position: absolute;
animation-name: ani2;
}
@keyframes ani2 {
0% {
opacity: 0;
transform: translateY(-250px) translateX(0px);
}
60% {
opacity: 1;
transform: translateY(0px) translateX(0px);
}
90% {
opacity: 1;
}
100% {
opacity: 0;
}
} }
#box_online #pkg_version { #box_online #pkg_version {

View File

@ -36,171 +36,178 @@
<div id="box_online"> <div id="box_online">
<span class="loading" style="font-size: 18pt; display: none;"> <div>
<img src="images/wait.gif"> <span class="loading" style="font-size: 18pt; display: none;">
</span> <img src="images/wait.gif">
</span>
<p style="font-weight: 600;"><?php echo __('The latest version of package installed is').':'; ?></p> <p style="font-weight: 600;"><?php echo __('The latest version of package installed is').':'; ?></p>
<div id="pkg_version"><?php echo $version; ?></div> <div id="pkg_version"><?php echo $version; ?></div>
<div class="content"> <div class="content">
<?php
if (empty($error) !== true) {
?>
<h2>
<?php echo $error; ?>
</h2>
<?php <?php
} else { if (empty($error) !== true) {
// Updates. ?>
?> <h2>
<div id="um-loading"> <?php echo $error; ?>
<p id="loading-msg"></p> </h2>
</div> <?php
<div id="um-updates"> } else {
</div> // Updates.
<div id="um-buttons" style="display:none;"> ?>
<button id="um-next"><?php echo __('Update to next version'); ?></button> <div id="um-loading">
<button id="um-last"><?php echo __('Update to latest version'); ?></button> <p id="loading-msg"></p>
</div> </div>
<div id="um-updates">
<div id="um-result"></div> </div>
<div id="um-progress"> <div id="um-buttons" style="display:none;">
<h3 id="um-progress-version"></h3> <button id="um-next"><?php echo __('Update to next version'); ?></button>
<div class="um-progress-bar-container general"> <button id="um-last"><?php echo __('Update to latest version'); ?></button>
<span id="um-progress-general-label">0 %</span>
<div id="um-progress-general" class="um-progress-bar general"></div>
</div> </div>
<h5 id="um-progress-description"></h5> <div id="um-result"></div>
<div class="um-progress-bar-container task"> <div id="um-progress">
<span id="um-progress-task-label">0 %</span> <h3 id="um-progress-version"></h3>
<div id="um-progress-task" class="um-progress-bar task"></div> <div class="um-progress-bar-container general">
<span id="um-progress-general-label">0 %</span>
<div id="um-progress-general" class="um-progress-bar general"></div>
</div>
<h5 id="um-progress-description"></h5>
<div class="um-progress-bar-container task">
<span id="um-progress-task-label">0 %</span>
<div id="um-progress-task" class="um-progress-bar task"></div>
</div>
</div>
<div id="um-update-details">
<div id="um-update-details-header"></div>
<div id="um-update-details-content"></div>
</div> </div>
</div>
<div id="um-update-details">
<div id="um-update-details-header"></div>
<div id="um-update-details-content"></div>
</div>
<script type="text/javascript"> <script type="text/javascript">
var texts = { var texts = {
'updatingTo': "<?php echo __('Updating to'); ?> ", 'updatingTo': "<?php echo __('Updating to'); ?> ",
'preventExitMsg': "<?php echo __('Do you really want to leave our brilliant application?'); ?>", 'preventExitMsg': "<?php echo __('Do you really want to leave our brilliant application?'); ?>",
'alreadyUpdated': "<?php echo __('There are no updates available'); ?>", 'alreadyUpdated': "<?php echo __('There are no updates available'); ?>",
'searchingUpdates': "<?php echo __('Searching for updates...'); ?>", 'searchingUpdates': "<?php echo __('Searching for updates...'); ?>",
'updateText': "<?php echo __('Package'); ?>", 'updateText': "<?php echo __('Package'); ?>",
'updated': "<?php echo __('Successfully updated.'); ?>", 'updated': "<?php echo __('Successfully updated.'); ?>",
}
var clientMode = '<?php echo $mode; ?>';
var ajaxPage = '<?php echo $ajaxPage; ?>';
window.onload = function() {
var bsearch = document.getElementById('um-search');
var bnext = document.getElementById('um-next');
var blast = document.getElementById('um-last');
var result = document.getElementById('um-result');
<?php
if (isset($running) === true && $running === true) {
?>
showProgress('<?php echo $ajax; ?>', '<?php echo $authCode; ?>');
<?php
} else {
?>
// Search.
searchUpdates('<?php echo $ajax; ?>', '<?php echo $authCode; ?>');
<?php
} }
?>
bnext.addEventListener('click', function() { var clientMode = '<?php echo $mode; ?>';
blast.setAttribute('disable', true); var ajaxPage = '<?php echo $ajaxPage; ?>';
result.innerHTML = '';
umConfirm({
message: "<?php echo __('This action will upgrade this console to version '); ?> "+nextUpdateVersion+". <?php echo __('Are you sure?'); ?>",
title: "<?php echo __('Update to'); ?> "+nextUpdateVersion,
onAccept: function() {
updateNext({
url: '<?php echo $ajax; ?>',
auth: '<?php echo $authCode; ?>',
success: function(d) {
umUINextUpdate(d.version);
if (d.messages == null) { window.onload = function() {
result.innerHTML = umSuccessMsg( var bsearch = document.getElementById('um-search');
texts.updated var bnext = document.getElementById('um-next');
); var blast = document.getElementById('um-last');
} else { var result = document.getElementById('um-result');
result.innerHTML = umErrorMsg(
d.messages <?php
); if (isset($running) === true && $running === true) {
} ?>
}, showProgress('<?php echo $ajax; ?>', '<?php echo $authCode; ?>');
error: function(e, r) { <?php
if (typeof r != "undefined" ) { } else {
result.innerHTML = umErrorMsg( ?>
'<?php echo __('Failed to update to '); ?>' + nextUpdateVersion+' '+r // Search.
); searchUpdates('<?php echo $ajax; ?>', '<?php echo $authCode; ?>');
} else { <?php
result.innerHTML = umErrorMsg( }
'<?php echo __('Failed to update to '); ?>' + nextUpdateVersion+' RC'+e ?>
);
} bnext.addEventListener('click', function() {
}, blast.setAttribute('disable', true);
}); result.innerHTML = '';
} umConfirm({
message: "<?php echo __('This action will upgrade this console to version '); ?> "+nextUpdateVersion+". <?php echo __('Are you sure?'); ?>",
title: "<?php echo __('Update to'); ?> "+nextUpdateVersion,
onAccept: function() {
updateNext({
url: '<?php echo $ajax; ?>',
auth: '<?php echo $authCode; ?>',
success: function(d) {
umUINextUpdate(d.version);
if (d.messages == null) {
result.innerHTML = umSuccessMsg(
texts.updated
);
} else {
result.innerHTML = umErrorMsg(
d.messages
);
}
},
error: function(e, r) {
if (typeof r != "undefined" ) {
result.innerHTML = umErrorMsg(
'<?php echo __('Failed to update to '); ?>' + nextUpdateVersion+' '+r
);
} else {
result.innerHTML = umErrorMsg(
'<?php echo __('Failed to update to '); ?>' + nextUpdateVersion+' RC'+e
);
}
},
});
}
});
blast.setAttribute('disable', false);
}); });
blast.setAttribute('disable', false); blast.addEventListener('click', function() {
}); blast.setAttribute('disable', true);
result.innerHTML = '';
umConfirm({
message: "<?php echo __('This action will upgrade this console to version '); ?> "+lastUpdateVersion+". <?php echo __('Are you sure?'); ?>",
title: "<?php echo __('Update to'); ?> "+lastUpdateVersion,
onAccept: function() {
updateLatest({
url: '<?php echo $ajax; ?>',
auth: '<?php echo $authCode; ?>',
success: function(d) {
umUINextUpdate(d.version);
blast.addEventListener('click', function() { if (d.messages == null) {
blast.setAttribute('disable', true); result.innerHTML = umSuccessMsg(
result.innerHTML = ''; texts.updated
umConfirm({ );
message: "<?php echo __('This action will upgrade this console to version '); ?> "+lastUpdateVersion+". <?php echo __('Are you sure?'); ?>", } else {
title: "<?php echo __('Update to'); ?> "+lastUpdateVersion, result.innerHTML = umErrorMsg(
onAccept: function() { d.messages
updateLatest({ );
url: '<?php echo $ajax; ?>', }
auth: '<?php echo $authCode; ?>', },
success: function(d) { error: function(e, r) {
umUINextUpdate(d.version); if (typeof r != "undefined" ) {
result.innerHTML = umErrorMsg(r);
} else {
result.innerHTML = umErrorMsg(
'<?php echo __('Failed to update:'); ?> RC'+e
);
}
},
});
}
});
if (d.messages == null) { blast.setAttribute('disable', false);
result.innerHTML = umSuccessMsg(
texts.updated
);
} else {
result.innerHTML = umErrorMsg(
d.messages
);
}
},
error: function(e, r) {
if (typeof r != "undefined" ) {
result.innerHTML = umErrorMsg(r);
} else {
result.innerHTML = umErrorMsg(
'<?php echo __('Failed to update:'); ?> RC'+e
);
}
},
});
}
}); });
blast.setAttribute('disable', false); }
}); </script>
<?php
} }
</script> ?>
<?php
}
?>
</div>
</div> </div>
<div class="wu-bg">
<img class="wu-box" src="images/Cube.png">
<img class="wu-gear" src="images/Engranaje.png">
</div>
</div> </div>

View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.762-220622 Version: 7.0NG.762-220623
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.762-220622" pandora_version="7.0NG.762-220623"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

View File

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

View File

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

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.762 %define version 7.0NG.762
%define release 220622 %define release 220623
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.762 %define version 7.0NG.762
%define release 220622 %define release 220623
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

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

View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.762 Build 220622"; my $version = "7.0NG.762 Build 220623";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.762 Build 220622"; my $version = "7.0NG.762 Build 220623";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);