diff --git a/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java b/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java index f363f3f81..e13d9d24c 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java @@ -333,6 +333,7 @@ public class AlarmRuleCtl { ruleMVO.setTodoType(todoType); JSONObject confArgs = new JSONObject(); confArgs.put("period", period); + confArgs.put("excludeExceptions", json.get("excludeExceptions")); if (Constants.TODO_TYPE_0.equals(todoType)) { // 设置邮件相关的信息 JSONObject mailInfo = new JSONObject(); diff --git a/skywalking-webui/src/main/resources/jdbc.properties b/skywalking-webui/src/main/resources/jdbc.properties index e2a8c694f..fcbb2a288 100644 --- a/skywalking-webui/src/main/resources/jdbc.properties +++ b/skywalking-webui/src/main/resources/jdbc.properties @@ -1,7 +1,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://10.1.228.200:31306/test -jdbc.username=devrdbusr13 -jdbc.password=devrdbusr13 +jdbc.url=jdbc:mysql://10.1.241.20:31306/sw_db +jdbc.username=sw_dbusr01 +jdbc.password=sw_dbusr01 jdbc.maxTotal=200 jdbc.maxIdle=50 jdbc.maxWaitMillis=1000 diff --git a/skywalking-webui/src/main/sql/table.mysql b/skywalking-webui/src/main/sql/table.mysql index c4dac8e51..adba9b244 100644 --- a/skywalking-webui/src/main/sql/table.mysql +++ b/skywalking-webui/src/main/sql/table.mysql @@ -1,15 +1,31 @@ +-- MySQL Script generated by MySQL Workbench +-- 12/15/15 10:31:42 +-- Model: New Model Version: 1.0 +-- MySQL Workbench Forward Engineering + +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; + +-- ----------------------------------------------------- +-- Schema mydb +-- ----------------------------------------------------- + +-- ----------------------------------------------------- +-- Table `user_info` +-- ----------------------------------------------------- DROP TABLE IF EXISTS `user_info` ; CREATE TABLE IF NOT EXISTS `user_info` ( - `uid` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `user_name` VARCHAR(100) NOT NULL COMMENT '', - `password` VARCHAR(32) NOT NULL COMMENT '', - `role_type` VARCHAR(45) NOT NULL DEFAULT 'user' COMMENT '', - `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '', - `sts` VARCHAR(2) NOT NULL COMMENT '', - `modify_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '', - PRIMARY KEY (`uid`) COMMENT '', - UNIQUE INDEX `user_name_UNIQUE` (`user_name` ASC) COMMENT '') + `uid` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `user_name` VARCHAR(100) NOT NULL, + `password` VARCHAR(32) NOT NULL, + `role_type` VARCHAR(45) NOT NULL DEFAULT 'user', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `sts` VARCHAR(2) NOT NULL, + `modify_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`uid`), + UNIQUE INDEX `user_name_UNIQUE` (`user_name` ASC)) ENGINE = InnoDB; @@ -19,11 +35,11 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `user_info_ext` ; CREATE TABLE IF NOT EXISTS `user_info_ext` ( - `eid` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `uid` INT NOT NULL COMMENT '', - `email` VARCHAR(200) NULL COMMENT '', - `create_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '', - PRIMARY KEY (`eid`) COMMENT '') + `eid` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `uid` INT NOT NULL, + `email` VARCHAR(200) NULL, + `create_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`eid`)) ENGINE = InnoDB; @@ -33,10 +49,10 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `login_log` ; CREATE TABLE IF NOT EXISTS `login_log` ( - `log_id` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `uid` INT NOT NULL COMMENT '', - `login_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '', - PRIMARY KEY (`log_id`) COMMENT '') + `log_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `uid` INT NOT NULL, + `login_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`log_id`)) ENGINE = InnoDB; @@ -46,12 +62,12 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `application_info` ; CREATE TABLE IF NOT EXISTS `application_info` ( - `app_id` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `uid` INT NOT NULL COMMENT '', - `app_code` VARCHAR(200) NOT NULL COMMENT '', - `create_time` DATETIME NULL COMMENT '', - `sts` VARCHAR(2) NULL COMMENT '', - PRIMARY KEY (`app_id`) COMMENT '') + `app_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `uid` INT NOT NULL, + `app_code` VARCHAR(200) NOT NULL, + `create_time` DATETIME NULL, + `sts` VARCHAR(2) NULL, + PRIMARY KEY (`app_id`)) ENGINE = InnoDB; @@ -61,15 +77,18 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `data_info` ; CREATE TABLE IF NOT EXISTS `data_info` ( - `did` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `tab_info` VARCHAR(45) NOT NULL COMMENT '', - `col_info` VARCHAR(45) NOT NULL COMMENT '', - `code` VARCHAR(45) NOT NULL COMMENT '', - `word` VARCHAR(45) NOT NULL COMMENT '', - `word_desc` VARCHAR(200) NULL COMMENT '', - `sts` VARCHAR(2) NULL COMMENT '', - `create_time` DATETIME NULL COMMENT '', - PRIMARY KEY (`did`) COMMENT '') + `did` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `tab_info` VARCHAR(45) NOT NULL, + `col_info` VARCHAR(45) NOT NULL, + `code` VARCHAR(45) NOT NULL, + `word` VARCHAR(45) NOT NULL, + `code_desc` VARCHAR(200) NULL, + `order_id` INT UNSIGNED NULL, + `create_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, + `sts` VARCHAR(2) NULL, + `modify_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, + `parent_did` INT UNSIGNED NULL, + PRIMARY KEY (`did`)) ENGINE = InnoDB; @@ -79,17 +98,16 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `alarm_rule` ; CREATE TABLE IF NOT EXISTS `alarm_rule` ( - `rule_id` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `app_id` VARCHAR(45) NULL COMMENT '', - `uid` VARCHAR(45) NOT NULL COMMENT '', - `config_args` VARCHAR(200) NULL COMMENT '', - `is_global` VARCHAR(2) NOT NULL COMMENT '', - `todo_type` VARCHAR(4) NOT NULL COMMENT '', - `todo_content` VARCHAR(1000) NULL COMMENT '', - `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '', - `sts` VARCHAR(2) NULL COMMENT '', - `modify_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '', - PRIMARY KEY (`rule_id`) COMMENT '') + `rule_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `app_id` VARCHAR(45) NULL, + `uid` VARCHAR(45) NOT NULL, + `is_global` VARCHAR(2) NOT NULL, + `todo_type` VARCHAR(4) NOT NULL, + `config_args` VARCHAR(2000) NULL, + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `sts` VARCHAR(2) NULL, + `modify_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`rule_id`)) ENGINE = InnoDB; @@ -99,12 +117,12 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `include_rule` ; CREATE TABLE IF NOT EXISTS `include_rule` ( - `irid` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `rule_value` VARCHAR(200) NULL COMMENT '', - `create_time` DATETIME NULL COMMENT '', - `sts` VARCHAR(2) NULL COMMENT '', - `rule_id` INT UNSIGNED NOT NULL COMMENT '', - PRIMARY KEY (`irid`) COMMENT '') + `irid` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `rule_value` VARCHAR(200) NULL, + `create_time` DATETIME NULL, + `sts` VARCHAR(2) NULL, + `rule_id` INT UNSIGNED NOT NULL, + PRIMARY KEY (`irid`)) ENGINE = InnoDB; @@ -114,12 +132,12 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `exclude_rule` ; CREATE TABLE IF NOT EXISTS `exclude_rule` ( - `erid` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `rule_value` VARCHAR(200) NULL COMMENT '', - `create_time` DATETIME NULL COMMENT '', - `sts` VARCHAR(2) NULL COMMENT '', - `rule_id` INT UNSIGNED NOT NULL COMMENT '', - PRIMARY KEY (`erid`) COMMENT '') + `erid` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `rule_value` VARCHAR(200) NULL, + `create_time` DATETIME NULL, + `sts` VARCHAR(2) NULL, + `rule_id` INT UNSIGNED NOT NULL, + PRIMARY KEY (`erid`)) ENGINE = InnoDB; @@ -129,10 +147,50 @@ ENGINE = InnoDB; DROP TABLE IF EXISTS `email_expression` ; CREATE TABLE IF NOT EXISTS `email_expression` ( - `tid` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '', - `expr_name` VARCHAR(100) NOT NULL COMMENT '', - `expr_val` VARCHAR(100) NOT NULL COMMENT '', - `create_time` DATETIME NULL COMMENT '', - `sts` VARCHAR(2) NULL COMMENT '', - PRIMARY KEY (`tid`) COMMENT '') -ENGINE = InnoDB; \ No newline at end of file + `tid` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `expr_name` VARCHAR(100) NOT NULL, + `expr_val` VARCHAR(100) NOT NULL, + `create_time` DATETIME NULL, + `sts` VARCHAR(2) NULL, + PRIMARY KEY (`tid`)) +ENGINE = InnoDB; + + +-- ----------------------------------------------------- +-- Table `system_config` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `system_config` ; + +CREATE TABLE IF NOT EXISTS `system_config` ( + `config_id` INT UNSIGNED NOT NULL, + `conf_key` VARCHAR(200) NOT NULL, + `conf_value` VARCHAR(500) NOT NULL, + `val_type` VARCHAR(45) NOT NULL, + `val_desc` VARCHAR(200) NULL, + `create_time` DATETIME NULL, + `sts` VARCHAR(2) NOT NULL, + `modify_time` DATETIME NULL, + PRIMARY KEY (`config_id`), + UNIQUE INDEX `conf_key_UNIQUE` (`conf_key` ASC)) +ENGINE = InnoDB; + + +-- ----------------------------------------------------- +-- Table `app_auth_info` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `app_auth_info` ; + +CREATE TABLE IF NOT EXISTS `app_auth_info` ( + `info_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `app_id` VARCHAR(45) NOT NULL, + `auth_json` VARCHAR(3000) NOT NULL, + `create_time` DATETIME NULL, + `sts` VARCHAR(45) NULL, + `modify_time` DATETIME NULL, + PRIMARY KEY (`info_id`)) +ENGINE = InnoDB; + + +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; diff --git a/skywalking-webui/src/main/webapp/ftl/applist.ftl b/skywalking-webui/src/main/webapp/ftl/applist.ftl index 91fb7437f..2bb42d8cd 100644 --- a/skywalking-webui/src/main/webapp/ftl/applist.ftl +++ b/skywalking-webui/src/main/webapp/ftl/applist.ftl @@ -2,560 +2,585 @@ - - -Sky Walking - - - - - + + + Sky Walking + + + + + -
- - - - - - - - - - - - - - -<#if applist??> - -<#list applist as appInfo> - - - - - - - - -
- -   - -   - -
序号应用名称操作
${appInfo_index + 1}${appInfo.appCode!} - - - -
-
- - - <@common.importJavaScript /> - +
+ + + + + + + + + + + + + + + <#if applist??> + + <#list applist as appInfo> + + + + + + + + +
+ +   + +   + +
序号应用名称操作
${appInfo_index + 1}${appInfo.appCode!} + + + +
+
+ + +<@common.importJavaScript /> + \ No newline at end of file