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-15 08:50:00 +02:00
commit 080c10aad7
28 changed files with 101 additions and 57 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.762-220614 Version: 7.0NG.762-220615
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-220614" pandora_version="7.0NG.762-220615"
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 => '220614'; use constant AGENT_BUILD => '220615';
# 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 220614 %define release 220615
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 220614 %define release 220615
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="220614" PI_BUILD="220615"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{220614} {220615}
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 220614") #define PANDORA_VERSION ("7.0NG.762 Build 220615")
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 220614))" VALUE "ProductVersion", "(7.0NG.762(Build 220615))"
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-220614 Version: 7.0NG.762-220615
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-220614" pandora_version="7.0NG.762-220615"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -1,7 +1,51 @@
START TRANSACTION; START TRANSACTION;
ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0; ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY COLUMN `user_id` VARCHAR(255) DEFAULT NULL;
ALTER TABLE `tusuario` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `tuser_double_auth` ADD CONSTRAINT `tuser_double_auth_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE;
ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT '';
ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
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 `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT '';
ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0;
ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT ''; ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT '';
SET @st_oum763 = (SELECT IF(
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tautoconfig' AND table_schema = DATABASE() AND column_name = 'disabled') > 0,
"SELECT 1",
"ALTER TABLE `tautoconfig` ADD COLUMN `disabled` TINYINT DEFAULT 0"
));
PREPARE pr_oum763 FROM @st_oum763;
EXECUTE pr_oum763;
DEALLOCATE PREPARE pr_oum763;
COMMIT; COMMIT;

View File

