From 2d654b50a36c9052d7f6b291023968028df9f8eb Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Wed, 20 Jan 2016 17:11:50 +0800 Subject: [PATCH 1/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ca9057a6..6a44f3ccc 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,8 @@ $cd github/sky-walking/skywalking-webui $mvn package ``` - 初始化管理数据库 -根据[数据库脚本](https://github.com/wu-sheng/sky-walking/blob/master/skywalking-webui/src/main/sql/table.mysql)初始化管理数据库，根据实际环境配置如下SQL： +根据[数据库脚本](https://github.com/wu-sheng/sky-walking/blob/master/skywalking-webui/src/main/sql/table.mysql)初始化管理数据库 +其中，脚本中如下SQL片段需要修改： ```sql --配置告警邮件的发送人和SMTP信息 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'); From 05b4d8ab9cbcc347a8a34ac324ebd0516e13ade4 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Wed, 20 Jan 2016 17:12:33 +0800 Subject: [PATCH 2/6] Update table.mysql --- skywalking-webui/src/main/sql/table.mysql | 1 + 1 file changed, 1 insertion(+) diff --git a/skywalking-webui/src/main/sql/table.mysql b/skywalking-webui/src/main/sql/table.mysql index c8a099f95..b142e6d56 100644 --- a/skywalking-webui/src/main/sql/table.mysql +++ b/skywalking-webui/src/main/sql/table.mysql @@ -219,6 +219,7 @@ CREATE TABLE `auth_file_config` ( PRIMARY KEY (`id`), UNIQUE INDEX `id_UNIQUE` (`id` ASC)); +# 请参考文档和环境进行修改 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 (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'); From d521a6fdf2a76b610d38d90761967a47d4a09276 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Wed, 20 Jan 2016 17:13:42 +0800 Subject: [PATCH 3/6] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a44f3ccc..da2db3533 100644 --- a/README.md +++ b/README.md @@ -115,8 +115,7 @@ $cd github/sky-walking/skywalking-webui $mvn package ``` - 初始化管理数据库 -根据[数据库脚本](https://github.com/wu-sheng/sky-walking/blob/master/skywalking-webui/src/main/sql/table.mysql)初始化管理数据库 -其中，脚本中如下SQL片段需要修改： +根据[数据库脚本](https://github.com/wu-sheng/sky-walking/blob/master/skywalking-webui/src/main/sql/table.mysql)初始化管理数据库。其中，脚本中如下SQL片段需要修改： ```sql --配置告警邮件的发送人和SMTP信息 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'); From ada66b57ada28473a5fcd48321fbc63459d4ff9e Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Thu, 21 Jan 2016 11:11:49 +0800 Subject: [PATCH 4/6] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da2db3533..5561db62d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ SkyWalking-Distributed Application Tracing System, 是一个对JAVA应用程序 ![整体架构图](http://wu-sheng.github.io/sky-walking/sample-code/images/skywalkingClusterDeploy.jpeg) # 追踪链路图 -![追踪连路途](http://wu-sheng.github.io/sky-walking/sample-code/images/traceLogView.jpeg) +![追踪连路图1](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChain.png) +![追踪连路图2](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChainDetail.png) +![追踪连路图3](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChainLog.png) # Home Page http://wu-sheng.github.io/sky-walking/ From 5235973ba2acd5bde1511685585a0f7c60027cde Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Thu, 21 Jan 2016 13:19:46 +0800 Subject: [PATCH 5/6] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5561db62d..7455d95a5 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,15 @@ SkyWalking-Distributed Application Tracing System, 是一个对JAVA应用程序 # 整体架构图 ![整体架构图](http://wu-sheng.github.io/sky-walking/sample-code/images/skywalkingClusterDeploy.jpeg) -# 追踪链路图 +# 典型页面展现 +## 实时调用链路 +* 实时链路追踪展现 ![追踪连路图1](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChain.png) +* 实时链路追踪详细信息查看 ![追踪连路图2](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChainDetail.png) +* 实时链路追踪日志查看 ![追踪连路图3](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChainLog.png) +## 分析汇总 # Home Page http://wu-sheng.github.io/sky-walking/ From a27ecc9c9035b2b4adc70fb8ef489ccdf95767ee Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Thu, 21 Jan 2016 13:20:50 +0800 Subject: [PATCH 6/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7455d95a5..e436b0f06 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ SkyWalking-Distributed Application Tracing System, 是一个对JAVA应用程序 ![追踪连路图2](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChainDetail.png) * 实时链路追踪日志查看 ![追踪连路图3](http://wu-sheng.github.io/sky-walking/sample-code/screenshoot/callChainLog.png) + ## 分析汇总 # Home Page