1.移除旧文件

2.整理数据库脚本
3.调整文档说明
This commit is contained in:
wusheng 2016-04-21 09:55:36 +08:00
parent 24bbf6415d
commit 21394784b8
3 changed files with 7 additions and 4 deletions

View File

@ -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

View File

@ -1 +0,0 @@
template.default=<!DOCTYPE html PUBLIC\"-//W3C//DTD XHTML 1.0 Transitional//EN\"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta http-equiv=\"Content-Type\"content=\"text/html; charset=utf-8\"><style type=\"text/css\">li{text-indent:2em}</style><title>templete1_welcome</title></head><body style=\"background:#eee;\"><table width=\"80%\"cellpadding=\"0\"cellspacing=\"0\"border=\"0\"style=\"text-align:left;font:12px/15px simsun; line-height:20px; color:#000;background:#fff; padding:30px 20px; border:20px solid #fff; margin:0 auto;\"><tbody><tr><td style=\"margin:0; padding:0;\"><div style=\"background:#f9f9f9; padding:25px; font-family: \u5fae\u8f6f\u96c5\u9ed1, \u9ed1\u4f53, Arial; font-size:14px; line-height:25px; margin:5px 0; overflow:hidden;\"><p>\u5c0a\u656c\u7684SkyWalking\u7528\u6237\u60a8\u597d:</p><p>\u81ea<b>${startDate!}</b>\u8d77\uff0c\u5230<b>${endDate!}</b>\u6b62\uff0c\u5e73\u53f0\u63a5\u6536\u5230\u76d1\u63a7\u544a\u8b66\u4fe1\u606f\u5982\u4e0b\uff1a</p><p><#if warningObjects??><#list warningObjects as warningObject><li><a href=\"${(portalAddr + warningObject.traceId)!}\">${warningObject.traceId!}</a><br/>Stack:&nbsp;${warningObject.exceptionMsg!}</li></#list></#if></p></div></td></tr></tbody></table></body></html>

View File

@ -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');