@ -860,7 +860,7 @@ if (!$new_user) {
'', '',
'', '',
20, 20,
100, 255,
!$new_user || $view_mode, !$new_user || $view_mode,
'', '',
[ [

View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC220614'; $build_version = 'PC220615';
$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

@ -129,7 +129,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.762'; $version = '7.0NG.762';
$build = '220614'; $build = '220615';
$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 220614 %define release 220615
# 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 220614 %define release 220615
# 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 220614 %define release 220615
%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

@ -616,7 +616,7 @@ CREATE TABLE IF NOT EXISTS `talert_execution_queue` (
CREATE TABLE IF NOT EXISTS `tattachment` ( CREATE TABLE IF NOT EXISTS `tattachment` (
`id_attachment` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_attachment` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_incidencia` INT UNSIGNED NOT NULL DEFAULT 0, `id_incidencia` INT UNSIGNED NOT NULL DEFAULT 0,
`id_usuario` VARCHAR(60) NOT NULL DEFAULT '', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '',
`filename` VARCHAR(255) NOT NULL DEFAULT '', `filename` VARCHAR(255) NOT NULL DEFAULT '',
`description` VARCHAR(150) DEFAULT '', `description` VARCHAR(150) DEFAULT '',
`size` BIGINT UNSIGNED NOT NULL DEFAULT 0, `size` BIGINT UNSIGNED NOT NULL DEFAULT 0,
@ -689,7 +689,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` (
CREATE TABLE IF NOT EXISTS `tevento` ( CREATE TABLE IF NOT EXISTS `tevento` (
`id_evento` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_evento` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_agente` INT NOT NULL DEFAULT 0, `id_agente` INT NOT NULL DEFAULT 0,
`id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
`id_grupo` MEDIUMINT NOT NULL DEFAULT 0, `id_grupo` MEDIUMINT NOT NULL DEFAULT 0,
`estado` TINYINT UNSIGNED NOT NULL DEFAULT 0, `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0,
`timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', `timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
@ -779,7 +779,7 @@ CREATE TABLE IF NOT EXISTS `tincidencia` (
`cierre` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', `cierre` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
`titulo` TEXT, `titulo` TEXT,
`descripcion` TEXT, `descripcion` TEXT,
`id_usuario` VARCHAR(60) NOT NULL DEFAULT '', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '',
`origen` VARCHAR(100) NOT NULL DEFAULT '', `origen` VARCHAR(100) NOT NULL DEFAULT '',
`estado` INT NOT NULL DEFAULT 0, `estado` INT NOT NULL DEFAULT 0,
`prioridad` INT NOT NULL DEFAULT 0, `prioridad` INT NOT NULL DEFAULT 0,
@ -1059,7 +1059,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` (
CREATE TABLE IF NOT EXISTS `tnota` ( CREATE TABLE IF NOT EXISTS `tnota` (
`id_nota` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_nota` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_incident` BIGINT UNSIGNED NOT NULL, `id_incident` BIGINT UNSIGNED NOT NULL,
`id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`nota` MEDIUMTEXT, `nota` MEDIUMTEXT,
PRIMARY KEY (`id_nota`), PRIMARY KEY (`id_nota`),
@ -1172,7 +1172,7 @@ CREATE TABLE IF NOT EXISTS `tserver` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tsesion` ( CREATE TABLE IF NOT EXISTS `tsesion` (
`id_sesion` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_sesion` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_usuario` VARCHAR(60) NOT NULL DEFAULT '0', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
`ip_origen` VARCHAR(100) NOT NULL DEFAULT '', `ip_origen` VARCHAR(100) NOT NULL DEFAULT '',
`accion` VARCHAR(100) NOT NULL DEFAULT '', `accion` VARCHAR(100) NOT NULL DEFAULT '',
`descripcion` TEXT, `descripcion` TEXT,
@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `ttrap` (
`value_custom` TEXT, `value_custom` TEXT,
`alerted` SMALLINT NOT NULL DEFAULT 0, `alerted` SMALLINT NOT NULL DEFAULT 0,
`status` SMALLINT NOT NULL DEFAULT 0, `status` SMALLINT NOT NULL DEFAULT 0,
`id_usuario` VARCHAR(150) DEFAULT '', `id_usuario` VARCHAR(255) DEFAULT '',
`timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', `timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
`priority` TINYINT UNSIGNED NOT NULL DEFAULT 2, `priority` TINYINT UNSIGNED NOT NULL DEFAULT 2,
`text` VARCHAR(255) DEFAULT '', `text` VARCHAR(255) DEFAULT '',
@ -1260,7 +1260,7 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` (
-- Table `tusuario` -- Table `tusuario`
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tusuario` ( CREATE TABLE IF NOT EXISTS `tusuario` (
`id_user` VARCHAR(60) NOT NULL DEFAULT '0', `id_user` VARCHAR(255) NOT NULL DEFAULT '0',
`fullname` VARCHAR(255) NOT NULL, `fullname` VARCHAR(255) NOT NULL,
`firstname` VARCHAR(255) NOT NULL, `firstname` VARCHAR(255) NOT NULL,
`lastname` VARCHAR(255) NOT NULL, `lastname` VARCHAR(255) NOT NULL,
@ -1313,7 +1313,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tusuario_perfil` ( CREATE TABLE IF NOT EXISTS `tusuario_perfil` (
`id_up` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_up` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_usuario` VARCHAR(100) NOT NULL DEFAULT '', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '',
`id_perfil` INT UNSIGNED NOT NULL DEFAULT 0, `id_perfil` INT UNSIGNED NOT NULL DEFAULT 0,
`id_grupo` INT NOT NULL DEFAULT 0, `id_grupo` INT NOT NULL DEFAULT 0,
`no_hierarchy` TINYINT NOT NULL DEFAULT 0, `no_hierarchy` TINYINT NOT NULL DEFAULT 0,
@ -1328,7 +1328,7 @@ CREATE TABLE IF NOT EXISTS `tusuario_perfil` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tuser_double_auth` ( CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(60) NOT NULL, `id_user` VARCHAR(255) NOT NULL,
`secret` VARCHAR(20) NOT NULL, `secret` VARCHAR(20) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE (`id_user`), UNIQUE (`id_user`),
@ -1340,7 +1340,7 @@ CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `treset_pass_history` ( CREATE TABLE IF NOT EXISTS `treset_pass_history` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(60) NOT NULL, `id_user` VARCHAR(255) NOT NULL,
`reset_moment` DATETIME NOT NULL, `reset_moment` DATETIME NOT NULL,
`success` TINYINT NOT NULL, `success` TINYINT NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@ -1366,7 +1366,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_source` (
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tmensajes` ( CREATE TABLE IF NOT EXISTS `tmensajes` (
`id_mensaje` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_mensaje` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_usuario_origen` VARCHAR(60) NOT NULL DEFAULT '', `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT '',
`mensaje` TEXT, `mensaje` TEXT,
`timestamp` BIGINT UNSIGNED NOT NULL DEFAULT 0, `timestamp` BIGINT UNSIGNED NOT NULL DEFAULT 0,
`subject` VARCHAR(255) NOT NULL DEFAULT '', `subject` VARCHAR(255) NOT NULL DEFAULT '',
@ -1388,7 +1388,7 @@ CREATE TABLE IF NOT EXISTS `tmensajes` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tnotification_user` ( CREATE TABLE IF NOT EXISTS `tnotification_user` (
`id_mensaje` INT UNSIGNED NOT NULL, `id_mensaje` INT UNSIGNED NOT NULL,
`id_user` VARCHAR(60) NOT NULL, `id_user` VARCHAR(255) NOT NULL,
`utimestamp_read` BIGINT, `utimestamp_read` BIGINT,
`utimestamp_erased` BIGINT, `utimestamp_erased` BIGINT,
`postpone` INT, `postpone` INT,
@ -1415,7 +1415,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_group` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tnotification_source_user` ( CREATE TABLE IF NOT EXISTS `tnotification_source_user` (
`id_source` BIGINT UNSIGNED NOT NULL, `id_source` BIGINT UNSIGNED NOT NULL,
`id_user` VARCHAR(60), `id_user` VARCHAR(255),
`enabled` INT DEFAULT NULL, `enabled` INT DEFAULT NULL,
`also_mail` INT DEFAULT NULL, `also_mail` INT DEFAULT NULL,
PRIMARY KEY (`id_source`,`id_user`), PRIMARY KEY (`id_source`,`id_user`),
@ -1443,7 +1443,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_source_group` (
CREATE TABLE IF NOT EXISTS `tnotification_source_group_user` ( CREATE TABLE IF NOT EXISTS `tnotification_source_group_user` (
`id_source` BIGINT UNSIGNED NOT NULL, `id_source` BIGINT UNSIGNED NOT NULL,
`id_group` MEDIUMINT UNSIGNED NOT NULL, `id_group` MEDIUMINT UNSIGNED NOT NULL,
`id_user` VARCHAR(60), `id_user` VARCHAR(255),
`enabled` INT DEFAULT NULL, `enabled` INT DEFAULT NULL,
`also_mail` INT DEFAULT NULL, `also_mail` INT DEFAULT NULL,
PRIMARY KEY (`id_source`,`id_user`), PRIMARY KEY (`id_source`,`id_user`),
@ -1476,7 +1476,7 @@ CREATE TABLE IF NOT EXISTS `tnews` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgraph` ( CREATE TABLE IF NOT EXISTS `tgraph` (
`id_graph` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_graph` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(100) NOT NULL DEFAULT '', `id_user` VARCHAR(255) NOT NULL DEFAULT '',
`name` VARCHAR(150) NOT NULL DEFAULT '', `name` VARCHAR(150) NOT NULL DEFAULT '',
`description` TEXT, `description` TEXT,
`period` INT NOT NULL DEFAULT 0, `period` INT NOT NULL DEFAULT 0,
@ -1514,7 +1514,7 @@ CREATE TABLE IF NOT EXISTS `tgraph_source` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `treport` ( CREATE TABLE IF NOT EXISTS `treport` (
`id_report` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_report` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(100) NOT NULL DEFAULT '', `id_user` VARCHAR(255) NOT NULL DEFAULT '',
`name` VARCHAR(150) NOT NULL DEFAULT '', `name` VARCHAR(150) NOT NULL DEFAULT '',
`description` TEXT, `description` TEXT,
`private` TINYINT UNSIGNED NOT NULL DEFAULT 0, `private` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@ -1813,7 +1813,7 @@ CREATE TABLE IF NOT EXISTS `tplanned_downtime` (
`type_downtime` VARCHAR(100) NOT NULL DEFAULT 'disabled_agents_alerts', `type_downtime` VARCHAR(100) NOT NULL DEFAULT 'disabled_agents_alerts',
`type_execution` VARCHAR(100) NOT NULL DEFAULT 'once', `type_execution` VARCHAR(100) NOT NULL DEFAULT 'once',
`type_periodicity` VARCHAR(100) NOT NULL DEFAULT 'weekly', `type_periodicity` VARCHAR(100) NOT NULL DEFAULT 'weekly',
`id_user` VARCHAR(100) NOT NULL DEFAULT '0', `id_user` VARCHAR(255) NOT NULL DEFAULT '0',
PRIMARY KEY ( `id` ) PRIMARY KEY ( `id` )
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
@ -2036,7 +2036,7 @@ CREATE TABLE IF NOT EXISTS `tgroup_stat` (
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tnetwork_map` ( CREATE TABLE IF NOT EXISTS `tnetwork_map` (
`id_networkmap` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_networkmap` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(60) NOT NULL, `id_user` VARCHAR(255) NOT NULL,
`name` VARCHAR(100) NOT NULL, `name` VARCHAR(100) NOT NULL,
`type` VARCHAR(20) NOT NULL, `type` VARCHAR(20) NOT NULL,
`layout` VARCHAR(20) NOT NULL, `layout` VARCHAR(20) NOT NULL,
@ -2196,7 +2196,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` (
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tpassword_history` ( CREATE TABLE IF NOT EXISTS `tpassword_history` (
`id_pass` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_pass` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(60) NOT NULL, `id_user` VARCHAR(255) NOT NULL,
`password` VARCHAR(45) DEFAULT NULL, `password` VARCHAR(45) DEFAULT NULL,
`date_begin` DATETIME, `date_begin` DATETIME,
`date_end` DATETIME, `date_end` DATETIME,
@ -2249,7 +2249,7 @@ CREATE TABLE `tupdate_journal` (
`version` VARCHAR(25) DEFAULT '', `version` VARCHAR(25) DEFAULT '',
`type` VARCHAR(25) DEFAULT '', `type` VARCHAR(25) DEFAULT '',
`origin` VARCHAR(25) DEFAULT '', `origin` VARCHAR(25) DEFAULT '',
`id_user` VARCHAR(250) NOT NULL DEFAULT '' `id_user` VARCHAR(255) NOT NULL DEFAULT ''
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
@ -2298,7 +2298,7 @@ CREATE TABLE IF NOT EXISTS `tsessions_php` (
CREATE TABLE IF NOT EXISTS `tmap` ( CREATE TABLE IF NOT EXISTS `tmap` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_group` INT UNSIGNED NOT NULL DEFAULT 0, `id_group` INT UNSIGNED NOT NULL DEFAULT 0,
`id_user` VARCHAR(250) NOT NULL DEFAULT '', `id_user` VARCHAR(255) NOT NULL DEFAULT '',
`type` INT UNSIGNED NOT NULL DEFAULT 0, `type` INT UNSIGNED NOT NULL DEFAULT 0,
`subtype` INT UNSIGNED NOT NULL DEFAULT 0, `subtype` INT UNSIGNED NOT NULL DEFAULT 0,
`name` VARCHAR(250) DEFAULT '', `name` VARCHAR(250) DEFAULT '',
@ -2579,7 +2579,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_group_agents` (
CREATE TABLE IF NOT EXISTS `tdashboard` ( CREATE TABLE IF NOT EXISTS `tdashboard` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`name` TEXT NOT NULL DEFAULT '', `name` TEXT NOT NULL DEFAULT '',
`id_user` VARCHAR(60) NOT NULL DEFAULT '', `id_user` VARCHAR(255) NOT NULL DEFAULT '',
`id_group` INT NOT NULL DEFAULT 0, `id_group` INT NOT NULL DEFAULT 0,
`active` TINYINT NOT NULL DEFAULT 0, `active` TINYINT NOT NULL DEFAULT 0,
`cells` INT UNSIGNED DEFAULT 0, `cells` INT UNSIGNED DEFAULT 0,
@ -3128,7 +3128,7 @@ CREATE TABLE IF NOT EXISTS `tnetworkmap_ent_rel_nodes` (
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `treport_template` ( CREATE TABLE IF NOT EXISTS `treport_template` (
`id_report` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_report` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(100) NOT NULL DEFAULT '', `id_user` VARCHAR(255) NOT NULL DEFAULT '',
`name` VARCHAR(150) NOT NULL DEFAULT '', `name` VARCHAR(150) NOT NULL DEFAULT '',
`description` TEXT, `description` TEXT,
`private` TINYINT UNSIGNED NOT NULL DEFAULT 0, `private` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@ -3297,7 +3297,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
`id_source_event` BIGINT UNSIGNED NOT NULL, `id_source_event` BIGINT UNSIGNED NOT NULL,
`id_agente` INT NOT NULL DEFAULT 0, `id_agente` INT NOT NULL DEFAULT 0,
`agent_name` VARCHAR(600) NOT NULL DEFAULT '', `agent_name` VARCHAR(600) NOT NULL DEFAULT '',
`id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
`id_grupo` MEDIUMINT NOT NULL DEFAULT 0, `id_grupo` MEDIUMINT NOT NULL DEFAULT 0,
`group_name` VARCHAR(100) NOT NULL DEFAULT '', `group_name` VARCHAR(100) NOT NULL DEFAULT '',
`estado` TINYINT UNSIGNED NOT NULL DEFAULT 0, `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@ -3349,7 +3349,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` (
`id_source_event` BIGINT UNSIGNED NOT NULL, `id_source_event` BIGINT UNSIGNED NOT NULL,
`id_agente` INT NOT NULL DEFAULT 0, `id_agente` INT NOT NULL DEFAULT 0,
`agent_name` VARCHAR(600) NOT NULL DEFAULT '', `agent_name` VARCHAR(600) NOT NULL DEFAULT '',
`id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
`id_grupo` MEDIUMINT NOT NULL DEFAULT 0, `id_grupo` MEDIUMINT NOT NULL DEFAULT 0,
`group_name` VARCHAR(100) NOT NULL DEFAULT '', `group_name` VARCHAR(100) NOT NULL DEFAULT '',
`estado` TINYINT UNSIGNED NOT NULL DEFAULT 0, `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@ -3513,7 +3513,7 @@ CREATE TABLE IF NOT EXISTS `tphase`(
CREATE TABLE IF NOT EXISTS `treset_pass` ( CREATE TABLE IF NOT EXISTS `treset_pass` (
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_user` VARCHAR(100) NOT NULL DEFAULT '', `id_user` VARCHAR(255) NOT NULL DEFAULT '',
`cod_hash` VARCHAR(100) NOT NULL DEFAULT '', `cod_hash` VARCHAR(100) NOT NULL DEFAULT '',
`reset_time` INT UNSIGNED NOT NULL DEFAULT 0, `reset_time` INT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@ -3664,7 +3664,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` (
`name` VARCHAR(100) NOT NULL, `name` VARCHAR(100) NOT NULL,
`order` INT NOT NULL DEFAULT 0, `order` INT NOT NULL DEFAULT 0,
`description` TEXT, `description` TEXT,
`disabled` TINYINT DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
@ -3818,7 +3818,7 @@ CREATE TABLE IF NOT EXISTS `tuser_task` (
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_usuario` VARCHAR(60) NOT NULL DEFAULT '0', `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
`id_user_task` INT UNSIGNED NOT NULL DEFAULT 0, `id_user_task` INT UNSIGNED NOT NULL DEFAULT 0,
`args` TEXT, `args` TEXT,
`scheduled` ENUM('no','hourly','daily','weekly','monthly','yearly','custom') DEFAULT 'no', `scheduled` ENUM('no','hourly','daily','weekly','monthly','yearly','custom') DEFAULT 'no',
@ -3837,7 +3837,7 @@ CREATE TABLE IF NOT EXISTS `tvisual_console_elements_cache` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`vc_id` INT UNSIGNED NOT NULL, `vc_id` INT UNSIGNED NOT NULL,
`vc_item_id` INT UNSIGNED NOT NULL, `vc_item_id` INT UNSIGNED NOT NULL,
`user_id` VARCHAR(60) DEFAULT NULL, `user_id` VARCHAR(255) DEFAULT NULL,
`data` TEXT, `data` TEXT,
`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
`expiration` INT UNSIGNED NOT NULL COMMENT 'Seconds to expire', `expiration` INT UNSIGNED NOT NULL COMMENT 'Seconds to expire',
@ -4217,7 +4217,7 @@ CREATE TABLE IF NOT EXISTS `tbackup` (
`id` SERIAL, `id` SERIAL,
`utimestamp` BIGINT DEFAULT 0, `utimestamp` BIGINT DEFAULT 0,
`filename` VARCHAR(512) DEFAULT '', `filename` VARCHAR(512) DEFAULT '',
`id_user` VARCHAR(60) DEFAULT '', `id_user` VARCHAR(255) DEFAULT '',
`description` MEDIUMTEXT, `description` MEDIUMTEXT,
`pid` INT UNSIGNED DEFAULT 0, `pid` INT UNSIGNED DEFAULT 0,
`filepath` VARCHAR(512) DEFAULT '', `filepath` VARCHAR(512) DEFAULT '',

View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.762-220614 Version: 7.0NG.762-220615
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-220614" pandora_version="7.0NG.762-220615"
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 = "220614"; my $pandora_build = "220615";
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 = "220614"; my $pandora_build = "220615";
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 220614 %define release 220615
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 220614 %define release 220615
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="220614" PI_BUILD="220615"
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 220614"; my $version = "7.0NG.762 Build 220615";
# 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 220614"; my $version = "7.0NG.762 Build 220615";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);