Merge branch 'ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs' into 'develop'

Ent 10185 filtros personalizados para el visor de datos de logs

See merge request artica/pandorafms!5754
This commit is contained in:
Daniel Rodriguez 2023-05-08 08:48:56 +00:00
commit 2c4e1c0261
4 changed files with 58 additions and 6 deletions

View File

@ -14,6 +14,30 @@ CREATE TABLE IF NOT EXISTS `tsesion_filter` (
PRIMARY KEY (`id_filter`) PRIMARY KEY (`id_filter`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
CREATE TABLE IF NOT EXISTS `tsesion_filter_log_viewer` (
`id_filter` INT NOT NULL AUTO_INCREMENT,
`id_name` TEXT NULL,
`id_group_filter` TEXT NULL,
`id_search_mode` INT NULL,
`order` VARCHAR(45) NULL,
`search` VARCHAR(255) NULL,
`group_id` INT NULL,
`date_range` TINYINT NULL,
`start_date_defined` VARCHAR(45) NULL,
`start_date_time` VARCHAR(45) NULL,
`start_date_date` VARCHAR(45) NULL,
`start_date_date_range` VARCHAR(45) NULL,
`start_date_time_range` VARCHAR(45) NULL,
`end_date_date_range` VARCHAR(45) NULL,
`end_date_time_range` VARCHAR(45) NULL,
`agent` VARCHAR(255) NULL,
`source` VARCHAR(255) NULL,
`display_mode` INT NULL,
`capture_model` INT NULL,
`graph_type` INT NULL,
PRIMARY KEY (`id_filter`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
ALTER TABLE `talert_template_module_actions` ADD COLUMN `recovered` TINYINT NOT NULL DEFAULT 0; ALTER TABLE `talert_template_module_actions` ADD COLUMN `recovered` TINYINT NOT NULL DEFAULT 0;
COMMIT; COMMIT;

View File

@ -13101,7 +13101,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
) { ) {
$values['status'] = 2; $values['status'] = 2;
} }
api_set_validate_event_by_id($val['id_evento']); api_set_validate_event_by_id($val['id_evento']);
} }
} }

View File

@ -6934,14 +6934,15 @@ function html_print_go_top()
return $output; return $output;
} }
/** /**
* Render a code picker fragment with default Pandora styles. * Render a code picker fragment with default Pandora styles.
* *
* @param string $id, * @param string $id,
* @param string $content Content. * @param string $content Content.
* @param string $classes Classes for code picker. * @param string $classes Classes for code picker.
* @param boolean $single_line If true, code picker will be displayed as a single line of code. * @param boolean $single_line If true, code picker will be displayed as a single line of code.
* @param boolean $return Return output if set to true. * @param boolean $return Return output if set to true.
* *
* @return string * @return string
*/ */

View File

@ -4289,4 +4289,31 @@ CREATE TABLE IF NOT EXISTS `tfavmenu_user` (
`url` TEXT NOT NULL, `url` TEXT NOT NULL,
`label` VARCHAR(255) NOT NULL, `label` VARCHAR(255) NOT NULL,
`section` VARCHAR(255) NOT NULL, `section` VARCHAR(255) NOT NULL,
PRIMARY KEY (`id`)); PRIMARY KEY (`id`));
-- ---------------------------------------------------------------------
-- Table `tsesion_filter_log_viewer`
-- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tsesion_filter_log_viewer` (
`id_filter` INT NOT NULL AUTO_INCREMENT,
`id_name` TEXT NULL,
`id_group_filter` TEXT NULL,
`id_search_mode` INT NULL,
`order` VARCHAR(45) NULL,
`search` VARCHAR(255) NULL,
`group_id` INT NULL,
`date_range` TINYINT NULL,
`start_date_defined` VARCHAR(45) NULL,
`start_date_time` VARCHAR(45) NULL,
`start_date_date` VARCHAR(45) NULL,
`start_date_date_range` VARCHAR(45) NULL,
`start_date_time_range` VARCHAR(45) NULL,
`end_date_date_range` VARCHAR(45) NULL,
`end_date_time_range` VARCHAR(45) NULL,
`agent` VARCHAR(255) NULL,
`source` VARCHAR(255) NULL,
`display_mode` INT NULL,
`capture_model` INT NULL,
`graph_type` INT NULL,
PRIMARY KEY (`id_filter`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;