diff --git a/BUILD_DOC.md b/BUILD_DOC.md index 7cde4ffd9..5dc0ae0dd 100644 --- a/BUILD_DOC.md +++ b/BUILD_DOC.md @@ -55,7 +55,7 @@ $./swserver.sh ```sql --配置告警邮件的发送人和SMTP信息 --set sender and smtp of alarm e-mail -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1000,'mail_info','{\"mail.host\":\"mail.asiainfo.com\",\"mail.transport.protocol\":\"smtp\",\"mail.smtp.auth\":\"true\",\"mail.smtp.starttls.enable\":\"false\",\"mail.username\":\"testA\",\"mail.password\":\"******\",\"mail.account.prefix\":\"@asiainfo.com\"}','json','默认邮件发送人信息','2015-12-10 11:54:06','A','2015-12-10 11:54:06'); +INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1000,'mail_info','{\"mail.host\":\"mail.asiainfo.com\",\"mail.transport.protocol\":\"smtp\",\"mail.smtp.auth\":\"true\",\"mail.smtp.starttls.enable\":\"false\",\"mail.username\":\"testA\",\"mail.password\":\"******\",\"mail.sender\":\"mailSender@asiainfo.com\"}','json','默认邮件发送人信息','2015-12-10 11:54:06','A','2015-12-10 11:54:06'); --配置部署页面地址，用于告警邮件内的链接 --set webui addr of internet INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1001,'portal_addr','http://10.1.235.197:48080/skywalking/','string','默认门户地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); @@ -65,8 +65,12 @@ INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val --配置SkyWalking Server的集群地址（外网地址） --set internet addrs of server cluster INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1003,'servers_addr_1','60.194.3.183:34000;60.194.3.183:35000;60.194.3.184:34000;60.194.3.184:35000;','string','日志采集地址-外网','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); +--配置告警类型 +--config types of alarm +INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'alarm_type_info', '[{\"type\":\"alarm\",\"label\":\"exception\",\"desc\":\"System exception\"},{\"type\":\"timeAlarm\",\"label\":\"mark\",\"desc\":\"Excution Time > 5s\"},{\"type\":\"timeWarning\",\"label\":\"mark\",\"desc\":\"Excution Time > 500ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53'); ``` -- 注：2016-4-8日前的版本，请升级脚本中的相关片段 +- 注：2016-4-21日前的版本升级，system_config表config_id=1000,SQL语句更新，请注意修改，新增配置config_id=1004 +- 注：2016-4-8日前的版本升级，请升级脚本中的相关片段 - execute update scripts, if update from the version which releases before 2016-4-8 ``` # alter table since 2016-4-8 diff --git a/skywalking-alarm/src/main/resources/mail-template_new.config b/skywalking-alarm/src/main/resources/mail-template_new.config deleted file mode 100644 index cdeb4f845..000000000 --- a/skywalking-alarm/src/main/resources/mail-template_new.config +++ /dev/null @@ -1 +0,0 @@ -template.default=templete1_welcome

\u5c0a\u656c\u7684SkyWalking\u7528\u6237\u60a8\u597d:

\u81ea${startDate!}\u8d77\uff0c\u5230${endDate!}\u6b62\uff0c\u5e73\u53f0\u63a5\u6536\u5230\u76d1\u63a7\u544a\u8b66\u4fe1\u606f\u5982\u4e0b\uff1a

<#if warningObjects??><#list warningObjects as warningObject>

  • ${warningObject.traceId!}
    Stack: ${warningObject.exceptionMsg!}

    • diff --git a/skywalking-webui/src/main/sql/table.mysql b/skywalking-webui/src/main/sql/table.mysql index 5d5e190fc..a09a56d67 100644 --- a/skywalking-webui/src/main/sql/table.mysql +++ b/skywalking-webui/src/main/sql/table.mysql @@ -224,7 +224,7 @@ INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1001,'portal_addr','http://10.1.235.197:48080/skywalking/','string','默认门户地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1002,'servers_addr','10.1.235.197:34000;10.1.235.197:35000;','string','日志采集地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1003,'servers_addr_1','XXX.XXX.XXX.XXX:34000;','string','日志采集地址-外网','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'type_info', '[{\"type\":\"alarm\",\"label\":\"exception\",\"desc\":\"System exception\"},{\"type\":\"timeAlarm\",\"label\":\"mark\",\"desc\":\"Execution > 5s\"},{\"type\":\"timeWarning\",\"label\":\"mark\",\"desc\":\"Excution > 300ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53'); +INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'alarm_type_info', '[{\"type\":\"alarm\",\"label\":\"exception\",\"desc\":\"System exception\"},{\"type\":\"timeAlarm\",\"label\":\"mark\",\"desc\":\"Execution Time> 5s\"},{\"type\":\"timeWarning\",\"label\":\"mark\",\"desc\":\"Excution Time> 500ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53'); # init default value of auth_file_config INSERT INTO `auth_file_config` (`config_id`, `key`, `value0`, `value1`, `key_desc`, `sts`) VALUES ('1', 'buriedpoint.printf', 'false', 'false', '是否打印数据', 'A');