diff --git a/docs/cn/Deploy-backend-in-cluster-mode-CN.md b/docs/cn/Deploy-backend-in-cluster-mode-CN.md index b892eac8c..deff7b7bb 100644 --- a/docs/cn/Deploy-backend-in-cluster-mode-CN.md +++ b/docs/cn/Deploy-backend-in-cluster-mode-CN.md @@ -79,5 +79,17 @@ 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 + +### 部署UI + +1. 解压安装包 `tar -xvf skywalking-dist.tar.gz`,windows用户可以选择zip包 +2. 配置UI集群模式. + +UI的配置信息保存在 `bin/webappService.sh` 中 ( windows为`bin\webappService.bat`). + +| 配置项 | 描述 | +|----------------------------------|----------------------------------------------------------------------------------| +| `server.port` | 监听端口 | +| `collector.ribbon.listOfServers` | collector命名服务地址.(与 `config/application.yml` 中的`naming.jetty`配置保持相同 ) | + +3. 运行 `bin/webappService.sh` diff --git a/docs/cn/Deploy-backend-in-standalone-mode-CN.md b/docs/cn/Deploy-backend-in-standalone-mode-CN.md index fb0166d80..2d7f83b8f 100644 --- a/docs/cn/Deploy-backend-in-standalone-mode-CN.md +++ b/docs/cn/Deploy-backend-in-standalone-mode-CN.md @@ -14,7 +14,7 @@ ## Quick Start Collector单机模拟启动简单,提供和集群模式相同的功能,单机模式下除端口被占用的情况下,直接启动即可。 -## 部署collector +## 部署后台服务 1. 解压安装包`tar -xvf skywalking-collector.tar.gz`,windows用户可以选择zip包 1. 运行`bin/startup.sh`启动。windows用户为.bat文件。 diff --git a/docs/en/Deploy-backend-in-cluster-mode.md b/docs/en/Deploy-backend-in-cluster-mode.md index 29025b9b3..80a79486e 100644 --- a/docs/en/Deploy-backend-in-cluster-mode.md +++ b/docs/en/Deploy-backend-in-cluster-mode.md @@ -1,6 +1,6 @@ ## Required of third party softwares - JDK 6+(instruments application can run in jdk6) -- JDK8 ( skywalking collector and skywalking webui ) +- JDK8 ( skywalking collector and skywalking ui ) - Elasticsearch 5.2.2 or 5.3, cluster mode or not - Zookeeper 3.4.10 @@ -22,7 +22,7 @@ thread_pool.bulk.queue_size: 1000 - Start Elasticsearch ### Deploy collector servers -1. Run `tar -xvf skywalking-collector.tar.gz` +1. Run `tar -xvf skywalking-dist.tar.gz` 2. Config collector in cluster mode. Cluster mode depends on Zookeeper register and application discovery capabilities. So, you just need to adjust the IP config items in `config/application.yml`. Change IP and port configs of naming, remote, agent_gRPC, agent_jetty and ui, @@ -75,8 +75,18 @@ storage: ttl: 7 ``` +3. Run `bin/collectorService.sh` -3. Run `bin/startup.sh` +### Deploy UI servers -- 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.** +1. Run `tar -xvf skywalking-dist.tar.gz` +2. Config UI in cluster mode. + +The config items of UI is saved in `bin/webappService.sh` (`bin\webappService.bat` for windows). + +| Config | Description | +|----------------------------------|------------------------------------------------------------------------------------------------------| +| `server.port` | Port to listen on | +| `collector.ribbon.listOfServers` | Address to access collector naming service.(Consist with `naming.jetty` in `config/application.yml`) | + +3. Run `bin/webappService.sh` diff --git a/docs/en/Deploy-backend-in-standalone-mode.md b/docs/en/Deploy-backend-in-standalone-mode.md index 56b1cdaf4..543f487c5 100644 --- a/docs/en/Deploy-backend-in-standalone-mode.md +++ b/docs/en/Deploy-backend-in-standalone-mode.md @@ -12,9 +12,9 @@ If you are using skywalking in a low throughputs monitoring scenario, and don't * [Releases](https://github.com/apache/incubator-skywalking/releases) ## Quick start -You can simplely tar/unzip and startup if ports 10800, 11800, 12800 are free. +You can simplely tar/unzip and startup if ports 8080, 10800, 11800, 12800 are free. -- `tar -xvf skywalking-collector.tar.gz` in Linux, or unzip in windows. +- `tar -xvf skywalking-dist.tar.gz` in Linux, or unzip in windows. - run `bin/startup.sh` or `bin/startup.bat` You should keep the `config/application.yml` as default.