This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 04e4046 update dubbo admin doc (#167)
04e4046 is described below
commit 04e4046ede81ad5718a5477bc75fc1e235321647
Author: min <[email protected]>
AuthorDate: Thu Oct 25 17:01:12 2018 +0800
update dubbo admin doc (#167)
* fix routing rule mistake
* update dubbo ops doc
---
docs/en-us/admin/install/admin-console.md | 32 +++----
docs/en-us/admin/install/simple-monitor-center.md | 93 +-------------------
docs/en-us/admin/install/simple-registry-center.md | 77 -----------------
docs/en-us/admin/ops/dubbo-ops.md | 20 ++---
.../admin/sources/images/dubbo-add-config.jpg | Bin 0 -> 303596 bytes
.../admin/sources/images/dubbo-add-config.png | Bin 100926 -> 0 bytes
.../en-us/admin/sources/images/dubbo-add-route.jpg | Bin 0 -> 330146 bytes
.../en-us/admin/sources/images/dubbo-add-route.png | Bin 139777 -> 0 bytes
.../en-us/admin/sources/images/dubbo-consumers.jpg | Bin 0 -> 274307 bytes
.../en-us/admin/sources/images/dubbo-consumers.png | Bin 101859 -> 0 bytes
.../en-us/admin/sources/images/dubbo-providers.jpg | Bin 0 -> 272674 bytes
.../en-us/admin/sources/images/dubbo-providers.png | Bin 98504 -> 0 bytes
docs/en-us/admin/sources/images/dubbo-search.jpg | Bin 0 -> 224751 bytes
docs/en-us/admin/sources/images/dubbo-search.png | Bin 65761 -> 0 bytes
docs/zh-cn/admin/install/admin-console.md | 36 ++++----
docs/zh-cn/admin/install/simple-monitor-center.md | 94 +--------------------
docs/zh-cn/admin/install/simple-registry-center.md | 79 +----------------
docs/zh-cn/admin/ops/dubbo-ops.md | 23 ++---
.../admin/sources/images/dubbo-add-config.jpg | Bin 0 -> 303596 bytes
.../admin/sources/images/dubbo-add-config.png | Bin 100926 -> 0 bytes
.../zh-cn/admin/sources/images/dubbo-add-route.jpg | Bin 0 -> 330146 bytes
.../zh-cn/admin/sources/images/dubbo-add-route.png | Bin 139777 -> 0 bytes
.../zh-cn/admin/sources/images/dubbo-consumers.jpg | Bin 0 -> 274307 bytes
.../zh-cn/admin/sources/images/dubbo-consumers.png | Bin 101859 -> 0 bytes
.../zh-cn/admin/sources/images/dubbo-providers.jpg | Bin 0 -> 272674 bytes
.../zh-cn/admin/sources/images/dubbo-providers.png | Bin 98504 -> 0 bytes
docs/zh-cn/admin/sources/images/dubbo-search.jpg | Bin 0 -> 224751 bytes
docs/zh-cn/admin/sources/images/dubbo-search.png | Bin 65761 -> 0 bytes
28 files changed, 42 insertions(+), 412 deletions(-)
diff --git a/docs/en-us/admin/install/admin-console.md
b/docs/en-us/admin/install/admin-console.md
index 516a4f6..1963df8 100644
--- a/docs/en-us/admin/install/admin-console.md
+++ b/docs/en-us/admin/install/admin-console.md
@@ -1,28 +1,23 @@
# Install admin console
-Include: route rule, dynamic configuration, service downgrade, access control,
weight adjustment, load balance, etc.
+The current version of dubbo admin is under development, including: route
rule, dynamic configuration, access control, weight adjustment, load balance,
etc.
Install:
```sh
-wget
http://apache.etoak.com/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
-tar zxvf apache-tomcat-6.0.35.tar.gz
-cd apache-tomcat-6.0.35
-rm -rf webapps/ROOT
-
-git clone https://github.com/dubbo/dubbo-ops.git /var/tmp/dubbo-ops
-pushd /var/tmp/dubbo-ops
+git clone https://github.com/apache/incubator-dubbo-ops.git /var/tmp/dubbo-ops
+cd /var/tmp/dubbo-ops
mvn clean package
-popd
-
-unzip /var/tmp/dubbo-ops/dubbo-admin/target/dubbo-admin-2.0.0.war -d
webapps/ROOT
```
Configuration [^1]:
```sh
-vi webapps/ROOT/WEB-INF/dubbo.properties
-dubbo.properties
+configuration file：
+dubbo-admin-backend/src/main/resources/application.properties
+dubbo-admin-backend/src/main/resources/application-develop.properties
+dubbo-admin-backend/src/main/resources/application-production.properties
+configurations：
dubbo.registry.address=zookeeper://127.0.0.1:2181
dubbo.admin.root.password=root
dubbo.admin.guest.password=guest
@@ -31,20 +26,19 @@ dubbo.admin.guest.password=guest
Start:
```sh
-./bin/startup.sh
+mvn --projects dubbo-admin-backend spring-boot:run
```
-Stop:
+For more information, please visit:
```sh
-./bin/shutdown.sh
+https://github.com/apache/incubator-dubbo-ops
```
Visit [^2]:
```
-http://127.0.0.1:8080/
+http://127.0.0.1:8080
```
-[^1]: Or put `dubbo.properties` in current user directory
-[^2]: User: root, password: root or user: guest, password: guest
+[^1]: There's no login for current version, will be added later
\ No newline at end of file
diff --git a/docs/en-us/admin/install/simple-monitor-center.md
b/docs/en-us/admin/install/simple-monitor-center.md
index 7e9a715..f66b79f 100644
--- a/docs/en-us/admin/install/simple-monitor-center.md
+++ b/docs/en-us/admin/install/simple-monitor-center.md
@@ -1,94 +1,3 @@
# install Simple monitor center
-## Step
-
-install:
-
-```sh
-git clone https://github.com/apache/incubator-dubbo-ops
-cd incubator-dubbo-ops && mvn package
-cd dubbo-monitor-simple/target && tar xvf
dubbo-monitor-simple-2.0.0-assembly.tar.gz
-cd dubbo-monitor-simple-2.0.0
-```
-
-configuration:
-
-```sh
-vi conf/dubbo.properties
-```
-
-start:
-
-```sh
-./assembly.bin/start.sh
-```
-
-stop:
-
-```sh
-./assembly.bin/stop.sh
-```
-
-restart:
-
-```sh
-./assembly.bin/restart.sh
-```
-
-debug:
-
-```sh
-./assembly.bin/start.sh debug
-```
-
-system status:
-
-```sh
-./assembly.bin/dump.sh
-```
-
-General control entrance:
-
-```sh
-./assembly.bin/server.sh start
-./assembly.bin/server.sh stop
-./assembly.bin/server.sh restart
-./assembly.bin/server.sh debug
-./assembly.bin/server.sh dump
-```
-
-Stdout:
-
-```sh
-tail -f logs/stdout.log
-```
-
-Command line [^1]:
-
-```sh
-telnet 127.0.0.1 7070
-help
-```
-
-Or:
-
-```sh
-echo status | nc -i 1 127.0.0.1 7070
-```
-
-Visit:
-
-```
-http://127.0.0.1:8080
-```
-
-
-
-## NOTICE
-The failure of Simple Monitor will not effect on consumer and provider's
running, therefore there would be no risk in production environment
-Simple Monitor use disk to store statistics information, please focus on the
limitation of your machine. Mount share disk is recommended if cluster is needed
-
-Charts directory must be in `jetty.directory`, or it can not be accessed by
web page.
-
-[^1]: Please refer to [Telnet command reference
manual](http://dubbo.apache.org/books/dubbo-user-book-en/references/telnet.html)
-
+#### The function of monitor center will be merged to dubbo admin, based on
metrics, coming soon
\ No newline at end of file
diff --git a/docs/en-us/admin/install/simple-registry-center.md
b/docs/en-us/admin/install/simple-registry-center.md
index 752e00b..7227479 100644
--- a/docs/en-us/admin/install/simple-registry-center.md
+++ b/docs/en-us/admin/install/simple-registry-center.md
@@ -1,78 +1 @@
# install Simple configuration center
-
-Simple Registry has not been well tested, may have bug, cluster is not
supported, not recommended to use in production environment
-
-Install:
-
-```sh
-git clone https://github.com/apache/incubator-dubbo-ops
-cd incubator-dubbo-ops && mvn package
-cd dubbo-registry-simple/target && tar xvf
dubbo-registry-simple-2.0.0-assembly.tar.gz
-cd dubbo-registry-simple-2.0.0
-```
-
-Configuration:
-
-```sh
-vi conf/dubbo.properties
-```
-
-Start:
-
-```sh
-./assembly.bin/start.sh
-```
-
-Stop:
-
-```sh
-./assembly.bin/stop.sh
-```
-
-Restart:
-
-```sh
-./assembly.bin/restart.sh
-```
-
-Debug:
-
-```sh
-./assembly.bin/start.sh debug
-```
-
-System status:
-
-```sh
-./assembly.bin/dump.sh
-```
-
-General control entrance:
-```sh
-./assembly.bin/server.sh start
-./assembly.bin/server.sh stop
-./assembly.bin/server.sh restart
-./assembly.bin/server.sh debug
-./assembly.bin/server.sh dump
-```
-
-Stdout:
-
-```sh
-tail -f logs/stdout.log
-```
-
-Command line [^1]:
-
-```shell
-telnet 127.0.0.1 9090
-help
-```
-
-Or:
-
-```sh
-echo status | nc -i 1 127.0.0.1 9090
-```
-
-[^1]: Please refer to [Telnet command
manual](http://dubbo.apache.org/books/dubbo-user-book-en/references/telnet.html)
diff --git a/docs/en-us/admin/ops/dubbo-ops.md
b/docs/en-us/admin/ops/dubbo-ops.md
index 8d48792..639705a 100644
--- a/docs/en-us/admin/ops/dubbo-ops.md
+++ b/docs/en-us/admin/ops/dubbo-ops.md
@@ -4,33 +4,23 @@
If you need to manage a Dubbo service, you need to search it first and open
it's management page
-
+
## Service provider page
-
+
## Service consumer page
-
+
-## Service application page
-
## Add route rule page
-
+
## Add dynamic configuration page
-
+
-##### Service register
-##### Service downgrade
-##### Route rule
-##### Access control
-##### Dynamic configuration
-##### Weight adjustment
-##### Load balance
-##### Service owner
diff --git a/docs/en-us/admin/sources/images/dubbo-add-config.jpg
b/docs/en-us/admin/sources/images/dubbo-add-config.jpg
new file mode 100644
index 0000000..bbee7d7
Binary files /dev/null and
b/docs/en-us/admin/sources/images/dubbo-add-config.jpg differ
diff --git a/docs/en-us/admin/sources/images/dubbo-add-config.png
b/docs/en-us/admin/sources/images/dubbo-add-config.png
deleted file mode 100644
index 4edfa43..0000000
Binary files a/docs/en-us/admin/sources/images/dubbo-add-config.png and
/dev/null differ
diff --git a/docs/en-us/admin/sources/images/dubbo-add-route.jpg
b/docs/en-us/admin/sources/images/dubbo-add-route.jpg
new file mode 100644
index 0000000..48edfcd
Binary files /dev/null and
b/docs/en-us/admin/sources/images/dubbo-add-route.jpg differ
diff --git a/docs/en-us/admin/sources/images/dubbo-add-route.png
b/docs/en-us/admin/sources/images/dubbo-add-route.png
deleted file mode 100644
index ff0243c..0000000
Binary files a/docs/en-us/admin/sources/images/dubbo-add-route.png and
/dev/null differ
diff --git a/docs/en-us/admin/sources/images/dubbo-consumers.jpg
b/docs/en-us/admin/sources/images/dubbo-consumers.jpg
new file mode 100644
index 0000000..08f92b6
Binary files /dev/null and
b/docs/en-us/admin/sources/images/dubbo-consumers.jpg differ
diff --git a/docs/en-us/admin/sources/images/dubbo-consumers.png
b/docs/en-us/admin/sources/images/dubbo-consumers.png
deleted file mode 100644
index d10982f..0000000
Binary files a/docs/en-us/admin/sources/images/dubbo-consumers.png and
/dev/null differ
diff --git a/docs/en-us/admin/sources/images/dubbo-providers.jpg
b/docs/en-us/admin/sources/images/dubbo-providers.jpg
new file mode 100644
index 0000000..0005d86
Binary files /dev/null and
b/docs/en-us/admin/sources/images/dubbo-providers.jpg differ
diff --git a/docs/en-us/admin/sources/images/dubbo-providers.png
b/docs/en-us/admin/sources/images/dubbo-providers.png
deleted file mode 100644
index 172cebb..0000000
Binary files a/docs/en-us/admin/sources/images/dubbo-providers.png and
/dev/null differ
diff --git a/docs/en-us/admin/sources/images/dubbo-search.jpg
b/docs/en-us/admin/sources/images/dubbo-search.jpg
new file mode 100644
index 0000000..7795905
Binary files /dev/null and b/docs/en-us/admin/sources/images/dubbo-search.jpg
differ
diff --git a/docs/en-us/admin/sources/images/dubbo-search.png
b/docs/en-us/admin/sources/images/dubbo-search.png
deleted file mode 100644
index 5bbafe4..0000000
Binary files a/docs/en-us/admin/sources/images/dubbo-search.png and /dev/null
differ
diff --git a/docs/zh-cn/admin/install/admin-console.md
b/docs/zh-cn/admin/install/admin-console.md
index d93f0f7..482c6da 100644
--- a/docs/zh-cn/admin/install/admin-console.md
+++ b/docs/zh-cn/admin/install/admin-console.md
@@ -1,28 +1,23 @@
-# 管理控制台安装
+###管理控制台安装
-管理控制台为内部裁剪版本，开源部分主要包含：路由规则，动态配置，服务降级，访问控制，权重调整，负载均衡，等管理功能。
+目前版本的管理控制台正在开发中，已经完成了服务查询和服务治理的功能，采用前后端分离的模式，具体的安装和使用步骤如下：
安装:
```sh
-wget
http://apache.etoak.com/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
-tar zxvf apache-tomcat-6.0.35.tar.gz
-cd apache-tomcat-6.0.35
-rm -rf webapps/ROOT
-
-git clone https://github.com/dubbo/dubbo-ops.git /var/tmp/dubbo-ops
-pushd /var/tmp/dubbo-ops
+git clone https://github.com/apache/incubator-dubbo-ops.git /var/tmp/dubbo-ops
+cd /var/tmp/dubbo-ops
mvn clean package
-popd
-
-unzip /var/tmp/dubbo-ops/dubbo-admin/target/dubbo-admin-2.0.0.war -d
webapps/ROOT
```
配置 [^1]:
```sh
-vi webapps/ROOT/WEB-INF/dubbo.properties
-dubbo.properties
+目前的配置文件做了环境区分：
+dubbo-admin-backend/src/main/resources/application.properties
+dubbo-admin-backend/src/main/resources/application-develop.properties
+dubbo-admin-backend/src/main/resources/application-production.properties
+主要的配置有：
dubbo.registry.address=zookeeper://127.0.0.1:2181
dubbo.admin.root.password=root
dubbo.admin.guest.password=guest
@@ -31,20 +26,19 @@ dubbo.admin.guest.password=guest
启动:
```sh
-./bin/startup.sh
+mvn --projects dubbo-admin-backend spring-boot:run
```
-停止:
+其他配置请访问github中的文档:
```sh
-./bin/shutdown.sh
+https://github.com/apache/incubator-dubbo-ops
```
-访问 [^2]:
+访问:
```
-http://127.0.0.1:8080/
+http://127.0.0.1:8080
```
-[^1]: 或将 `dubbo.properties` 放在当前用户目录下
-[^2]: 用户: root, 密码: root 或者 用户: guest, 密码: guest
\ No newline at end of file
+[^1]: 当前版本中未实现登录功能，会在后续版本加上
diff --git a/docs/zh-cn/admin/install/simple-monitor-center.md
b/docs/zh-cn/admin/install/simple-monitor-center.md
index 28ab3bc..24799bd 100644
--- a/docs/zh-cn/admin/install/simple-monitor-center.md
+++ b/docs/zh-cn/admin/install/simple-monitor-center.md
@@ -1,95 +1,3 @@
# Simple 监控中心安装
-## 安装步骤
-
-安装:
-
-```sh
-git clone https://github.com/apache/incubator-dubbo-ops
-cd incubator-dubbo-ops && mvn package
-cd dubbo-monitor-simple/target && tar xvf
dubbo-monitor-simple-2.0.0-assembly.tar.gz
-cd dubbo-monitor-simple-2.0.0
-```
-
-配置:
-
-```sh
-vi conf/dubbo.properties
-```
-
-启动:
-
-```sh
-./assembly.bin/start.sh
-```
-
-停止:
-
-```sh
-./assembly.bin/stop.sh
-```
-
-重启:
-
-```sh
-./assembly.bin/restart.sh
-```
-
-调试:
-
-```sh
-./assembly.bin/start.sh debug
-```
-
-系统状态:
-
-```sh
-./assembly.bin/dump.sh
-```
-
-总控入口:
-
-```sh
-./assembly.bin/server.sh start
-./assembly.bin/server.sh stop
-./assembly.bin/server.sh restart
-./assembly.bin/server.sh debug
-./assembly.bin/server.sh dump
-```
-
-标准输出:
-
-```sh
-tail -f logs/stdout.log
-```
-
-命令行 [^1]:
-
-```sh
-telnet 127.0.0.1 7070
-help
-```
-
-或者:
-
-```sh
-echo status | nc -i 1 127.0.0.1 7070
-```
-
-访问:
-
-```
-http://127.0.0.1:8080
-```
-
-
-
-## 注意事项
-Simple Monitor 挂掉不会影响到 Consumer 和 Provider 之间的调用，所以用于生产环境不会有风险。
-
-Simple Monitor 采用磁盘存储统计信息，请注意安装机器的磁盘限制，如果要集群，建议用mount共享磁盘。
-
-charts 目录必须放在 `jetty.directory` 下，否则页面上访问不了。
-
-[^1]: 请参考 [Telnet
命令参考手册](http://dubbo.apache.org/books/dubbo-user-book/references/telnet.html)
-
+#### 不再单独提供监控中心，功能会整合到运维控制台，基于Metrics提供更丰富，实时的信息展示，敬请期待
\ No newline at end of file
diff --git a/docs/zh-cn/admin/install/simple-registry-center.md
b/docs/zh-cn/admin/install/simple-registry-center.md
index 6eef802..0c37686 100644
--- a/docs/zh-cn/admin/install/simple-registry-center.md
+++ b/docs/zh-cn/admin/install/simple-registry-center.md
@@ -1,79 +1,2 @@
-# Simple 注册中心安装
+# Simple 注册中心安装
-Simple Registry 没有经过严格测试，可能不健状，并且不支持集群，不建议用于生产环境。
-
-安装:
-
-```sh
-git clone https://github.com/apache/incubator-dubbo-ops
-cd incubator-dubbo-ops && mvn package
-cd dubbo-registry-simple/target && tar xvf
dubbo-registry-simple-2.0.0-assembly.tar.gz
-cd dubbo-registry-simple-2.0.0
-```
-
-配置:
-
-```sh
-vi conf/dubbo.properties
-```
-
-启动:
-
-```sh
-./assembly.bin/start.sh
-```
-
-停止:
-
-```sh
-./assembly.bin/stop.sh
-```
-
-重启:
-
-```sh
-./assembly.bin/restart.sh
-```
-
-调试:
-
-```sh
-./assembly.bin/start.sh debug
-```
-
-系统状态:
-
-```sh
-./assembly.bin/dump.sh
-```
-
-总控入口:
-
-```sh
-./assembly.bin/server.sh start
-./assembly.bin/server.sh stop
-./assembly.bin/server.sh restart
-./assembly.bin/server.sh debug
-./assembly.bin/server.sh dump
-```
-
-标准输出:
-
-```sh
-tail -f logs/stdout.log
-```
-
-命令行 [^1]:
-
-```shell
-telnet 127.0.0.1 9090
-help
-```
-
-或者:
-
-```sh
-echo status | nc -i 1 127.0.0.1 9090
-```
-
-[^1]: 请参考 [Telnet
命令参考手册](http://dubbo.apache.org/books/dubbo-user-book/references/telnet.html)
diff --git a/docs/zh-cn/admin/ops/dubbo-ops.md
b/docs/zh-cn/admin/ops/dubbo-ops.md
index d31f0ed..e8df5d9 100644
--- a/docs/zh-cn/admin/ops/dubbo-ops.md
+++ b/docs/zh-cn/admin/ops/dubbo-ops.md
@@ -4,33 +4,22 @@
当你需要管理 Dubbo 的服务时，首先要搜索到这个服务，然后打开它的管理页面
-
+
## 服务提供者页面
-
+
## 服务消费者页面
-
-
-## 服务应用页面
-
-
+
## 添加路由规则页面
-
+
## 添加动态配置页面
-
+
-##### 服务注册
-##### 服务降级
-##### 路由规则
-##### 访问控制
-##### 动态配置
-##### 权重调节
-##### 负载均衡
-##### 服务负责人
\ No newline at end of file
+#####
\ No newline at end of file
diff --git a/docs/zh-cn/admin/sources/images/dubbo-add-config.jpg
b/docs/zh-cn/admin/sources/images/dubbo-add-config.jpg
new file mode 100644
index 0000000..bbee7d7
Binary files /dev/null and
b/docs/zh-cn/admin/sources/images/dubbo-add-config.jpg differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-add-config.png
b/docs/zh-cn/admin/sources/images/dubbo-add-config.png
deleted file mode 100644
index 4edfa43..0000000
Binary files a/docs/zh-cn/admin/sources/images/dubbo-add-config.png and
/dev/null differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-add-route.jpg
b/docs/zh-cn/admin/sources/images/dubbo-add-route.jpg
new file mode 100644
index 0000000..48edfcd
Binary files /dev/null and
b/docs/zh-cn/admin/sources/images/dubbo-add-route.jpg differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-add-route.png
b/docs/zh-cn/admin/sources/images/dubbo-add-route.png
deleted file mode 100644
index ff0243c..0000000
Binary files a/docs/zh-cn/admin/sources/images/dubbo-add-route.png and
/dev/null differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-consumers.jpg
b/docs/zh-cn/admin/sources/images/dubbo-consumers.jpg
new file mode 100644
index 0000000..08f92b6
Binary files /dev/null and
b/docs/zh-cn/admin/sources/images/dubbo-consumers.jpg differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-consumers.png
b/docs/zh-cn/admin/sources/images/dubbo-consumers.png
deleted file mode 100644
index d10982f..0000000
Binary files a/docs/zh-cn/admin/sources/images/dubbo-consumers.png and
/dev/null differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-providers.jpg
b/docs/zh-cn/admin/sources/images/dubbo-providers.jpg
new file mode 100644
index 0000000..0005d86
Binary files /dev/null and
b/docs/zh-cn/admin/sources/images/dubbo-providers.jpg differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-providers.png
b/docs/zh-cn/admin/sources/images/dubbo-providers.png
deleted file mode 100644
index 172cebb..0000000
Binary files a/docs/zh-cn/admin/sources/images/dubbo-providers.png and
/dev/null differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-search.jpg
b/docs/zh-cn/admin/sources/images/dubbo-search.jpg
new file mode 100644
index 0000000..7795905
Binary files /dev/null and b/docs/zh-cn/admin/sources/images/dubbo-search.jpg
differ
diff --git a/docs/zh-cn/admin/sources/images/dubbo-search.png
b/docs/zh-cn/admin/sources/images/dubbo-search.png
deleted file mode 100644
index 5bbafe4..0000000
Binary files a/docs/zh-cn/admin/sources/images/dubbo-search.png and /dev/null
differ
