You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/03/03 14:55:43 UTC
[incubator-skywalking] branch 5.0.0-alpha-doc updated: Sync Chinese
doc
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 5.0.0-alpha-doc
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/5.0.0-alpha-doc by this push:
new 293fd9a Sync Chinese doc
293fd9a is described below
commit 293fd9a1cd1396d1368845f6602b3a9376bc1483
Author: wusheng <wu...@foxmail.com>
AuthorDate: Sat Mar 3 22:55:35 2018 +0800
Sync Chinese doc
---
docs/cn/Deploy-collector-in-cluster-mode-CN.md | 3 +++
docs/cn/Deploy-collector-in-standalone-mode-CN.md | 8 +++++++-
docs/cn/Quick-start-CN.md | 4 ++--
docs/en/Deploy-collector-in-cluster-mode.md | 3 ++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/docs/cn/Deploy-collector-in-cluster-mode-CN.md b/docs/cn/Deploy-collector-in-cluster-mode-CN.md
index e73f3fd..b892eac 100644
--- a/docs/cn/Deploy-collector-in-cluster-mode-CN.md
+++ b/docs/cn/Deploy-collector-in-cluster-mode-CN.md
@@ -78,3 +78,6 @@ storage:
3. 运行`bin/startup.sh`启动。windows用户为.bat文件。
+
+- **注意：startup.sh将会启动collector和UI两个进程，UI通过127.0.0.1:10800访问本地collector，无需额外配置。
+如需保证UI负载均衡，推荐使用类nginx的HTTP代理服务。**
\ No newline at end of file
diff --git a/docs/cn/Deploy-collector-in-standalone-mode-CN.md b/docs/cn/Deploy-collector-in-standalone-mode-CN.md
index 86351b5..fb0166d 100644
--- a/docs/cn/Deploy-collector-in-standalone-mode-CN.md
+++ b/docs/cn/Deploy-collector-in-standalone-mode-CN.md
@@ -1,5 +1,9 @@
# 用途说明
-单机模式默认使用本地H2数据库，不支持集群部署。主要用于：预览、功能测试、演示和低压力系统。如果使用单机collector用于非演示环境，你可选择使用Elasticsearch作为存储实现。
+单机模式默认使用本地H2数据库，不支持集群部署。主要用于：预览、功能测试、演示和低压力系统。
+
+如果使用单机collector用于非演示环境，你可选择使用Elasticsearch作为存储实现。
+
+**在5.0.0-alpha版本中，暂不提供H2实现**
## 所需的第三方软件
- JDK8+
@@ -14,6 +18,8 @@ Collector单机模拟启动简单，提供和集群模式相同的功能，单
1. 解压安装包`tar -xvf skywalking-collector.tar.gz`，windows用户可以选择zip包
1. 运行`bin/startup.sh`启动。windows用户为.bat文件。
+- **注意：startup.sh将会启动collector和UI两个进程，UI通过127.0.0.1:10800访问本地collector，无需额外配置。**
+
## 使用Elastic Search代替H2存储
- 在单机模式下除了支持内置的H2数据库运行，也支持其他的存储（当前已支持的ElasticSearch 5.3），取消Storage相关配置节的注释，并修改配置。
```yaml
diff --git a/docs/cn/Quick-start-CN.md b/docs/cn/Quick-start-CN.md
index 21c2b67..9567bf3 100644
--- a/docs/cn/Quick-start-CN.md
+++ b/docs/cn/Quick-start-CN.md
@@ -1,7 +1,7 @@
# 部署步骤
-1. 部署 Collector
+1. 在Maven Central中下载 `org.apache.skywalking.apm-dist`. 或者本地编译程序，在`dist`目录中找到`skywalking-dist.tar.gz/.zip`.
+1. 部署 Backend
1. [单机模式](Deploy-collector-in-standalone-mode-CN.md)
1. [集群模式](Deploy-collector-in-cluster-mode-CN.md)
-1. 部署 webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. 部署 Java Agent，[doc](Deploy-skywalking-agent-CN.md)
1. 重启并访问系统功能，查看UI即可。
\ No newline at end of file
diff --git a/docs/en/Deploy-collector-in-cluster-mode.md b/docs/en/Deploy-collector-in-cluster-mode.md
index c6fa1ff..29025b9 100644
--- a/docs/en/Deploy-collector-in-cluster-mode.md
+++ b/docs/en/Deploy-collector-in-cluster-mode.md
@@ -78,4 +78,5 @@ storage:
3. Run `bin/startup.sh`
-- NOTICE: **In 5.0.0-alpha, startup.sh will start two processes, collector and UI, and UI uses 127.0.0.1:10800 as default.**
+- NOTICE: **In 5.0.0-alpha, startup.sh will start two processes, collector and UI, and UI uses 127.0.0.1:10800 as default.
+Recommend use http proxy to access UI in product, otherwise, access any UI.**
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.