[GitHub] [apisix] Firstsawyou commented on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


Firstsawyou commented on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731524773


   > Hi, Where can these matching rules be used？Can you give some examples?
   
   This is a related issue that needs to use these rules：
   https://github.com/apache/apisix/issues/2511 
   https://github.com/apache/apisix/issues/2303
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] Firstsawyou commented on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


Firstsawyou commented on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731524200


   > > But these rules are in the apisix/deps/share/lua/5.1/resty/radixtree.lua 
file, not in the public method.
   > 
   > @Firstsawyou I am not get your point.
   
   What I mean is that we can't reuse the matching rules in radixtree.lua, 
because his definition is local.
   The matching rule definition in radixtree.lua:
   
   ```lua
   local compare_funcs = {
   ["=="] = function (l_v, r_v)
   if type(r_v) == "number" then
   l_v = tonumber(l_v)
   if not l_v then
   return false
   end
   end
   return l_v == r_v
   end,
   ["~="] = function (l_v, r_v)
   return l_v ~= r_v
   end,
   [">"] = function (l_v, r_v)
   l_v = tonumber(l_v)
   r_v = tonumber(r_v)
   if not l_v or not r_v then
   return false
   end
   return l_v > r_v
   end,
   ["<"] = function (l_v, r_v)
   l_v = tonumber(l_v)
   r_v = tonumber(r_v)
   if not l_v or not r_v then
   return false
   end
   return l_v < r_v
   end,
   ["~~"] = function (l_v, r_v)
   local from = re_find(l_v, r_v, "jo")
   if from then
   return true
   end
   return false
   end,
   ["IN"] = in_array,
   ["in"] = in_array,
   }
   ```



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] tokers edited a comment on issue #2796: request help: helm charts for 2.1

2020-11-20 Thread GitBox 


tokers edited a comment on issue #2796:
URL: https://github.com/apache/apisix/issues/2796#issuecomment-731523733


   Yeah, Apache Kafka is also in there @moonming .



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] tokers commented on issue #2796: request help: helm charts for 2.1

2020-11-20 Thread GitBox 


tokers commented on issue #2796:
URL: https://github.com/apache/apisix/issues/2796#issuecomment-731523733


   Yeah, Apache Kafka is also in there.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-website] juzhiyuan opened a new issue #90: Support Google Analytics

2020-11-20 Thread GitBox 


juzhiyuan opened a new issue #90:
URL: https://github.com/apache/apisix-website/issues/90


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] 1731lin opened a new issue #2812: bug: about wolf-rbac get token problem

2020-11-20 Thread GitBox 


1731lin opened a new issue #2812:
URL: https://github.com/apache/apisix/issues/2812


   ### Issue description
   [root@localhost example]# curl 
http://127.0.0.1:9080/apisix/plugin/wolf-rbac/login -i -H "Content-Type: 
application/json" -d '{"appid": "restful-demo", "username":"root", 
"password":"wolf-123456"}'
   HTTP/1.1 500 Internal Server Error
   Date: Sat, 21 Nov 2020 03:43:33 GMT
   Content-Type: text/plain
   Transfer-Encoding: chunked
   Connection: keep-alive
   Server: APISIX web server
   
   {"message":"request to wolf-server failed! connection refused"}
   
   ### Environment
   
   * apisix version (cmd: `apisix version`):1.5
   * OS:centos7
   
   ### Minimal test code / Steps to reproduce the issue
   1.https://github.com/vinsonzou/apisix-plugin-rbac
   2.
   3.
   
   ### What's the actual result? (including assertion message & call stack if 
applicable)
   
   I followed the github steps and I had this problem,{"message":"request to 
wolf-server failed! connection refused"}
   
   ### What's the expected result?
   get token
   
{"rbac_token":"V1#restful#eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NzQ5LCJ1c2VybmFtZSI6InRlc3QiLCJtYW5hZ2VyIjoiIiwiYXBwaWQiOiJyZXN0ZnVsIiwiaWF0IjoxNTc4ODIzNzQ3LCJleHAiOjE1Nzk0Mjg1NDd9.4rGPHv9hWPZ4G0p2F82gQciY8WIE2qdYNvAT_22X_Co","user_info":{"nickname":"test","username":"test","id":"749"}}



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen commented on pull request #844: feat: add a unit test for consumer and remove implicit init

2020-11-20 Thread GitBox 


nic-chen commented on pull request #844:
URL: https://github.com/apache/apisix-dashboard/pull/844#issuecomment-731515599


   Good job.Thanks.
   
   We need to enable CI for v2.1 to test.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen commented on issue #837: [Proposal]: Refactor Route publish and offline

2020-11-20 Thread GitBox 


nic-chen commented on issue #837:
URL: 
https://github.com/apache/apisix-dashboard/issues/837#issuecomment-731514856


   LGTM



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch juzhiyuan-patch-1 updated (c8f616d -> c32d80d)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


from c8f616d  Update deploy.md
 add c32d80d  Update deploy.zh-CN.md

No new revisions were added by this update.

Summary of changes:
 docs/deploy.zh-CN.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[GitHub] [apisix-dashboard] juzhiyuan opened a new pull request #845: feat(docs): update deploy

2020-11-20 Thread GitBox 


juzhiyuan opened a new pull request #845:
URL: https://github.com/apache/apisix-dashboard/pull/845


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [x] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   
   - Related issues
   
   resolve #843 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] 01/01: Update deploy.md

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git

commit c8f616d0d37f92816cc34b09655cc15816f64557
Author: 琚致远 
AuthorDate: Sat Nov 21 13:42:58 2020 +0800

Update deploy.md
---
 docs/deploy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy.md b/docs/deploy.md
index 1bb75e7..32e7f9f 100644
--- a/docs/deploy.md
+++ b/docs/deploy.md
@@ -75,7 +75,7 @@ $ cd ./output
 $ ./manager-api
 
 # or running in background
-$ ./manager-api &
+$ nohup ./manager-api &
 ```
 
 4. Without changing the configuration, visit `http://127.0.0.1:8080` to use 
the dashboard with GUI, where the default username and password are `admin`.

[apisix-dashboard] branch juzhiyuan-patch-1 created (now c8f616d)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


  at c8f616d  Update deploy.md

This branch includes the following new commits:

 new c8f616d  Update deploy.md

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[apisix-dashboard] branch v2.1 updated: Revert "Update deploy.md"

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch v2.1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/v2.1 by this push:
 new 4416e3d  Revert "Update deploy.md"
4416e3d is described below

commit 4416e3d7e257889e1c5ca8ac35b7b6137960127c
Author: juzhiyuan 
AuthorDate: Sat Nov 21 13:41:56 2020 +0800

Revert "Update deploy.md"

This reverts commit 58b24f041d05a5ec7cf6291b8969d739297fc404.
---
 docs/deploy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy.md b/docs/deploy.md
index 32e7f9f..1bb75e7 100644
--- a/docs/deploy.md
+++ b/docs/deploy.md
@@ -75,7 +75,7 @@ $ cd ./output
 $ ./manager-api
 
 # or running in background
-$ nohup ./manager-api &
+$ ./manager-api &
 ```
 
 4. Without changing the configuration, visit `http://127.0.0.1:8080` to use 
the dashboard with GUI, where the default username and password are `admin`.

[GitHub] [apisix-dashboard] ShiningRush opened a new pull request #844: feat: add a unit test for consumer and remove implicit init

2020-11-20 Thread GitBox 


ShiningRush opened a new pull request #844:
URL: https://github.com/apache/apisix-dashboard/pull/844


   - add a real unit test for consumer `Get`
   - remove implicit init function, go is not recommended.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch v2.1 updated: Update deploy.md

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch v2.1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/v2.1 by this push:
 new 58b24f0  Update deploy.md
58b24f0 is described below

commit 58b24f041d05a5ec7cf6291b8969d739297fc404
Author: 琚致远 
AuthorDate: Sat Nov 21 13:40:27 2020 +0800

Update deploy.md
---
 docs/deploy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy.md b/docs/deploy.md
index 1bb75e7..32e7f9f 100644
--- a/docs/deploy.md
+++ b/docs/deploy.md
@@ -75,7 +75,7 @@ $ cd ./output
 $ ./manager-api
 
 # or running in background
-$ ./manager-api &
+$ nohup ./manager-api &
 ```
 
 4. Without changing the configuration, visit `http://127.0.0.1:8080` to use 
the dashboard with GUI, where the default username and password are `admin`.

[apisix-website] branch juzhiyuan-patch-2 updated (8afa43f -> 205f74e)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-2
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from 8afa43f  Update download.md
 add 205f74e  Update download.md

No new revisions were added by this update.

Summary of changes:
 docs/download.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[GitHub] [apisix-website] juzhiyuan opened a new pull request #89: feat: added dashboard 2.0

2020-11-20 Thread GitBox 


juzhiyuan opened a new pull request #89:
URL: https://github.com/apache/apisix-website/pull/89


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-website] 01/01: Update download.md

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch juzhiyuan-patch-2
in repository https://gitbox.apache.org/repos/asf/apisix-website.git

