You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2018/10/25 09:01:14 UTC
[GitHub] nzomkxia closed pull request #167: update dubbo admin doc
nzomkxia closed pull request #167: update dubbo admin doc
URL: https://github.com/apache/incubator-dubbo-website/pull/167
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/en-us/admin/install/admin-console.md b/docs/en-us/admin/install/admin-console.md
index 516a4f63..1963df8b 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 7e9a7158..f66b79ff 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 752e00b5..72274792 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 8d487929..639705ac 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 00000000..bbee7d7e
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 4edfa439..00000000
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 00000000..48edfcd0
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 ff0243c4..00000000
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 00000000..08f92b64
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 d10982ff..00000000
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 00000000..0005d863
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 172cebb4..00000000
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 00000000..77959059
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 5bbafe43..00000000
Binary files a/docs/en-us/admin/sources/images/dubbo-search.png and /dev/null differ
diff --git a/docs/en-us/user/demos/routing-rule.md b/docs/en-us/user/demos/routing-rule.md
index b15fa1ec..9082757e 100644
--- a/docs/en-us/user/demos/routing-rule.md
+++ b/docs/en-us/user/demos/routing-rule.md
@@ -9,7 +9,7 @@ Writing routing rules to the registry is usually done by the monitoring center o
```java
RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
Registry registry = registryFactory.getRegistry(URL.valueOf("zookeeper://10.20.153.10:2181"));
-registry.register(URL.valueOf("condition://0.0.0.0/com.foo.BarService?category=routers&dynamic=false&rule=" + URL.encode("host = 10.20.153.10 => host = 10.20.153.11") + "));
+registry.register(URL.valueOf("condition://0.0.0.0/com.foo.BarService?category=routers&dynamic=false&rule=" + URL.encode("host = 10.20.153.10 => host = 10.20.153.11")));
```
其中：
diff --git a/docs/zh-cn/admin/install/admin-console.md b/docs/zh-cn/admin/install/admin-console.md
index d93f0f72..482c6da6 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 28ab3bce..24799bdc 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 6eef8026..0c376865 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 d31f0ed3..e8df5d99 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 00000000..bbee7d7e
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 4edfa439..00000000
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 00000000..48edfcd0
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 ff0243c4..00000000
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 00000000..08f92b64
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 d10982ff..00000000
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 00000000..0005d863
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 172cebb4..00000000
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 00000000..77959059
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 5bbafe43..00000000
Binary files a/docs/zh-cn/admin/sources/images/dubbo-search.png and /dev/null differ
diff --git a/docs/zh-cn/user/demos/routing-rule.md b/docs/zh-cn/user/demos/routing-rule.md
index 24bd73c2..b840d5cb 100644
--- a/docs/zh-cn/user/demos/routing-rule.md
+++ b/docs/zh-cn/user/demos/routing-rule.md
@@ -9,7 +9,7 @@
```java
RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
Registry registry = registryFactory.getRegistry(URL.valueOf("zookeeper://10.20.153.10:2181"));
-registry.register(URL.valueOf("condition://0.0.0.0/com.foo.BarService?category=routers&dynamic=false&rule=" + URL.encode("host = 10.20.153.10 => host = 10.20.153.11") + "));
+registry.register(URL.valueOf("condition://0.0.0.0/com.foo.BarService?category=routers&dynamic=false&rule=" + URL.encode("host = 10.20.153.10 => host = 10.20.153.11")));
```
其中：
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org