Merge branch 'lichang' into lite

build/database/lite/install/sys_i18n.sql

@@ -873,7 +873,7 @@ Minor=3
 Warning=4
 
 AddInfo: 告警补充信息
-cpuUseGt: CPU使用率大于， 范围0~100%
+cpuUseGt: CPU使用率大于， 范围0~100*CPU核心数
 memUseGt: 内存使用率大于， 范围0~100%
 diskUseGt: 磁盘使用率大于， 范围0~100%', 'Checks the memory/CPU/disk check health of the network element and sends alerts when thresholds are crossed.
 
@@ -891,7 +891,7 @@ Minor=3
 Warning=4
 
 AddInfo: Additional information on alarms
-cpuUseGt: CPU utilization greater than, range 0 to 100%
+cpuUseGt: CPU utilization is greater than, range 0~100*number of CPU cores
 memUseGt: Memory utilization greater than, range 0 to 100%
 diskUseGt: Disk utilization greater than, range 0 to 100%');
 INSERT INTO "sys_i18n" VALUES (754, 'job.ne_alarm_state_check_license', '网元告警-License到期检查', 'NE Alarm-License Expire Check');

build/database/lite/install/trace_task.sql

@@ -15,6 +15,7 @@ CREATE TABLE "trace_task" (
   "dst_ip" text(128),
   "create_by" text(50),
   "create_time" integer,
+  "title" text(255),
   "remark" text(500),
   "ne_list" text(32) NOT NULL,
   "notify_url" text(128) NOT NULL,

build/database/lite/upgrade/upg_trace_task.sql

@@ -0,0 +1,30 @@
+-- ----------------------------
+-- Table structure for trace_task
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "trace_task" (
+  "id" integer NOT NULL,
+  "trace_id" text(16) NOT NULL,
+  "trace_type" text(2) NOT NULL,
+  "start_time" integer,
+  "end_time" integer,
+  "interfaces" text(255),
+  "imsi" text(16),
+  "msisdn" text(16),
+  "src_ip" text(128),
+  "dst_ip" text(128),
+  "create_by" text(50),
+  "create_time" integer,
+  "title" text(255),
+  "remark" text(500),
+  "ne_list" text(32) NOT NULL,
+  "notify_url" text(128) NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+-- ----------------------------
+-- Indexes structure for table trace_task
+-- ----------------------------
+
+
+-- ADD COLUMN
+ALTER TABLE trace_task ADD COLUMN title text(255);