Merge branch 'ent-5786-alertas-de-inventario' into 'develop'

inventory alerts

See merge request artica/pandorafms!3498
This commit is contained in:
Daniel Rodriguez 2020-12-04 10:31:22 +01:00
commit 2d83687c2d
4 changed files with 61 additions and 0 deletions

View File

@ -1,5 +1,23 @@
START TRANSACTION;
CREATE TABLE `tinventory_alert`(
`id` int UNSIGNED NOT NULL auto_increment,
`id_module_inventory` int(10) NOT NULL,
`actions` text NOT NULL default '',
`id_group` mediumint(8) unsigned NULL default 0,
`condition` enum('WHITE_LIST', 'BLACK_LIST', 'MATCH') NOT NULL default 'WHITE_LIST',
`value` text NOT NULL default '',
`name` tinytext NOT NULL default '',
`description` text NOT NULL default '',
`time_threshold` int(10) NOT NULL default '0',
`last_fired` text NOT NULL default '',
`disable_event` tinyint(1) UNSIGNED default 0,
`enabled` tinyint(1) UNSIGNED default 1,
PRIMARY KEY (`id`),
FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`)
ON DELETE CASCADE ON UPDATE CASCADE
) engine=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `tagente_modulo` ADD COLUMN `debug_content` varchar(200);
INSERT IGNORE INTO tuser_task VALUES (8, 'cron_task_generate_csv_log', 'a:1:{i:0;a:2:{s:11:"description";s:14:"Send to e-mail";s:4:"type";s:4:"text";}}', 'Send csv log');

View File

@ -347,6 +347,27 @@ CREATE TABLE IF NOT EXISTS `tagente_datos_inventory` (
KEY `idx_utimestamp` USING BTREE (`utimestamp`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tinventory_alert`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tinventory_alert`(
`id` int UNSIGNED NOT NULL auto_increment,
`id_module_inventory` int(10) NOT NULL,
`actions` text NOT NULL default '',
`id_group` mediumint(8) unsigned NULL default 0,
`condition` enum('WHITE_LIST', 'BLACK_LIST', 'MATCH') NOT NULL default 'WHITE_LIST',
`value` text NOT NULL default '',
`name` tinytext NOT NULL default '',
`description` text NOT NULL default '',
`time_threshold` int(10) NOT NULL default '0',
`last_fired` text NOT NULL default '',
`disable_event` tinyint(1) UNSIGNED default 0,
`enabled` tinyint(1) UNSIGNED default 1,
PRIMARY KEY (`id`),
FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`)
ON DELETE CASCADE ON UPDATE CASCADE
) engine=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `ttrap_custom_values`
-- -----------------------------------------------------

View File

@ -240,6 +240,7 @@ if (check_acl($config['id_user'], 0, 'LW')
enterprise_hook('eventalerts_submenu');
$sub['godmode/snmpconsole/snmp_alert']['text'] = __('SNMP alerts');
$sub['godmode/snmpconsole/snmp_alert']['id'] = 'SNMP alerts';
enterprise_hook('alert_inventory_submenu');
}
$menu_godmode['galertas']['sub'] = $sub;

View File

@ -2626,6 +2626,27 @@ CREATE TABLE IF NOT EXISTS `tagent_module_inventory` (
ON UPDATE CASCADE ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ---------------------------------------------------------------------
-- Table `tinventory_alert`
-- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tinventory_alert`(
`id` int UNSIGNED NOT NULL auto_increment,
`id_module_inventory` int(10) NOT NULL,
`actions` text NOT NULL default '',
`id_group` mediumint(8) unsigned NULL default 0,
`condition` enum('WHITE_LIST', 'BLACK_LIST', 'MATCH') NOT NULL default 'WHITE_LIST',
`value` text NOT NULL default '',
`name` tinytext NOT NULL default '',
`description` text NOT NULL default '',
`time_threshold` int(10) NOT NULL default '0',
`last_fired` text NOT NULL default '',
`disable_event` tinyint(1) UNSIGNED default 0,
`enabled` tinyint(1) UNSIGNED default 1,
PRIMARY KEY (`id`),
FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`)
ON DELETE CASCADE ON UPDATE CASCADE
) engine=InnoDB DEFAULT CHARSET=utf8;
-- ---------------------------------------------------------------------
-- Table `tpolicy_modules_inventory`
-- ---------------------------------------------------------------------