diff --git a/database/install/alarm_event.sql b/database/install/alarm_event.sql index 53e499b6..fff32946 100644 --- a/database/install/alarm_event.sql +++ b/database/install/alarm_event.sql @@ -21,43 +21,43 @@ SET FOREIGN_KEY_CHECKS = 0; -- Table structure for alarm_event -- ---------------------------- DROP TABLE IF EXISTS `alarm_event`; -CREATE TABLE `alarm_event` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `alarm_seq` int(11) NULL DEFAULT NULL, +CREATE TABLE `alarm_event` ( + `id` int NOT NULL AUTO_INCREMENT, + `alarm_seq` int DEFAULT NULL, `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `alarm_code` int(11) NULL DEFAULT NULL, - `event_time` datetime NULL DEFAULT NULL, - `alarm_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '', - `orig_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Minor' COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)', - `perceived_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)', - `pv_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `object_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `object_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0', - `object_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `location_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `alarm_status` int(11) NOT NULL DEFAULT 1 COMMENT '0:clear, 1:active', - `specific_problem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `specific_problem_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `add_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `counter` int(11) NULL DEFAULT 0, - `latest_event_time` datetime NULL DEFAULT NULL, - `ack_state` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unacked, 1: Acked', - `ack_time` datetime NULL DEFAULT NULL, - `ack_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `clear_type` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unclear, 1: AutoClear, 2: ManualClear', - `clear_time` datetime NULL DEFAULT NULL, - `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP, + `alarm_code` int DEFAULT NULL, + `event_time` datetime DEFAULT NULL, + `alarm_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `orig_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'Minor' COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)', + `perceived_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)', + `pv_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `object_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `object_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0', + `object_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `location_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `alarm_status` int NOT NULL DEFAULT '1' COMMENT '0:clear, 1:active', + `specific_problem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `specific_problem_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `add_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `counter` int DEFAULT '0', + `latest_event_time` datetime DEFAULT NULL, + `ack_state` tinyint DEFAULT '0' COMMENT '0: Unacked, 1: Acked', + `ack_time` datetime DEFAULT NULL, + `ack_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `clear_type` tinyint DEFAULT '0' COMMENT '0: Unclear, 1: AutoClear, 2: ManualClear', + `clear_time` datetime DEFAULT NULL, + `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `timestamp` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `idx_pk_id`(`id`) USING BTREE, - UNIQUE INDEX `idx_uni_aid_ne_aseq`(`ne_type`, `ne_id`, `alarm_id`, `alarm_seq`) USING BTREE, - INDEX `idx_event_time`(`event_time`) USING BTREE, - INDEX `idx_severity_status`(`alarm_status`, `orig_severity`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 228788 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + UNIQUE KEY `idx_pk_id` (`id`) USING BTREE, + UNIQUE KEY `idx_uni_aid_ne_aseq` (`ne_type`,`ne_id`,`alarm_id`,`alarm_seq`) USING BTREE, + KEY `idx_event_time` (`event_time`) USING BTREE, + KEY `idx_severity_status` (`alarm_status`,`orig_severity`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_alarm_event.sql b/database/upgrade/upg_alarm_event.sql index 7a72e790..f66fa213 100644 --- a/database/upgrade/upg_alarm_event.sql +++ b/database/upgrade/upg_alarm_event.sql @@ -60,80 +60,80 @@ CREATE TABLE IF NOT EXISTS `alarm_event` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- Move event alarm from table alarm to alarm_event -START TRANSACTION; +-- START TRANSACTION; -INSERT INTO `alarm_event` ( - `alarm_seq`, - `alarm_id`, - `alarm_title`, - `ne_type`, - `ne_id`, - `alarm_code`, - `event_time`, - `alarm_type`, - `orig_severity`, - `perceived_severity`, - `pv_flag`, - `ne_name`, - `object_uid`, - `object_name`, - `object_type`, - `location_info`, - `province`, - `alarm_status`, - `specific_problem`, - `specific_problem_id`, - `add_info`, - `counter`, - `latest_event_time`, - `ack_state`, - `ack_time`, - `ack_user`, - `clear_type`, - `clear_time`, - `clear_user`, - `timestamp` - ) -SELECT - `alarm_seq`, - `alarm_id`, - `alarm_title`, - `ne_type`, - `ne_id`, - `alarm_code`, - `event_time`, - `alarm_type`, - `orig_severity`, - `perceived_severity`, - `pv_flag`, - `ne_name`, - `object_uid`, - `object_name`, - `object_type`, - `location_info`, - `province`, - `alarm_status`, - `specific_problem`, - `specific_problem_id`, - `add_info`, - `counter`, - `latest_event_time`, - `ack_state`, - `ack_time`, - `ack_user`, - `clear_type`, - `clear_time`, - `clear_user`, - `timestamp` -FROM `alarm` -WHERE - `orig_severity` = 'Event'; +-- INSERT INTO `alarm_event` ( +-- `alarm_seq`, +-- `alarm_id`, +-- `alarm_title`, +-- `ne_type`, +-- `ne_id`, +-- `alarm_code`, +-- `event_time`, +-- `alarm_type`, +-- `orig_severity`, +-- `perceived_severity`, +-- `pv_flag`, +-- `ne_name`, +-- `object_uid`, +-- `object_name`, +-- `object_type`, +-- `location_info`, +-- `province`, +-- `alarm_status`, +-- `specific_problem`, +-- `specific_problem_id`, +-- `add_info`, +-- `counter`, +-- `latest_event_time`, +-- `ack_state`, +-- `ack_time`, +-- `ack_user`, +-- `clear_type`, +-- `clear_time`, +-- `clear_user`, +-- `timestamp` +-- ) +-- SELECT +-- `alarm_seq`, +-- `alarm_id`, +-- `alarm_title`, +-- `ne_type`, +-- `ne_id`, +-- `alarm_code`, +-- `event_time`, +-- `alarm_type`, +-- `orig_severity`, +-- `perceived_severity`, +-- `pv_flag`, +-- `ne_name`, +-- `object_uid`, +-- `object_name`, +-- `object_type`, +-- `location_info`, +-- `province`, +-- `alarm_status`, +-- `specific_problem`, +-- `specific_problem_id`, +-- `add_info`, +-- `counter`, +-- `latest_event_time`, +-- `ack_state`, +-- `ack_time`, +-- `ack_user`, +-- `clear_type`, +-- `clear_time`, +-- `clear_user`, +-- `timestamp` +-- FROM `alarm` +-- WHERE +-- `orig_severity` = 'Event'; -DELETE FROM `alarm` WHERE `orig_severity` = 'Event'; +-- DELETE FROM `alarm` WHERE `orig_severity` = 'Event'; -COMMIT; +-- COMMIT; -DELETE FROM alarm_event WHERE id NOT IN (SELECT MIN(id) FROM alarm_event GROUP BY `ne_type`, `ne_id`, `alarm_id`, `event_time`); +-- DELETE FROM alarm_event WHERE id NOT IN (SELECT MIN(id) FROM alarm_event GROUP BY `ne_type`, `ne_id`, `alarm_id`, `event_time`); ALTER TABLE `alarm_event` ADD UNIQUE INDEX IF NOT EXISTS `idx_uni_aid_ne_time`(`ne_type`, `ne_id`, `alarm_id`, `event_time`) USING BTREE; diff --git a/database/upgrade/zupgrade.sql b/database/upgrade/zupgrade.sql index f1ae3e39..c52bdb92 100644 --- a/database/upgrade/zupgrade.sql +++ b/database/upgrade/zupgrade.sql @@ -1,10 +1,5 @@ DROP TRIGGER IF EXISTS `tg_account_menu`; -ALTER TABLE `gold_kpi` -MODIFY COLUMN `value` bigint NULL DEFAULT 0 AFTER `kpi_id`; - -ALTER TABLE `ne_link` DROP INDEX IF EXISTS `idx_netype_neid`; - ALTER TABLE `nbi_operation_log` MODIFY COLUMN `created_at` datetime NULL DEFAULT NULL AFTER `log_time`; @@ -23,21 +18,6 @@ ALTER TABLE `measure_task` ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`, ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; -ALTER TABLE `trace_task` -ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`, -ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; - -DELETE FROM trace_data WHERE timestamp LIKE '2023-%'; -ALTER TABLE `trace_data` -MODIFY COLUMN `timestamp` bigint NULL DEFAULT NULL AFTER `msg_direct`; - -ALTER TABLE `trace_data` -ADD COLUMN IF NOT EXISTS `length` int NULL AFTER `msg_direct`; - -ALTER TABLE `ne_backup` -ADD - COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `md5_sum`; - ALTER TABLE `mml_command` ADD COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`;