commit 8afa43fae77467fd5cdfc0e4c8bd40d27daa6587
Author: 琚致远 
AuthorDate: Sat Nov 21 13:21:26 2020 +0800

Update download.md
---
 docs/download.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/download.md b/docs/download.md
index 98d761d..eeac428 100644
--- a/docs/download.md
+++ b/docs/download.md
@@ -27,6 +27,7 @@ Use the links below to download the Apache APISIX™ from one 
of our mirrors.
 | Version | Release Date | Downloads   



|
 | --- |  | 
---
 |
 | 1.5 | 12/08/2020   | 
[source](https://www.apache.org/dyn/closer.cgi/apisix/dashboard-1.5/apache-apisix-dashboard-1.5.tar.gz)
 
([asc](https://downloads.apache.org/apisix/dashboard-1.5/apache-apisix-dashboard-1.5.tar.gz.asc)
 
[sha512](https://downloads.apache.org/apisix/dashboard-1.5/apache-apisix-dashboard-1.5.tar.gz.sha512))
 |
+| 2.0 | 20/11/2020   | 
[source](https://www.apache.org/dyn/closer.cgi/apisix/dashboard-2.0/apache-apisix-dashboard-2.0.tar.gz)
 
([asc](https://downloads.apache.org/apisix/dashboard-2.0/apache-apisix-dashboard-2.0.tar.gz.asc)
 
[sha512](https://downloads.apache.org/apisix/dashboard-2.0/apache-apisix-dashboard-2.0.tar.gz.sha512))
 |
 
 ## Verify the releases

[apisix-website] branch juzhiyuan-patch-2 created (now 8afa43f)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-2
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


  at 8afa43f  Update download.md

This branch includes the following new commits:

 new 8afa43f  Update download.md

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[GitHub] [apisix] cleverpig commented on issue #1773: bug: skywalking service register failed

2020-11-20 Thread GitBox 


cleverpig commented on issue #1773:
URL: https://github.com/apache/apisix/issues/1773#issuecomment-731510760


   > 2.0 supports skywalking 7.0, and the master supports skywalking 8.0
   
   I checked out the master which works with skywalking8.0.After make deps and 
config, it ran up!
   
   And here is a problem -- skywalking plugin doen't work.
   I configed apache httpd as a simple http backend service in apisix dashboard.
   
![image](https://user-images.githubusercontent.com/580435/99868188-3f141b00-2bfb-11eb-996f-b44d87e8130a.png)
   
   
![image](https://user-images.githubusercontent.com/580435/99868199-4b987380-2bfb-11eb-9ac9-9e7346b647fa.png)
   
   But I can't find this endpoint information in skywalking dashboard.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander commented on issue #2810: [DISCUSS]: allow user to specify APISIX id in config.yaml

2020-11-20 Thread GitBox 


spacewander commented on issue #2810:
URL: https://github.com/apache/apisix/issues/2810#issuecomment-731509950


   > 
   > 
   > It would be better to support vars.
   
   I am confusing. `vars` is already supported: 
https://github.com/apache/apisix/pull/2743



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen opened a new issue #843: docs: remind users to use correct way to run `manager api` in background

2020-11-20 Thread GitBox 


nic-chen opened a new issue #843:
URL: https://github.com/apache/apisix-dashboard/issues/843


   
   remind users that should use 
   
   ```sh
   $ nohup ./manager-api &
   ``` 
   
   instead of 
   
   ```sh
   $ ./manager-api &
   ``` 
   to run `manager api`, otherwise it will automatically exit after the 
terminal closed。



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] moonming commented on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


moonming commented on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731506870


   > But these rules are in the apisix/deps/share/lua/5.1/resty/radixtree.lua 
file, not in the public method. 
   
   @Firstsawyou I am not get your point. 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] moonming commented on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


moonming commented on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731506793


   > Maybe we can move the matching rules to a separate repo, so that we can 
also use this to satisfy 
[api7/lua-resty-radixtree#74](https://github.com/api7/lua-resty-radixtree/issues/74)
   
   agreed, router already support match rules.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] juzhiyuan commented on pull request #2802: refactor: separate admin and proxy port in default config

2020-11-20 Thread GitBox 


juzhiyuan commented on pull request #2802:
URL: https://github.com/apache/apisix/pull/2802#issuecomment-731506694


   > @juzhiyuan 
   > ` conf/config-default.yaml` is changed.
   
   Oh yes!



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] juzhiyuan commented on issue #2737: Proposal: Support enable/disable route

2020-11-20 Thread GitBox 


juzhiyuan commented on issue #2737:
URL: https://github.com/apache/apisix/issues/2737#issuecomment-731506466


   I would prefer using standalone field, for labels are used to add 
description for target. 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] tokers commented on issue #2810: [DISCUSS]: allow user to specify APISIX id in config.yaml

2020-11-20 Thread GitBox 


tokers commented on issue #2810:
URL: https://github.com/apache/apisix/issues/2810#issuecomment-731501131


   It would be better to support vars.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander opened a new pull request #2811: feat: allow whitespace-wrapped variables in config.yaml

2020-11-20 Thread GitBox 


spacewander opened a new pull request #2811:
URL: https://github.com/apache/apisix/pull/2811


   ### What this PR does / why we need it:
   
   
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [x] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [x] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander opened a new issue #2810: [DISCUSS]: allow user to specify APISIX id in config.yaml

2020-11-20 Thread GitBox 


spacewander opened a new issue #2810:
URL: https://github.com/apache/apisix/issues/2810


   Currently, the id of APISIX is generated UUID, which can't be controlled by 
the user. I think it would be good to allow user to specify a meaningful id to 
bind APISIX instance with their internal system.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander commented on pull request #2802: refactor: separate admin and proxy port in default config

2020-11-20 Thread GitBox 


spacewander commented on pull request #2802:
URL: https://github.com/apache/apisix/pull/2802#issuecomment-731496840


   @juzhiyuan 
   ` conf/config-default.yaml` is changed.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] moonming commented on pull request #2805: docs: remove non existing image

2020-11-20 Thread GitBox 


moonming commented on pull request #2805:
URL: https://github.com/apache/apisix/pull/2805#issuecomment-731494021


   English only is good for us



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] starsz commented on issue #2808: bug: example about how to enable Stream proxy is wrong

2020-11-20 Thread GitBox 


starsz commented on issue #2808:
URL: https://github.com/apache/apisix/issues/2808#issuecomment-731493387


   Hi, I think the doc had made a mistake on the YAML grammar.
   
   `127.0.0.1:9101`'s type is a string, so quotes should be used on this.
   
   Like this:
   
   ```
   apisix:
 stream_proxy: # TCP/UDP proxy
   tcp:# TCP proxy address list
 - 9100
 - "127.0.0.1:9101"
   udp:# UDP proxy address list
 - 9200
 - "127.0.0.1:9211"
   ```
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander merged pull request #2805: docs: remove non existing image

2020-11-20 Thread GitBox 


spacewander merged pull request #2805:
URL: https://github.com/apache/apisix/pull/2805


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander commented on pull request #2802: refactor: separate admin and proxy port in default config

2020-11-20 Thread GitBox 


spacewander commented on pull request #2802:
URL: https://github.com/apache/apisix/pull/2802#issuecomment-731492583


   Note: merge it after 2.1 is released and works well.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander commented on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


spacewander commented on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731492268


   Maybe we can move the matching rules to a separate repo, so that we can also 
use this to satisfy https://github.com/api7/lua-resty-radixtree/issues/74 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander merged pull request #2806: docs: fixed typo from zh-cn/plugins/prometheus.md

2020-11-20 Thread GitBox 


spacewander merged pull request #2806:
URL: https://github.com/apache/apisix/pull/2806


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch master updated: docs: fix typo from zh-cn/plugins/prometheus.md (#2806)

2020-11-20 Thread spacewander 
This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
 new 7780fe4  docs: fix typo from zh-cn/plugins/prometheus.md (#2806)
7780fe4 is described below

commit 7780fe4e24873742b08a2f440780eec4a55f5e2a
Author: idbeta 
AuthorDate: Sat Nov 21 10:17:39 2020 +0800

docs: fix typo from zh-cn/plugins/prometheus.md (#2806)
---
 doc/zh-cn/plugins/prometheus.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/zh-cn/plugins/prometheus.md b/doc/zh-cn/plugins/prometheus.md
index 8f89b06..826e45a 100644
--- a/doc/zh-cn/plugins/prometheus.md
+++ b/doc/zh-cn/plugins/prometheus.md
@@ -69,7 +69,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 
'X-API-KEY: edd1c9f034335f13
 curl -i http://127.0.0.1:9080/apisix/prometheus/metrics
 ```
 
-把改uri地址配置到 prometheus 中去,就会自动完成指标数据提取.
+把该uri地址配置到 prometheus 中去,就会自动完成指标数据提取.
 
 例子如下:

[GitHub] [apisix] starsz edited a comment on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


starsz edited a comment on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731487613


   Hi, Where can these matching rules be used？Can you give some examples?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] starsz commented on issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


starsz commented on issue #2809:
URL: https://github.com/apache/apisix/issues/2809#issuecomment-731487613


   Where can these matching rules be used？Can you give some examples?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen opened a new issue #842: feat: support run `manager api` as OS service

2020-11-20 Thread GitBox 


nic-chen opened a new issue #842:
URL: https://github.com/apache/apisix-dashboard/issues/842


   Please answer these questions before submitting your issue.
   
   - Why do you submit this issue?
   - [ ] Question or discussion
   - [ ] Bug
   - [ ] Requirements
   - [x] Feature or performance improvement
   - [ ] Other
   
   
   ___
   ### Requirements or improvement
   - Please describe your requirements or improvement suggestions.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen commented on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


nic-chen commented on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731465031


   @liubinqi2007
   please confirm the result and then share here, thanks.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen edited a comment on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


nic-chen edited a comment on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731122015


   @liubinqi2007 
   could you contact my QQ ? Which talk more conveniently



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] Firstsawyou opened a new issue #2809: [DISCUSS]: add vars matching rules to public methods

2020-11-20 Thread GitBox 


Firstsawyou opened a new issue #2809:
URL: https://github.com/apache/apisix/issues/2809


   ### Issue description
   
   We all know that apisix supports vars matching rules, similar to this: {var, 
operator, val}. But these rules are in the 
`apisix/deps/share/lua/5.1/resty/radixtree.lua` file, not in the public method. 
Therefore, we cannot reuse these rules. The `match` rule is a very useful 
feature. If we add the `match` rule to the `apisix/apisix/core` module, I think 
it must be very interesting.
   
   Examples of vars matching:
   
   ```
   [ "arg_name", "==", "rose" ],
   [ "http_appKey", "~~", "[a-z].+" ]
   [ "server_port", ">=", "80" ]
   ```
   
   Supported operators: `==, ~=, ~~, >, >=, <, <=, ip, ip_in`
   
   ### Operator list
   
   | Operator  | Description   | Example |
   |---|---|-|
   | ==| equal | {"arg_name", "==", "json"}  |
   | ~=| not equal to  | {"arg_name", "~=", "json"}  |
   | ~~| Regular match | {"arg_name", "~~", "[a-z]+"}|
   | < | Less than | {"arg_age", "<", 24}|
   | <=| Less than or equal to | {"arg_age", "<=", 24}   |
   | > | more than the | {"arg_age", ">", 24}|
   | >=| greater or equal to   | {"arg_age", ">=", 24}   |
   
   what do you think? Welcome to discuss together.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #598: release: release 2.0-rc version.

2020-11-20 Thread GitBox 


codecov-io edited a comment on pull request #598:
URL: https://github.com/apache/apisix-dashboard/pull/598#issuecomment-720791397


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/598?src=pr=h1) 
Report
   > :exclamation: No coverage uploaded for pull request base 
(`master@a050e84`). [Click here to learn what that 
means](https://docs.codecov.io/docs/error-reference#section-missing-base-commit).
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/598/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/598?src=pr=tree)
   
   ```diff
   @@Coverage Diff@@
   ## master #598   +/-   ##
   =
 Coverage  ?   42.64%   
   =
 Files ?   18   
 Lines ? 1257   
 Branches  ?0   
   =
 Hits  ?  536   
 Misses?  630   
 Partials  ?   91   
   ```
   
   
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/598?src=pr=continue).
   > **Legend** - [Click here to learn 
more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute  (impact)`, `ø = not affected`, `? = missing data`
   > Powered by 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/598?src=pr=footer).
 Last update 
[a050e84...f01874c](https://codecov.io/gh/apache/apisix-dashboard/pull/598?src=pr=lastupdated).
 Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] ShiningRush merged pull request #841: fix: revert unexpected PR

2020-11-20 Thread GitBox 


ShiningRush merged pull request #841:
URL: https://github.com/apache/apisix-dashboard/pull/841


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch v2.0 updated (355c74e -> f01874c)

2020-11-20 Thread vinci 
This is an automated email from the ASF dual-hosted git repository.

vinci pushed a change to branch v2.0
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


from 355c74e  append license
 add f01874c  revert unreviewed pr (#841)

No new revisions were added by this update.

Summary of changes:
 api/conf/conf.go   |  2 +-
 api/internal/core/store/store_mock.go  | 51 --
 api/internal/handler/consumer/consumer_test.go | 51 --
 api/log/zap.go |  2 +-
 api/main.go|  3 +-
 5 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 api/internal/core/store/store_mock.go

[GitHub] [apisix] idbeta opened a new issue #2808: bug: example about how to enable Stream proxy is wrong

2020-11-20 Thread GitBox 


idbeta opened a new issue #2808:
URL: https://github.com/apache/apisix/issues/2808


   ### Issue description
   ```
   apisix:
 stream_proxy: # TCP/UDP proxy
   tcp:# TCP proxy address list
 - 9100
 - 127.0.0.1:9101
   udp:# UDP proxy address list
 - 9200
 - 127.0.0.1:9211
   ```
   should be 
   ```
   apisix:
 stream_proxy: # TCP/UDP proxy
   tcp:# TCP proxy port list
 - 9100
 - 9101
   udp:# UDP proxy port list
 - 9200
 - 9211
   ```
   otherwise
   ```
   nginx: [error] init_by_lua error: 
.../apisix//deps/share/lua/5.1/tinyyaml.lua:641: failed to classify line:   
  127.0.0.1:9101
   stack traceback:
[C]: in function 'error'
.../apisix//deps/share/lua/5.1/tinyyaml.lua:641: in function 'parsemap'
   ```
   ### Environment
   
   * apisix version (cmd: `apisix version`): master
   * OS:
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] Firstsawyou opened a new pull request #2807: feat: the key field should be optional.

2020-11-20 Thread GitBox 


Firstsawyou opened a new pull request #2807:
URL: https://github.com/apache/apisix/pull/2807


fix #2778
   
   ### What this PR does / why we need it:
   
   
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [x] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [x] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] idbeta opened a new pull request #2806: docs: fixed typo from zh-cn/plugins/prometheus.md

2020-11-20 Thread GitBox 


idbeta opened a new pull request #2806:
URL: https://github.com/apache/apisix/pull/2806


   fixed typo from zh-cn/plugins/prometheus.md



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] codecov-io commented on pull request #841: fix: revert unexpected PR

2020-11-20 Thread GitBox 


codecov-io commented on pull request #841:
URL: https://github.com/apache/apisix-dashboard/pull/841#issuecomment-731219907


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/841?src=pr=h1) 
Report
   > :exclamation: No coverage uploaded for pull request base (`v2.0@355c74e`). 
[Click here to learn what that 
means](https://docs.codecov.io/docs/error-reference#section-missing-base-commit).
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/841/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/841?src=pr=tree)
   
   ```diff
   @@   Coverage Diff   @@
   ## v2.0 #841   +/-   ##
   ===
 Coverage?   42.56%   
   ===
 Files   ?   18   
 Lines   ? 1257   
 Branches?0   
   ===
 Hits?  535   
 Misses  ?  631   
 Partials?   91   
   ```
   
   
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/841?src=pr=continue).
   > **Legend** - [Click here to learn 
more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute  (impact)`, `ø = not affected`, `? = missing data`
   > Powered by 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/841?src=pr=footer).
 Last update 
[355c74e...4278c11](https://codecov.io/gh/apache/apisix-dashboard/pull/841?src=pr=lastupdated).
 Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] ShiningRush opened a new pull request #841: fix: revert expected PR

2020-11-20 Thread GitBox 


ShiningRush opened a new pull request #841:
URL: https://github.com/apache/apisix-dashboard/pull/841


   This [PR](#840) is unapproved, revert it first



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch v2.0 updated (787729c -> 355c74e)

2020-11-20 Thread vinci 
This is an automated email from the ASF dual-hosted git repository.

vinci pushed a change to branch v2.0
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


 discard 787729c  Revert "Revert "test: add consumer e2e test (#735)" (#829)"

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/v2.0 (355c74e)
\
 O -- O -- O   (787729c)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 api/test/e2e/base.go  |   6 --
 api/test/e2e/consumer_test.go | 241 --
 2 files changed, 247 deletions(-)
 delete mode 100644 api/test/e2e/consumer_test.go

[GitHub] [apisix-dashboard] moonming commented on issue #835: [Proposal]: Refactor route debug online

2020-11-20 Thread GitBox 


moonming commented on issue #835:
URL: 
https://github.com/apache/apisix-dashboard/issues/835#issuecomment-731193452


   how about postman？
   
   liuxiran 于2020年11月20日 周五下午8:42写道：
   
   > yes, I'm also looking for a suitable lib to implement this feature, If I
   > find the suitable one, or we have a good recommendation, use lib is the
   > preferred option :)
   >
   > cc @juzhiyuan  @moonming
   > 
   >
   > —
   > You are receiving this because you were mentioned.
   >
   >
   > Reply to this email directly, view it on GitHub
   > 
,
   > or unsubscribe
   > 

   > .
   >
   -- 
   Thanks,
   Ming Wen
   Twitter: _WenMing
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] moonming commented on issue #2796: request help: helm charts for 2.1

2020-11-20 Thread GitBox 


moonming commented on issue #2796:
URL: https://github.com/apache/apisix/issues/2796#issuecomment-731193085


   I'm not sure whether the Apache project can be added to it, can you help to
   see if there are other Apache projects in it?
   
   Alex Zhang 于2020年11月20日 周五下午8:21写道：
   
   > @membphis  @gxthrj
   >  @moonming  What
   > about adding the chart to https://github.com/bitnami/charts?
   >
   > —
   > You are receiving this because you were mentioned.
   > Reply to this email directly, view it on GitHub
   > , or
   > unsubscribe
   > 

   > .
   >
   -- 
   Thanks,
   Ming Wen
   Twitter: _WenMing
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] ShiningRush commented on pull request #840: feat: add a hanlder unit test for upstream and remove init

2020-11-20 Thread GitBox 


ShiningRush commented on pull request #840:
URL: https://github.com/apache/apisix-dashboard/pull/840#issuecomment-731162039


   Oh,it is automatically merged?what happened...
   Maybe my misoperation : (



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] ShiningRush merged pull request #840: feat: add a hanlder unit test for upstream and remove init

2020-11-20 Thread GitBox 


ShiningRush merged pull request #840:
URL: https://github.com/apache/apisix-dashboard/pull/840


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch v2.0 updated (f2ff23a -> 355c74e)

2020-11-20 Thread vinci 
This is an automated email from the ASF dual-hosted git repository.

vinci pushed a change to branch v2.0
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


from f2ff23a  Revert "test: add consumer e2e test (#735)" (#829)
 add 8a1da59  feat: add a hanlder unit test for upstream and remove init
 add 355c74e  append license

No new revisions were added by this update.

Summary of changes:
 api/conf/conf.go   |  2 +-
 .../api_error.go => core/store/store_mock.go}  | 45 +--
 api/internal/handler/consumer/consumer_test.go | 51 ++
 api/log/zap.go |  2 +-
 api/main.go|  3 +-
 5 files changed, 76 insertions(+), 27 deletions(-)
 copy api/internal/{utils/consts/api_error.go => core/store/store_mock.go} (51%)

[GitHub] [apisix-dashboard] ShiningRush opened a new pull request #840: feat: add a hanlder unit test for upstream and remove init

2020-11-20 Thread GitBox 


ShiningRush opened a new pull request #840:
URL: https://github.com/apache/apisix-dashboard/pull/840


   This pr is a demo about how to do a real `unit test` in handler.
   I also remove the `init` in `conf` and `log`, go is recommended to use 
explicit initial function instead of implicit `init`



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] membphis commented on pull request #811: feat: support etcd username&

2020-11-20 Thread GitBox 


membphis commented on pull request #811:
URL: https://github.com/apache/apisix-dashboard/pull/811#issuecomment-731148659


   @qiqizjl please add test case



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] liuxiran commented on issue #835: [Proposal]: Refactor route debug online

2020-11-20 Thread GitBox 


liuxiran commented on issue #835:
URL: 
https://github.com/apache/apisix-dashboard/issues/835#issuecomment-731148405


   yes, I'm also looking for a suitable lib to implement this feature, If I 
find the suitable one, or we have a good recommendation, use lib is the 
preferred option :)
   
   cc @juzhiyuan  @moonming 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] membphis commented on issue #839: feat: support to connect etcd with `username` and `password`

2020-11-20 Thread GitBox 


membphis commented on issue #839:
URL: 
https://github.com/apache/apisix-dashboard/issues/839#issuecomment-731148419


   related PR: https://github.com/apache/apisix-dashboard/pull/811



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] membphis opened a new issue #839: feat: support to connect etcd with `username` and `password`

2020-11-20 Thread GitBox 


membphis opened a new issue #839:
URL: https://github.com/apache/apisix-dashboard/issues/839


   `etcd` can specify access username/password and assign different 
permissions, which is more secure.
   
   `manager-api` needs to support this feature.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] tokers commented on issue #838: Bug: Add defer recover for all go routines to prevent abnormal crash of manager-api

2020-11-20 Thread GitBox 


tokers commented on issue #838:
URL: 
https://github.com/apache/apisix-dashboard/issues/838#issuecomment-731145714


   We may use 
https://github.com/kubernetes/apimachinery/blob/master/pkg/util/runtime/runtime.go#L45
 to handle it.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] gxthrj opened a new issue #838: Bug: Add defer recover for all go routines to prevent abnormal crash of manager-api

2020-11-20 Thread GitBox 


gxthrj opened a new issue #838:
URL: https://github.com/apache/apisix-dashboard/issues/838


   Please answer these questions before submitting your issue.
   
   - Why do you submit this issue?
   - [ ] Question or discussion
   - [x] Bug
   - [ ] Requirements
   - [ ] Feature or performance improvement
   - [ ] Other
   
   ___
   ### Bug
   - Which version of Apache APISIX Dashboard, OS, and Browser?
   2.0
   
   - What happened?
   Manager-api may crash without any logs.
   In gin, we use `filter.RecoverHandler()` to prevent crash. 
   But we can not control the exceptions in other go-routines.
   Need to add `defer recover()` for all go routines to prevent abnormal crash 
of manager-api .
   
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] tokers commented on issue #2796: request help: helm charts for 2.1

2020-11-20 Thread GitBox 


tokers commented on issue #2796:
URL: https://github.com/apache/apisix/issues/2796#issuecomment-731138372


   @membphis @gxthrj @moonming What about adding the chart to 
https://github.com/bitnami/charts?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch master updated: docs: add missing fields in SSL API (#2804)

2020-11-20 Thread spacewander 
This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
 new 2622e38  docs: add missing fields in SSL API (#2804)
2622e38 is described below

commit 2622e38ae0d155bf2ab5bb5bd845d7814046a621
Author: 罗泽轩 
AuthorDate: Fri Nov 20 20:08:50 2020 +0800

docs: add missing fields in SSL API (#2804)
---
 doc/admin-api.md   | 8 +---
 doc/zh-cn/admin-api.md | 6 --
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/admin-api.md b/doc/admin-api.md
index 22faa50..51e70c5 100644
--- a/doc/admin-api.md
+++ b/doc/admin-api.md
@@ -658,8 +658,10 @@ Return response from etcd currently.
 
 |Parameter  |Required   |Type |Description|Example|
 |-|-||---||
-|cert|True|Public key|https Public key||
-|key|True|Private key|https Private key||
+|cert|True|Certificate|https certificate||
+|key|True|Private key|https private key||
+|certs|False|An array of certificate|when you need to configure multiple 
certificate for the same domain, you can pass extra https certificates 
(excluding the one given as cert) in this field||
+|keys|False|An array of private key|https private keys. The keys should be 
paired with certs above||
 |sni|True|Match Rules|https SNI||
 |labels|False |Match Rules|Key/value pairs to specify 
attributes|{"version":"v2","build":"16","env":"production"}|
 |create_time|False| Auxiliary|epoch timestamp in second, will be created 
automatically if missing | 1602883670|
@@ -670,7 +672,7 @@ Config Example:
 ```shell
 {
 "id": "1",  # id
-"cert": "cert", # Public key
+"cert": "cert", # Certificate
 "key": "key",   # Private key
 "sni": "sni"# https SNI
 }
diff --git a/doc/zh-cn/admin-api.md b/doc/zh-cn/admin-api.md
index a126e1c..5dae7d5 100644
--- a/doc/zh-cn/admin-api.md
+++ b/doc/zh-cn/admin-api.md
@@ -671,8 +671,10 @@ HTTP/1.1 200 OK
 
 |名字  |可选项   |类型 |说明|示例|
 |-|-||---||
-|cert|必需|公钥|https 证书公钥||
+|cert|必需|证书|https 证书||
 |key|必需|私钥|https 证书私钥||
+|certs|可选|证书字符串数组|当你想给同一个域名配置多个证书时，除了第一个证书需要通过cert传递外，剩下的证书可以通过该参数传递上来||
+|keys|可选|私钥字符串数组|certs 对应的证书私钥，注意要跟 certs 一一对应||
 |sni|必需|匹配规则|https 证书SNI||
 |labels|可选|匹配规则|标识附加属性的键值对|{"version":"v2","build":"16","env":"production"}|
 |create_time|可选|辅助|单位为秒的 epoch 时间戳，如果不指定则自动创建|1602883670|
@@ -683,7 +685,7 @@ ssl 对象 json 配置内容：
 ```shell
 {
 "id": "1",  # id
-"cert": "cert", # 公钥
+"cert": "cert", # 证书
 "key": "key",   # 私钥
 "sni": "sni"# host 域名
 }

[GitHub] [apisix] spacewander merged pull request #2804: docs: add missing fields in SSL API

2020-11-20 Thread GitBox 


spacewander merged pull request #2804:
URL: https://github.com/apache/apisix/pull/2804


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] juzhiyuan commented on issue #835: [Proposal]: Refactor route debug online

2020-11-20 Thread GitBox 


juzhiyuan commented on issue #835:
URL: 
https://github.com/apache/apisix-dashboard/issues/835#issuecomment-731132590


   Should we continue searching related OSS? If there doesn't have suitable OSS 
any more, we have to maintain one 樂
   
   Let's keep this proposal open for at least 72hours.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] moonming commented on issue #835: [Proposal]: Refactor route debug online

2020-11-20 Thread GitBox 


moonming commented on issue #835:
URL: 
https://github.com/apache/apisix-dashboard/issues/835#issuecomment-731128739


   So do we implement debugging by ourselves?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen commented on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


nic-chen commented on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731122015


   @liubinqi2007 
   could you contact my QQ 4061470 ? Which talk more conveniently



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] liubinqi2007 commented on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


liubinqi2007 commented on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731117959


   > @liubinqi2007 is there other logs？
   
   no



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen commented on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


nic-chen commented on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731115947


   @liubinqi2007  is there other logs？



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] juzhiyuan commented on issue #837: [Proposal]: Refactor Route publish and offline

2020-11-20 Thread GitBox 


juzhiyuan commented on issue #837:
URL: 
https://github.com/apache/apisix-dashboard/issues/837#issuecomment-731115213


   cc @nic-chen 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] juzhiyuan commented on issue #835: [Proposal]: Refactor route debug online

2020-11-20 Thread GitBox 


juzhiyuan commented on issue #835:
URL: 
https://github.com/apache/apisix-dashboard/issues/835#issuecomment-731114374


   cc @LiteSun what do you think? 樂



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] moonming commented on pull request #2250: feat: Build docker image in source code

2020-11-20 Thread GitBox 


moonming commented on pull request #2250:
URL: https://github.com/apache/apisix/pull/2250#issuecomment-731110568


   where is the source code？ I not find in dockerfile



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-website] branch asf-site updated: Deploy to GitHub pages

2020-11-20 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/apisix-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 1293f67  Deploy to GitHub pages
1293f67 is described below

commit 1293f67c38612ebe531fdffdf679928b9f6948b9
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 20 11:16:23 2020 +

Deploy to GitHub pages
---
 security.html   | 2 +-
 security/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/security.html b/security.html
index 892f3f8..5384cbe 100644
--- a/security.html
+++ b/security.html
@@ -63,7 +63,7 @@
 SecurityThe Apache 
Software Foundation takes a rigorous stance on eliminating security issues in 
its software projects. Apache APISIX is also very concerned Security issues 
related to its features and functionality.
 If you have apprehensions regarding APISIX’s security or you discover 
vulnerability or potential threat, don’t hesitate to get in touch with the 
Apache Security Team by dropping a mail at mailto:secur...@apache.org;>secur...@apache.org. Please specify the 
project name as APISIX and its product name APISIX or APISIX-Dashboard in the 
email and provide a description of the relevant problem or potential threat. 
You are also urged to recommend the way to reproduce and replicat [...]
 Please pay attention to report the security issue on the security email 
before disclosing it on public domain.
-Last updated on 
11/20/2020 by 琚致远Subscribe Guide →ASFhttps://www.apache.org/;>Foundationhttps://www.apache.o [...]
+Last updated on 
11/20/2020 by 琚致远← 
PreviousSubscribe Guide 
→SecurityThe Apache 
Software Foundation takes a rigorous stance on eliminating security issues in 
its software projects. Apache APISIX is also very concerned Security issues 
related to its features and functionality.
 If you have apprehensions regarding APISIX’s security or you discover 
vulnerability or potential threat, don’t hesitate to get in touch with the 
Apache Security Team by dropping a mail at mailto:secur...@apache.org;>secur...@apache.org. Please specify the 
project name as APISIX and its product name APISIX or APISIX-Dashboard in the 
email and provide a description of the relevant problem or potential threat. 
You are also urged to recommend the way to reproduce and replicat [...]
 Please pay attention to report the security issue on the security email 
before disclosing it on public domain.
-Last updated on 
11/20/2020 by 琚致远Subscribe Guide →ASFhttps://www.apache.org/;>Foundationhttps://www.apache.o [...]
+Last updated on 
11/20/2020 by 琚致远← 
PreviousSubscribe Guide

[apisix-website] branch juzhiyuan-patch-1 updated (de3812e -> e15257e)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from de3812e  feat: added apisix's nav
 add e15257e  feat: trigger CI

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

[apisix-website] branch juzhiyuan-patch-1 updated (d6fc375 -> de3812e)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from d6fc375  Update deploy.yml
 add de3812e  feat: added apisix's nav

No new revisions were added by this update.

Summary of changes:
 website/sidebars.json | 1 +
 1 file changed, 1 insertion(+)

[GitHub] [apisix-dashboard] liuxiran opened a new issue #837: [Proposal]: Refactor Route publish and offline

2020-11-20 Thread GitBox 


liuxiran opened a new issue #837:
URL: https://github.com/apache/apisix-dashboard/issues/837


   Please answer these questions before submitting your issue.
   
   - Why do you submit this issue?
   - [ ] Feature or performance improvement
   
   Refer to: 
   #611
   #437 
   
   
   ### Refactor:
   
   - APISIX implement Route publish/offline status in dp (issue: 
https://github.com/apache/apisix/issues/2737)
   
   - manager-api provides an interface to write data to etcd
   
   - fe add publish and offline button to every route item list table, at the 
same time, create route also need to add a publish form item.
   
   
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-website] juzhiyuan commented on a change in pull request #86: fix(CD): deploy with correct images

2020-11-20 Thread GitBox 


juzhiyuan commented on a change in pull request #86:
URL: https://github.com/apache/apisix-website/pull/86#discussion_r527612881



##
File path: .github/workflows/deploy.yml
##
@@ -28,15 +28,20 @@ jobs:
 git clone https://github.com/apache/apisix.git
 cp -r apisix/doc/images ./website/static && rm -rf apisix/doc/images
 cp -r apisix/doc ./docs/apisix
-cd ./docs/apisix
-find . -type f -name "*.md" -print0 | xargs -0 sed -i '' -e 
's/\.\.\/images/https\:\/\/apisix\.apache\.org\/images/g'
-find . -type f -name "*.md" -print0 | xargs -0 sed -i '' -e 
's/\.\/images/https\:\/\/apisix\.apache\.org\/images/g'
 
 - name: Build
   run: cd website && yarn && yarn build
   
 - name: Copy files
-  run: cd website && cd build && cd apisix-website && cp 
../../../README.md ./ && cp ../../../.asf.yaml ./
+  run: |
+cd website/build/apisix-website
+cp ../../../README.md ./ && cp ../../../.asf.yaml ./
+cd apisix
+find . -type f -name "*.html" -print0 | xargs -0 sed -i -e 
's/src="\.\.\/\.\.\/doc\/images/src="https:\/\/apisix\.apache\.org\/images/g'

Review comment:
   Ugly but works.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-website] branch juzhiyuan-patch-1 updated (00fdc1c -> d6fc375)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from 00fdc1c  Update deploy.yml
 add d6fc375  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 2 --
 1 file changed, 2 deletions(-)

[GitHub] [apisix-docker] gxthrj commented on issue #86: feat: build docker image with source code

2020-11-20 Thread GitBox 


gxthrj commented on issue #86:
URL: https://github.com/apache/apisix-docker/issues/86#issuecomment-731096671


   it is related to https://github.com/apache/apisix/issues/2783



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] gxthrj commented on pull request #2250: feat: Build docker image in source code

2020-11-20 Thread GitBox 


gxthrj commented on pull request #2250:
URL: https://github.com/apache/apisix/pull/2250#issuecomment-731096256


   I think it is related to #2783 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-website] branch juzhiyuan-patch-1 updated (86c36d0 -> 00fdc1c)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from 86c36d0  Update deploy.yml
 add 00fdc1c  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

[GitHub] [apisix] gxthrj commented on issue #2796: request help: helm charts for 2.1

2020-11-20 Thread GitBox 


gxthrj commented on issue #2796:
URL: https://github.com/apache/apisix/issues/2796#issuecomment-731094394


   I think it should be in milestone 2.2.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] juzhiyuan opened a new pull request #2805: feat(docs): remove non existing image

2020-11-20 Thread GitBox 


juzhiyuan opened a new pull request #2805:
URL: https://github.com/apache/apisix/pull/2805


   ### What this PR does / why we need it:
   
   The image doesn't exist, cc @pahud 
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [x] Have you modified the corresponding document?
   * [x] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch juzhiyuan-patch-1 created (now ad514aa)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix.git.


  at ad514aa  feat(docs): remove non existing image

This branch includes the following new commits:

 new ad514aa  feat(docs): remove non existing image

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[apisix] 01/01: feat(docs): remove non existing image

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix.git

commit ad514aaa3eeb0e0b8b6a3c5683998305cf81b8b7
Author: 琚致远 
AuthorDate: Fri Nov 20 18:44:47 2020 +0800

feat(docs): remove non existing image
---
 doc/aws.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/aws.md b/doc/aws.md
index 0f55fee..e458eaa 100644
--- a/doc/aws.md
+++ b/doc/aws.md
@@ -271,8 +271,6 @@ apiSix.ApiSixServiceServiceURLF6EC7872 = 
http://apiSi-ApiSi-123HOROQKWZKA-126832
 
 Open the `apiSix.ApiSixDashboardURL` URL and log in to configure your 
**APISIX** in AWS China region.
 
-![](images/apisix-dashboard-prompt-ningxia.png)
-
 
 _TBD_

[apisix-website] branch juzhiyuan-patch-1 updated (c9e19e7 -> 86c36d0)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from c9e19e7  Update deploy.yml
 add 86c36d0  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

[apisix-website] branch juzhiyuan-patch-1 updated (c436add -> c9e19e7)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from c436add  Update deploy.yml
 add c9e19e7  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[apisix-website] branch juzhiyuan-patch-1 updated (6a02c91 -> c436add)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from 6a02c91  Update deploy.yml
 add c436add  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[apisix-website] branch asf-site updated: Deploy to GitHub pages

2020-11-20 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/apisix-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 5c7add6  Deploy to GitHub pages
5c7add6 is described below

commit 5c7add6ca705d090dab34e824acaf2a2fda2c74c
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 20 10:28:56 2020 +

Deploy to GitHub pages
---
 2fa.html |  2 +-
 2fa/index.html   |  2 +-
 apisix/plugins/prometheus.html   | 10 +-
 apisix/plugins/prometheus/index.html | 10 +-
 apisix/plugins/skywalking.html   |  4 ++--
 apisix/plugins/skywalking/index.html |  4 ++--
 apisix/plugins/zipkin.html   |  4 ++--
 apisix/plugins/zipkin/index.html |  4 ++--
 apisix/zh-cn/benchmark.html  | 10 +-
 apisix/zh-cn/benchmark/index.html| 10 +-
 committer-guide.html |  2 +-
 committer-guide/index.html   |  2 +-
 contributor-guide.html   |  2 +-
 contributor-guide/index.html |  2 +-
 downloads.html   |  2 +-
 downloads/index.html |  2 +-
 release-guide.html   |  2 +-
 release-guide/index.html |  2 +-
 security.html|  2 +-
 security/index.html  |  2 +-
 subscrbe-guide.html  |  2 +-
 subscrbe-guide/index.html|  2 +-
 team.html|  2 +-
 team/index.html  |  2 +-
 24 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/2fa.html b/2fa.html
index b69d07b..e2601f6 100644
--- a/2fa.html
+++ b/2fa.html
@@ -70,7 +70,7 @@
 Last updated on 
11/19/2020 by 琚致远← 
Committer GuideRelease Guide 
→Two-factor 
authenti [...]
+Last updated on 
11/20/2020 by 琚致远← 
Committer GuideRelease Guide 
→Two-factor 
authenti [...]
 document.addEventListener('keyup', function(e) {
   if (e.target !== document.body) {
 return;
diff --git a/2fa/index.html b/2fa/index.html
index b69d07b..e2601f6 100644
--- a/2fa/index.html
+++ b/2fa/index.html
@@ -70,7 +70,7 @@
 Last updated on 
11/19/2020 by 琚致远← 
Committer GuideRelease Guide 
→Two-factor 
authenti [...]
+Last updated on 
11/20/2020 by 琚致远← 
Committer GuideRelease Guide 
→Two-factor 
authenti [...]
 document.addEventListener('keyup', function(e) {
   if (e.target !== document.body) {
 return;
diff --git a/apisix/plugins/prometheus.html b/apisix/plugins/prometheus.html
index b7ebefa..4337491 100644
--- a/apisix/plugins/prometheus.html
+++ b/apisix/plugins/prometheus.html
@@ -68,15 +68,15 @@ these metric data.
 - targets: 
['127.0.0.1:9080']
 
 And we can check the status at prometheus console:
-
-
+https://apisix.apache.org/images/plugin/prometheus01.png; 
alt="">
+https://apisix.apache.org/images/plugin/prometheus02.png; 
alt="">
 Grafana dashboard 
meta and imports it to Grafana。
 Or you can goto https://grafana.com/grafana/dashboards/11719;>Grafana official for 
Grafana meta data.
-
-
-
+https://apisix.apache.org/images/plugin/grafana_1.png; alt="">
+https://apisix.apache.org/images/plugin/grafana_2.png; alt="">
+https://apisix.apache.org/images/plugin/grafana_3.png; alt="">
 - targets: 
['127.0.0.1:9080']
 
 And we can check the status at prometheus console:
-
-
+https://apisix.apache.org/images/plugin/prometheus01.png; 
alt="">
+https://apisix.apache.org/images/plugin/prometheus02.png; 
alt="">
 Grafana dashboard 
meta and imports it to Grafana。
 Or you can goto https://grafana.com/grafana/dashboards/11719;>Grafana official for 
Grafana meta data.
-
-
-
+https://apisix.apache.org/images/plugin/grafana_1.png; alt="">
+https://apisix.apache.org/images/plugin/grafana_2.png; alt="">
+https://apisix.apache.org/images/plugin/grafana_3.png; alt="">
 http://10.110.149.175:8080/
 
 You can see the topology of all service
-
+https://apisix.apache.org/images/plugin/skywalking-4.png; alt=" 
">
 You can also see the tracer of all service
-
+https://apisix.apache.org/images/plugin/skywalking-5.png; alt=" 
">
 
 
 http://10.110.149.175:8080/
 
 You can see the topology of all service
-
+https://apisix.apache.org/images/plugin/skywalking-4.png; alt=" 
">
 You can also see the tracer of all service
-
+https://apisix.apache.org/images/plugin/skywalking-5.png; alt=" 
">
 
 
 http://127.0.0.1:9411/zipkin
 
-
-
+https://apisix.apache.org/images/plugin/zipkin-1.jpg; alt="">
+https://apisix.apache.org/images/plugin/zipkin-2.jpg; alt="">
 http://127.0.0.1:9411/zipkin
 
-
-
+https://apisix.apache.org/images/plugin/zipkin-1.jpg; alt="">
+https://apisix.apache.org/images/plugin/zipkin-2.jpg; alt="">
 
+https://apisix.apache.org/images/benchmark-1.jpg; width="70%" 
height="70%">

[apisix-website] branch juzhiyuan-patch-1 updated (a05e958 -> 6a02c91)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from a05e958  Update deploy.yml
 add 6a02c91  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

[GitHub] [apisix] spacewander opened a new pull request #2804: docs: add missing fields in SSL API

2020-11-20 Thread GitBox 


spacewander opened a new pull request #2804:
URL: https://github.com/apache/apisix/pull/2804


   ### What this PR does / why we need it:
   
   
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [x] Have you modified the corresponding document?
   * [ ] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-website] branch juzhiyuan-patch-1 updated (b0bb296 -> a05e958)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from b0bb296  Update deploy.yml
 add a05e958  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

[GitHub] [apisix] csh995426531 commented on issue #2786: bug: config.yaml problem

2020-11-20 Thread GitBox 


csh995426531 commented on issue #2786:
URL: https://github.com/apache/apisix/issues/2786#issuecomment-731078975


   I use docker image version apache/apisix:latest will get this error，when can 
update image
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] liubinqi2007 commented on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


liubinqi2007 commented on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731076130


   
   > @liubinqi2007
   > 
   > thanks for feedback.
   > 
   > what OS do you run on?
   centos 7
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] spacewander opened a new pull request #2803: feat: support include other nginx config

2020-11-20 Thread GitBox 


spacewander opened a new pull request #2803:
URL: https://github.com/apache/apisix/pull/2803


   Close #2565
   Close #1620
   
   ### What this PR does / why we need it:
   
   
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [x] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [ ] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] nic-chen commented on issue #836: v2.0 release manager-api Emergency stop

2020-11-20 Thread GitBox 


nic-chen commented on issue #836:
URL: 
https://github.com/apache/apisix-dashboard/issues/836#issuecomment-731072572


   @liubinqi2007  
   
   thanks for feedback.
   
   what OS do you run on?
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-website] branch juzhiyuan-patch-1 updated (c5fe018 -> b0bb296)

2020-11-20 Thread juzhiyuan 
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


from c5fe018  Update deploy.yml
 add b0bb296  Update deploy.yml

No new revisions were added by this update.

Summary of changes:
 .github/workflows/deploy.yml | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

  1   2   >