This is an automated email from the ASF dual-hosted git repository.
membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 44d3bf4 doc: added a new speech link and dropped `node-status` api
doc. (#758)
44d3bf4 is described below
commit 44d3bf444530d3c2761107cb491384ed1b11ed91
Author: YuanSheng Wang <membp...@gmail.com>
AuthorDate: Wed Oct 30 16:22:03 2019 +0800
doc: added a new speech link and dropped `node-status` api doc. (#758)
---
README.md | 10 +++++---
README_CN.md | 11 ++++----
doc/admin-api-cn.md | 72 -----------------------------------------------------
3 files changed, 12 insertions(+), 81 deletions(-)
diff --git a/README.md b/README.md
index cca03e9..3be01ce 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ APISIX is installed by running the following commands in
your terminal.
sudo sh -c "$(curl -fsSL
https://raw.githubusercontent.com/apache/incubator-apisix/master/utils/install-apisix.sh)"
```
-> install the specified version via Luarock:
+> install the specified version via Luarock:
```shell
# install apisix with version v0.8
@@ -191,11 +191,13 @@ You can view the [benchmark
documentation](doc/benchmark.md) for more detailed i
[Development Documentation](doc/architecture-design.md)
-## Videos and slides
+## Videos And Articles
-- [APISIX technology selection, testing and continuous
integration(Chinese)](https://www.upyun.com/opentalk/432.html)
+- 2019.10.30 [Introduction to Apache APISIX Microservice Gateway Extreme
Performance Architecture(Chinese)](https://www.upyun.com/opentalk/440.html) .
+- 2019.8.31 [APISIX technology selection, testing and continuous
integration(Chinese)](https://www.upyun.com/opentalk/433.html) .
+- 2019.8.31 [APISIX high performance practice
2(Chinese)](https://www.upyun.com/opentalk/437.html) .
+- 2019.7.6 [APISIX high performance
practice(Chinese)](https://www.upyun.com/opentalk/429.html) .
-- [APISIX high performance
practice(Chinese)](https://www.upyun.com/opentalk/429.html)
## Who Uses APISIX?
A wide variety of companies and organizations use APISIX for research,
production and commercial product.
diff --git a/README_CN.md b/README_CN.md
index ad0fa97..1c3104f 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -118,7 +118,7 @@ APISIX 是基于 [openresty](http://openresty.org/) 之上构建的, 配置数
sudo sh -c "$(curl -fsSL
https://raw.githubusercontent.com/apache/incubator-apisix/master/utils/install-apisix.sh)"
```
-> 通过 Luarocks 安装指定的版本：
+> 通过 Luarocks 安装指定的版本：
```shell
# 安装 apisix 的 0.8 版本
@@ -175,11 +175,12 @@ Dashboard 默认允许任何 IP 访问。你可以自行修改 `conf/config.yaml
[详细设计文档](doc/architecture-design-cn.md)
-## 视频和幻灯片
+## 视频和文章
-- [APISIX 的选型、测试和持续集成](https://www.upyun.com/opentalk/432.html)
-
-- [APISIX 高性能实践](https://www.upyun.com/opentalk/429.html)
+- 2019.10.30 [Apache APISIX
微服务架构极致性能架构解析](https://www.upyun.com/opentalk/440.html) .
+- 2019.8.31 [APISIX 技术选型、测试和持续集成](https://www.upyun.com/opentalk/433.html) .
+- 2019.8.31 [APISIX 高性能实战2](https://www.upyun.com/opentalk/437.html) .
+- 2019.7.6 [APISIX 高性能实战(Chinese)](https://www.upyun.com/opentalk/429.html) .
## APISIX 的用户有哪些？
有很多公司和组织把 APISIX 用户学习、研究、生产环境和商业产品中。下面是 APISIX 的用户墙：
diff --git a/doc/admin-api-cn.md b/doc/admin-api-cn.md
index fd065dc..047b7f2 100644
--- a/doc/admin-api-cn.md
+++ b/doc/admin-api-cn.md
@@ -3,7 +3,6 @@
===
* [Route](#route)
-* [Node Status](#node-status)
## Route
@@ -70,74 +69,3 @@ Date: Sat, 31 Aug 2019 01:17:15 GMT
[Back to TOC](#目录)
-## Node Status
-
-*地址*：/apisix/admin/node_status
-
-*说明*：每 APISIX 节点固定周期定期上报状态到 etcd，该接口用于获取 APISIX 节点上报的状态。
-
-> 请求方法：
-
-|名字 |请求 uri|请求 body|说明 |
-|---------|-------------------------|--|------|
-|GET |/apisix/admin/node_status|无|获取所有节点状态|
-|GET |/apisix/admin/node_status/{node_id}|无|获取指定节点状态|
-
-> 获取所有节点
-
-```
-$ curl http://127.0.0.1:9080/apisix/admin/node_status | python -m json.tool
-
-{
- "action": "get",
- "node": {
- "createdIndex": 6896,
- "dir": true,
- "key": "/node_status",
- "modifiedIndex": 6896,
- "nodes": [
- {
- "createdIndex": 7008,
- # 不同节点 ID 会自动分配唯一标识 GUID
- "key": "/node_status/b2814906-3a01-479c-8475-4abc72089c33",
- "modifiedIndex": 7008,
- "value": {
- "accepted": "16", # 已接受的连接数
- "active": "1", # 活跃连接数
- "handled": "16", # 处理完的连接数
- "reading": "0", # 正在读的连接数
- "total": "574", # 总请求数
- "waiting": "0", # 正在等的连接数
- "writing": "1" # 正在写的连接数
- }
- }
- ]
- }
-}
-```
-
-> 获取指定节点
-
-```shell
-$ curl
http://127.0.0.1:9080/apisix/admin/node_status/b2814906-3a01-479c-8475-4abc72089c33
| python -m json.tool
-
-{
- "action": "get",
- "node": {
- "createdIndex": 7008,
- "key": "/node_status/b2814906-3a01-479c-8475-4abc72089c33",
- "modifiedIndex": 7008,
- "value": {
- "accepted": "16",
- "active": "1",
- "handled": "16",
- "reading": "0",
- "total": "574",
- "waiting": "0",
- "writing": "1"
- }
- }
-}
-```
-
-[Back to TOC](#目录)
