You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/06/20 13:41:21 UTC
[incubator-skywalking] branch webapp/login updated: Update deploy
document for new webapp.yml config file
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch webapp/login
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/webapp/login by this push:
new 8a0f200 Update deploy document for new webapp.yml config file
8a0f200 is described below
commit 8a0f2005d0e1c31bc7af0ebe533db913524ba660
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Wed Jun 20 21:40:36 2018 +0800
Update deploy document for new webapp.yml config file
---
apm-webapp/src/main/assembly/webapp.yml | 2 +-
docs/cn/Deploy-backend-in-cluster-mode-CN.md | 5 ++++-
docs/en/Deploy-backend-in-cluster-mode.md | 6 ++++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/apm-webapp/src/main/assembly/webapp.yml b/apm-webapp/src/main/assembly/webapp.yml
index 007f3f6..8e0f7d1 100644
--- a/apm-webapp/src/main/assembly/webapp.yml
+++ b/apm-webapp/src/main/assembly/webapp.yml
@@ -26,4 +26,4 @@ collector:
security:
user:
admin:
- password: 111
+ password: admin
diff --git a/docs/cn/Deploy-backend-in-cluster-mode-CN.md b/docs/cn/Deploy-backend-in-cluster-mode-CN.md
index 4252e03..d506d0a 100644
--- a/docs/cn/Deploy-backend-in-cluster-mode-CN.md
+++ b/docs/cn/Deploy-backend-in-cluster-mode-CN.md
@@ -109,11 +109,14 @@ configuration:
1. 解压安装包 `tar -xvf skywalking-dist.tar.gz`，windows用户可以选择zip包
2. 配置UI集群模式.
-UI的配置信息保存在 `bin/webappService.sh` 中 ( windows为`bin\webappService.bat`).
+UI的配置信息保存在 `webapp/webapp.yml` 中.
| 配置项 | 描述 |
|----------------------------------|----------------------------------------------------------------------------------|
| `server.port` | 监听端口 |
| `collector.ribbon.listOfServers` | collector命名服务地址.(与 `config/application.yml` 中的`naming.jetty`配置保持相同 )，多个Collector地址以`,`分割 |
+| `collector.path` | Collector查询uri. 默认: /graphql |
+| `collector.ribbon.ReadTimeout` | 查询超时时间. 默认: 10 秒 |
+| `security.user.*` | 登录用户名/密码. 默认: admin/admin |
3. 运行 `bin/webappService.sh`
diff --git a/docs/en/Deploy-backend-in-cluster-mode.md b/docs/en/Deploy-backend-in-cluster-mode.md
index d8745b1..3cc0a49 100644
--- a/docs/en/Deploy-backend-in-cluster-mode.md
+++ b/docs/en/Deploy-backend-in-cluster-mode.md
@@ -131,14 +131,16 @@ configuration:
### Set UI
-The config items of UI is saved in `bin/webappService.sh` (`bin\webappService.bat` for windows).
+The config items of UI is saved in `webapp/webapp.yml`.
Change `collector.ribbon.listOfServers` by following the description, with matching `naming.jetty`.
| Config | Description |
|----------------------------------|------------------------------------------------------------------------------------------------------|
| `server.port` | Port to listen on. Default: 8080 |
| `collector.ribbon.listOfServers` | Address to access collector naming service.(Consist with `naming.jetty` in `config/application.yml`). Multiple collector addresses are split by ',' |
-
+| `collector.path` | Collector query uri. Default: /graphql |
+| `collector.ribbon.ReadTimeout` | Query timeout. Default: 10 seconds |
+| `security.user.*` | Login username/password. Default: admin/admin |
### Start up collector node
1. Run `bin/startup.sh` to start collector and UI together.