[GitHub] [apisix] benx203 commented on a change in pull request #3820: feat: add nacos support

2021-03-29 Thread GitBox


benx203 commented on a change in pull request #3820:
URL: https://github.com/apache/apisix/pull/3820#discussion_r603799397



##
File path: apisix/discovery/nacos.lua
##
@@ -0,0 +1,324 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+local local_conf = require("apisix.core.config_local").local_conf()
+local http   = require("resty.http")
+local core   = require("apisix.core")
+local ipairs = ipairs
+local tostring   = tostring
+local type   = type
+local math   = math
+local math_random= math.random
+local error  = error
+local ngx= ngx
+local ngx_re = require("ngx.re")
+local ngx_timer_at   = ngx.timer.at
+local ngx_timer_every= ngx.timer.every
+local string = string
+local table  = table
+local string_sub = string.sub
+local str_byte   = string.byte
+local str_find   = core.string.find
+local str_format = string.format
+local log= core.log
+
+local default_weight
+local applications
+local auth_path
+local service_list_path
+local page_size
+local instance_list_path
+
+local schema = {
+type = "object",
+properties = {
+host = {
+type = "array",
+minItems = 1,
+items = {
+type = "string",
+},
+},
+fetch_interval = {type = "integer", minimum = 1, default = 30},
+prefix = {type = "string", default = "/nacos/v1/"},
+page_size = {type = "integer", minimum = 1, default = 100},
+weight = {type = "integer", minimum = 1, default = 100},
+timeout = {
+type = "object",
+properties = {
+connect = {type = "integer", minimum = 1, default = 2000},
+send = {type = "integer", minimum = 1, default = 2000},
+read = {type = "integer", minimum = 1, default = 5000},
+},
+default = {
+connect = 2000,
+send = 2000,
+read = 5000,
+}
+},
+},
+required = {"host"}
+}
+
+
+local _M = {
+version = 0.1,
+}
+
+
+local function service_info()
+local host = local_conf.discovery and
+local_conf.discovery.nacos and local_conf.discovery.nacos.host
+if not host then
+log.error("do not set nacos.host")
+return
+end
+
+local username, password
+-- TODO Add health check to get healthy nodes.
+local url = host[math_random(#host)]
+local auth_idx = str_find(url, "#")

Review comment:
   OK.




-- 
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] iamayushdas commented on pull request #1674: feat: improved plugin #1631

2021-03-29 Thread GitBox


iamayushdas commented on pull request #1674:
URL: https://github.com/apache/apisix-dashboard/pull/1674#issuecomment-809929827


   @liuxiran please review this


-- 
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] iamayushdas edited a comment on pull request #1689: docs: update the image in the USER_GUIDE.md #1683

2021-03-29 Thread GitBox


iamayushdas edited a comment on pull request #1689:
URL: https://github.com/apache/apisix-dashboard/pull/1689#issuecomment-809878785


   @nic-chen @Firstsawyou @liuxiran can you check for the failing 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] Firstsawyou commented on issue #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


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


   > @Firstsawyou
   > Could you investigate this issue?
   
   Ok, let me investigate.


-- 
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 #3944: request help:

2021-03-29 Thread GitBox


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


   Support cluster deployment. Please refer here: 
https://github.com/apache/apisix/blob/master/docs/en/latest/FAQ.md#how-to-set-up-high-available-apache-apisix-clusters
   Using the `limit-count` plugin, it can support the current limit of the 
Redis strategy. 
https://github.com/apache/apisix/blob/master/docs/en/latest/plugins/limit-count.md#attributes


-- 
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 #1684: program panic when failed to initialize etcd store is unreasonable

2021-03-29 Thread GitBox


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


   thanks for feedback


-- 
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 #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


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


   > 
   > 
   > > If it reports an error log in 18:26, it doesn't get data from another 
etcd node at that time.
   > > @Firstsawyou
   > > Does the error log happen forever or just for a moment?
   > 
   > The error log happen forever when a node in the etcd cluster(3 nodes) 
fails, at that time ,apisix can get data from other etcd node and work 
corretcly.
   
   Interesting.
   
   @Firstsawyou 
   Could you investigate this issue?


-- 
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 a change in pull request #1673: fix: unable to export route with nil methods field

2021-03-29 Thread GitBox


nic-chen commented on a change in pull request #1673:
URL: https://github.com/apache/apisix-dashboard/pull/1673#discussion_r603786353



##
File path: api/internal/handler/data_loader/route_export.go
##
@@ -233,7 +235,7 @@ func (h *Handler) RouteToOpenAPI3(c droplet.Context, routes 
[]*entity.Route) (*o
return nil, err
}
 
-   if plugins != nil {
+   if len(plugins) > 0 {

Review comment:
   ok..




-- 
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 a change in pull request #3943: test: make plugin/log-rotate.t stable

2021-03-29 Thread GitBox


Firstsawyou commented on a change in pull request #3943:
URL: https://github.com/apache/apisix/pull/3943#discussion_r603784591



##
File path: t/plugin/log-rotate.t
##
@@ -90,8 +90,8 @@ __DATA__
 --- config
 location /t {
 content_by_lua_block {
-ngx.log(ngx.WARN, "start xx")
 ngx.sleep(0.1)
+ngx.log(ngx.WARN, "start xx")

Review comment:
   Got it, thanks for the answer.




-- 
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 pull request #3556: feat: support rewrite HTTP method

2021-03-29 Thread GitBox


Firstsawyou commented on pull request #3556:
URL: https://github.com/apache/apisix/pull/3556#issuecomment-809905068


   > @Firstsawyou you can add test cases too.
   
   Okay, got 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] moonming commented on a change in pull request #3494: docs: update the docs of the prometheus plugin

2021-03-29 Thread GitBox


moonming commented on a change in pull request #3494:
URL: https://github.com/apache/apisix/pull/3494#discussion_r603773164



##
File path: docs/en/latest/plugins/prometheus.md
##
@@ -122,26 +122,70 @@ Or you can goto [Grafana 
official](https://grafana.com/grafana/dashboards/11719)
 
 ### Available metrics
 
-* `Status codes`: HTTP status codes returned by upstream services. These are 
available per service and across all services.
-* `Bandwidth`: Total Bandwidth (egress/ingress) flowing through apisix. This 
metric is available per service and as a sum across all services.
-* `etcd reachability`: A gauge type with a value of 0 or 1, representing if 
etcd can be reached by a apisix or not.
+* `Status codes`: HTTP status code returned from upstream services. These 
status code available per service and across all services.
+
+Attributes:
+
+| Name | Description |
+| -| |
+| code | The HTTP status code returned by the upstream service. |
+| route| The `route_id` of the matched route is request. If it 
does not match, the default value is an empty string. |
+| matched_uri  | The `uri` of the route matching the request, if it does 
not match, the default value is an empty string. |
+| matched_host | The `host` of the route that matches the request. If it 
does not match, the default value is an empty string. |
+| service  | The `service_id` of the route matched by the request. 
When the route lacks service_id, the default is `$host`. |
+| consumer | The `consumer_name` of the consumer that matches the 
request. If it does not match, the default value is an empty string. |
+| node | The `ip` of the upstream node. |
+
+* `Bandwidth`: Total Bandwidth (egress/ingress) flowing through apisix. The 
total bandwidth of each service or all services can be counted.

Review comment:
   `apisix` -> `APISIX`

##
File path: docs/en/latest/plugins/prometheus.md
##
@@ -122,26 +122,70 @@ Or you can goto [Grafana 
official](https://grafana.com/grafana/dashboards/11719)
 
 ### Available metrics
 
-* `Status codes`: HTTP status codes returned by upstream services. These are 
available per service and across all services.
-* `Bandwidth`: Total Bandwidth (egress/ingress) flowing through apisix. This 
metric is available per service and as a sum across all services.
-* `etcd reachability`: A gauge type with a value of 0 or 1, representing if 
etcd can be reached by a apisix or not.
+* `Status codes`: HTTP status code returned from upstream services. These 
status code available per service and across all services.
+
+Attributes:
+
+| Name | Description |
+| -| |
+| code | The HTTP status code returned by the upstream service. |
+| route| The `route_id` of the matched route is request. If it 
does not match, the default value is an empty string. |
+| matched_uri  | The `uri` of the route matching the request, if it does 
not match, the default value is an empty string. |
+| matched_host | The `host` of the route that matches the request. If it 
does not match, the default value is an empty string. |
+| service  | The `service_id` of the route matched by the request. 
When the route lacks service_id, the default is `$host`. |

Review comment:
   how to config `all services`?




-- 
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 #3689: docs: the prometheus.md grammar improve

2021-03-29 Thread GitBox


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


   any update? @Firstsawyou 


-- 
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 #3556: feat: support rewrite HTTP method

2021-03-29 Thread GitBox


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


   @Firstsawyou you can add test cases too.


-- 
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 #3556: feat: support rewrite HTTP method

2021-03-29 Thread GitBox


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


   @Firstsawyou please help to fix the confict files.


-- 
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 #3624: feat: add pre-commit framework

2021-03-29 Thread GitBox


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


   any update? @jbampton 


-- 
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 #3627: docs: add Slack to the communication channels

2021-03-29 Thread GitBox


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


   @jbampton please rebase the master branch, thx


-- 
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 a change in pull request #3871: docs: admin-api.md document adds configuration https example

2021-03-29 Thread GitBox


moonming commented on a change in pull request #3871:
URL: https://github.com/apache/apisix/pull/3871#discussion_r603770459



##
File path: docs/zh/latest/admin-api.md
##
@@ -665,11 +668,52 @@ HTTP/1.1 200 OK
 
 ```
 
+示例二:如何使用 HTTPS 的 scheme 将请求代理到上游。

Review comment:
   将客户端请求代理到上游https服务

##
File path: docs/en/latest/admin-api.md
##
@@ -571,12 +571,16 @@ Config Example:
 "key": "",
 "name": "upstream-for-test",
 "desc": "hello world",
+"scheme": "http",   # The scheme used when communicating with 
upstream, the default is `http`
 }
 ```
 
-Example:
+**Example:**
+
+Example 1: Create an upstream and modify the corresponding data.

Review comment:
   modify what data? please desc more detail

##
File path: docs/en/latest/admin-api.md
##
@@ -657,12 +659,54 @@ After the execution is successful, nodes will not retain 
the original data, and
 
 ```
 
+Example 2: How to proxy requests to upstream with HTTPS scheme.

Review comment:
   Example 2: How to proxy client request to `https` upstream service




-- 
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] aiyiyi121 commented on issue #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


aiyiyi121 commented on issue #3937:
URL: https://github.com/apache/apisix/issues/3937#issuecomment-809896187


   > If it reports an error log in 18:26, it doesn't get data from another etcd 
node at that time.
   > @Firstsawyou
   > Does the error log happen forever or just for a moment?
   
   The error log happen forever when a node in the etcd cluster(3 nodes) fails, 
at that time ,apisix can get data from other etcd node and work corretcly.


-- 
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 a change in pull request #3883: feat: add 5xx error page

2021-03-29 Thread GitBox


moonming commented on a change in pull request #3883:
URL: https://github.com/apache/apisix/pull/3883#discussion_r603767827



##
File path: apisix/error_handler.lua
##
@@ -0,0 +1,54 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local ngx = ngx
+
+
+local html_5xx = [[
+
+
+
+
+
+Error
+
+body {
+width: 35em;
+margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif;
+}
+
+
+
+An error occurred.
+Sorry, the page you are looking for is currently unavailable.
+Please try again later.
+If you are the system administrator of this resource then you should check
+the https://github.com/apache/apisix/blob/master/conf/config-default.yaml#L135;>error
 log

Review comment:
   I think report issue to `https://github.com/apache/apisix/issues` is ok

##
File path: apisix/error_handler.lua
##
@@ -0,0 +1,54 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local ngx = ngx
+
+
+local html_5xx = [[
+
+
+
+
+
+Error
+
+body {
+width: 35em;
+margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif;
+}
+
+
+
+An error occurred.
+Sorry, the page you are looking for is currently unavailable.
+Please try again later.
+If you are the system administrator of this resource then you should check
+the https://github.com/apache/apisix/blob/master/conf/config-default.yaml#L135;>error
 log
+ for details.
+If you need any help, click https://apisix.apache.org/;>need 
help.

Review comment:
   I don't think this link can help users




-- 
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 a change in pull request #3883: feat: add 5xx error page

2021-03-29 Thread GitBox


moonming commented on a change in pull request #3883:
URL: https://github.com/apache/apisix/pull/3883#discussion_r603766958



##
File path: apisix/cli/ngx_tpl.lua
##
@@ -233,6 +233,9 @@ http {
 {% end %}
 {% end %}
 
+# error_page
+error_page 500 502 503 504 @apisix_error_handler;

Review comment:
   what about the 4xx response codes?




-- 
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: chore: fix Markdown links in the Spanish README (#3919)

2021-03-29 Thread wenming
This is an automated email from the ASF dual-hosted git repository.

wenming 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 0840d0b  chore: fix Markdown links in the Spanish README (#3919)
0840d0b is described below

commit 0840d0b2ae570f039bcd84a5e17b3d91535f9e8c
Author: John Bampton 
AuthorDate: Tue Mar 30 14:12:17 2021 +1000

chore: fix Markdown links in the Spanish README (#3919)
---
 docs/es/latest/README.md | 86 
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/docs/es/latest/README.md b/docs/es/latest/README.md
index fdd1e82..0a38e15 100644
--- a/docs/es/latest/README.md
+++ b/docs/es/latest/README.md
@@ -67,75 +67,75 @@ ensayos A/B, ensayos de despliegue de canarios (canary 
release), despliegue azul
 
 - **Multi protocolos**
 
-  - [Proxy TCP/UDP](stream-proxy.md): Proxy TCP/UDP dinámico.
-  - [Proxy Dubbo](plugins/dubbo-proxy.md): Proxy dinámico HTTP a Dubbo.
-  - [Proxy MQTT Dinámico](plugins/mqtt-proxy.md): Soporte de balance de carga 
MQTT por `client_id`, soporta ambos MQTT 
[3.1.\*](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html), 
[5.0](https://docs.oasis-open.org/mqtt/mqtt/v5.0/mqtt-v5.0.html).
-  - [Proxy gRPC](grpc-proxy.md): Tráfico gRPC a través de Proxy.
-  - [Transcodificado gRPC](plugins/grpc-transcode.md): Soporta transcodificado 
de protocolo para que los clientes puedan acceder su gRPC API usando HTTP/JSON.
+  - [Proxy TCP/UDP](../../en/latest/stream-proxy.md): Proxy TCP/UDP dinámico.
+  - [Proxy Dubbo](../../en/latest/plugins/dubbo-proxy.md): Proxy dinámico HTTP 
a Dubbo.
+  - [Proxy MQTT Dinámico](../../en/latest/plugins/mqtt-proxy.md): Soporte de 
balance de carga MQTT por `client_id`, soporta ambos MQTT 
[3.1.\*](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html), 
[5.0](https://docs.oasis-open.org/mqtt/mqtt/v5.0/mqtt-v5.0.html).
+  - [Proxy gRPC](../../en/latest/grpc-proxy.md): Tráfico gRPC a través de 
Proxy.
+  - [Transcodificado gRPC](../../en/latest/plugins/grpc-transcode.md): Soporta 
transcodificado de protocolo para que los clientes puedan acceder su gRPC API 
usando HTTP/JSON.
   - Proxy de Websocket
   - Proxy de Protocolo
   - Proxy Dubbo: Proxy de Dubbo basado en Tengine.
   - Proxy de HTTP(S) hacia adelante
-  - [SSL](https.md): Carga dinámica de certificado SSL.
+  - [SSL](../../en/latest/https.md): Carga dinámica de certificado SSL.
 
 - **Completamente Dinámico**
 
-  - [Las actualizaciones y los plugins más recientes](plugins.md): Actualiza 
sus configuraciones y plugins sin reinicios!
-  - [Reescritura de proxy](plugins/proxy-rewrite.md): Soporta la reescritura 
de `host`, `uri`, `schema`, `enable_websocket`, `headers` para el request antes 
de reenviarlo aguas arriba (upstream).
-  - [Reescritura de respuesta](plugins/response-rewrite.md): Establece el 
código de estatus de respuesta personalizado, así como el cuerpo y el 
encabezado para el cliente.
-  - [Sin servidor (serverless)](plugins/serverless.md): Invoque funciones en 
cada fase en APISIX.
+  - [Las actualizaciones y los plugins más 
recientes](../../en/latest/plugins.md): Actualiza sus configuraciones y plugins 
sin reinicios!
+  - [Reescritura de proxy](../../en/latest/plugins/proxy-rewrite.md): Soporta 
la reescritura de `host`, `uri`, `schema`, `enable_websocket`, `headers` para 
el request antes de reenviarlo aguas arriba (upstream).
+  - [Reescritura de respuesta](../../en/latest/plugins/response-rewrite.md): 
Establece el código de estatus de respuesta personalizado, así como el cuerpo y 
el encabezado para el cliente.
+  - [Sin servidor (serverless)](../../en/latest/plugins/serverless.md): 
Invoque funciones en cada fase en APISIX.
   - Balance dinámico de cargas: Balanceo de cargas Round-robin usando pesos.
   - Balance de cargas basado en Hash: Balanceo de cargas con sesiones de 
hashing consistentes.
-  - [Comprobaciones del sistema](health-check.md): Permite comprobaciones del 
sistema en el nodo aguas arriba, y automáticamente filtrará nodos problemáticos 
durante el balanceo de cargas para asegurar la estabilidad del sistema.
+  - [Comprobaciones del sistema](../../en/latest/health-check.md): Permite 
comprobaciones del sistema en el nodo aguas arriba, y automáticamente filtrará 
nodos problemáticos durante el balanceo de cargas para asegurar la estabilidad 
del sistema.
   - Interruptor del circuito: Rastreo inteligente de servicios aguas arriba 
que tengan problemas.
-  - [Reflejo de proxy (mirror)](plugins/proxy-mirror.md): Proporciona la 
capacidad de reflejar (mirror) los request (solicitudes) del cliente.
-  - [Bifurcación de tráfico](plugins/traffic-split.md): Permite a los usuarios 
dirigir de manera creciente porciones del tráfico entre varias corrientes aguas 
arriba (upstreams).
+  - [Reflejo de proxy 

[GitHub] [apisix] moonming merged pull request #3919: chore: fix Markdown links in the Spanish README

2021-03-29 Thread GitBox


moonming merged pull request #3919:
URL: https://github.com/apache/apisix/pull/3919


   


-- 
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 a change in pull request #3910: fix: limit-count plugin connect error

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3910:
URL: https://github.com/apache/apisix/pull/3910#discussion_r603762026



##
File path: docs/en/latest/plugins/limit-count.md
##
@@ -48,6 +48,7 @@ Limit request rate by a fixed number of requests in a given 
time window.
 | redis_database  | integer | optional | 0 | 
redis_database >= 0 
| When using the `redis` policy, this property 
specifies the database you selected of the Redis server, and only for non Redis 
cluster mode (single instance mode or Redis public cloud service that provides 
single entry).  
 |
 | redis_timeout   | integer | optional | 1000  | 
[1,...] 
| When using the `redis` policy, this property 
specifies the timeout in milliseconds of any command submitted to the Redis 
server. 

  |
 | redis_cluster_nodes | array   | optional |   |   

  | When using `redis-cluster` policy,This property is a list 
of addresses of Redis cluster service nodes.


|
+| redis_cluster_name  | string  | optional |   |   

  | When using `redis-cluster` policy,This property is the name 
of Redis cluster service nodes. 


  |

Review comment:
   Should update doc and test too




-- 
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] zwjzxh520 opened a new issue #3944: request help:

2021-03-29 Thread GitBox


zwjzxh520 opened a new issue #3944:
URL: https://github.com/apache/apisix/issues/3944


   ### 支持分布式部署吗?分布式部署的时候,限流插件,可以保证正确的工作吗?
   
   查阅了一下源码,发现是用 resty.lrucache 做的缓存,这应该是本机缓存,那假如部署在三台机器,限流配置为每秒 1000 QPS, 
会不会导致实际允许 3000 QPS 的流量了
   


-- 
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 a change in pull request #3943: test: make plugin/log-rotate.t stable

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3943:
URL: https://github.com/apache/apisix/pull/3943#discussion_r603758443



##
File path: t/plugin/log-rotate.t
##
@@ -90,8 +90,8 @@ __DATA__
 --- config
 location /t {
 content_by_lua_block {
-ngx.log(ngx.WARN, "start xx")
 ngx.sleep(0.1)
+ngx.log(ngx.WARN, "start xx")

Review comment:
   It's obvious. We should ensure the log not be rotated.




-- 
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 a change in pull request #3910: fix: limit-count plugin connect error

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3910:
URL: https://github.com/apache/apisix/pull/3910#discussion_r603758017



##
File path: apisix/plugins/limit-count.lua
##
@@ -103,6 +103,9 @@ local schema = {
 redis_timeout = {
 type = "integer", minimum = 1, default = 1000,
 },
+redis_cluster_name = {
+type = "string", default = "apisix-redis-cluster",
+},
 },
 required = {"redis_cluster_nodes"},

Review comment:
   the redis_cluster_name should be required




-- 
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] LiteSun commented on a change in pull request #1661: feat: add scheme field to upstream form

2021-03-29 Thread GitBox


LiteSun commented on a change in pull request #1661:
URL: https://github.com/apache/apisix-dashboard/pull/1661#discussion_r603756442



##
File path: web/src/components/Upstream/UpstreamForm.tsx
##
@@ -694,6 +694,25 @@ const UpstreamForm: React.FC = forwardRef(
 })}
   
 
+
+  

Review comment:
   ```suggestion
 
 {['http', 'https', 'grppc', 'grpcs'].map( item => (  
 
{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] moonming commented on pull request #276: feat: upgrade APISIX Dashboard version

2021-03-29 Thread GitBox


moonming commented on pull request #276:
URL: https://github.com/apache/apisix-website/pull/276#issuecomment-809880384


   Where can I see the historically released version?


-- 
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] iamayushdas commented on pull request #1689: docs: update the image in the USER_GUIDE.md #1683

2021-03-29 Thread GitBox


iamayushdas commented on pull request #1689:
URL: https://github.com/apache/apisix-dashboard/pull/1689#issuecomment-809878785


   @nic-chen @Firstsawyou can you check for the failing 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-website] LiteSun closed issue #266: support jsDelivr to speedup static files

2021-03-29 Thread GitBox


LiteSun closed issue #266:
URL: https://github.com/apache/apisix-website/issues/266


   


-- 
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 master updated: feat: #266 speed up static file (#270)

2021-03-29 Thread sunyi
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 75637c4  feat: #266 speed up static file (#270)
75637c4 is described below

commit 75637c49d3e097ad12cf7e3ba8a55ef019ec1221
Author: Cliff Su 
AuthorDate: Tue Mar 30 11:30:06 2021 +0800

feat: #266 speed up static file (#270)
---
 website/src/pages/index.js |  2 +-
 website/static/data/showcases.json | 86 +++---
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index d9a5269..6e8decb 100644
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -120,7 +120,7 @@ const Showcase = () => {
   }
   const showcases = siteConfig.customFields.showcases.map((user) => (
 
-  
+  https://cdn.jsdelivr.net/gh/apache/apisix-website@master/website/static/img/'
 +  user.image} alt={user.caption} />
 
   ));
   const middleIndex = (showcases.length / 2).toFixed(0);
diff --git a/website/static/data/showcases.json 
b/website/static/data/showcases.json
index 56a3dc7..774d94d 100644
--- a/website/static/data/showcases.json
+++ b/website/static/data/showcases.json
@@ -1,260 +1,260 @@
 [
   {
 "caption": "360 奇虎",
-"image": "../img/showcase/360.png",
+"image": "showcase/360.png",
 "infoLink": "https://www.360.cn/;,
 "pinned": true
   },
   {
 "caption": "大商天狗",
-"image": "../img/showcase/51tiangou.svg",
+"image": "showcase/51tiangou.svg",
 "infoLink": "http://51tiangou.com/;,
 "pinned": true
   },
   {
 "caption": "妙笔 AI",
-"image": "../img/showcase/aimiaobi.png",
+"image": "showcase/aimiaobi.png",
 "infoLink": "http://aimiaobi.com/;,
 "pinned": true
   },
   {
 "caption": "超链云商",
-"image": "../img/showcase/chaolian360.png",
+"image": "showcase/chaolian360.png",
 "infoLink": "https://www.chaolian360.com/;,
 "pinned": true
   },
   {
 "caption": "DaoCloud",
-"image": "../img/showcase/daocloud.png",
+"image": "showcase/daocloud.png",
 "infoLink": "https://www.daocloud.io/;,
 "pinned": true
   },
   {
 "caption": "小电科技",
-"image": "../img/showcase/dian.png",
+"image": "showcase/dian.png",
 "infoLink": "http://dian.so/;,
 "pinned": true
   },
   {
 "caption": "嘀嗒出行",
-"image": "../img/showcase/didachuxing.jpg",
+"image": "showcase/didachuxing.jpg",
 "infoLink": "https://www.didachuxing.com/;,
 "pinned": true
   },
   {
 "caption": "湖南新云网",
-"image": "../img/showcase/cunw.png",
+"image": "showcase/cunw.png",
 "infoLink": "http://www.cunw.com.cn/;,
 "pinned": true
   },
   {
 "caption": "大搜车",
-"image": "../img/showcase/dasouche.png",
+"image": "showcase/dasouche.png",
 "infoLink": "https://www.dasouche.com/;,
 "pinned": true
   },
   {
 "caption": "大淘客",
-"image": "../img/showcase/dataoke.png",
+"image": "showcase/dataoke.png",
 "infoLink": "https://www.dataoke.com/;,
 "pinned": true
   },
   {
 "caption": "eFactory",
-"image": "../img/showcase/eFactory.webp",
+"image": "showcase/eFactory.webp",
 "infoLink": "https://www.efactory-project.eu/;,
 "pinned": true
   },
   {
 "caption": "理房通",
-"image": "../img/showcase/ehomepay.png",
+"image": "showcase/ehomepay.png",
 "infoLink": "https://www.ehomepay.com.cn/;,
 "pinned": true
   },
   {
 "caption": "简单一点科技",
-"image": "../img/showcase/eZone.png",
+"image": "showcase/eZone.png",
 "infoLink": "https://ezone.work/;,
 "pinned": true
   },
   {
 "caption": "fansup",
-"image": "../img/showcase/fansup.png",
+"image": "showcase/fansup.png",
 "infoLink": "https://fansup.mobi/;,
 "pinned": true
   },
   {
 "caption": "海尔优家",
-"image": "../img/showcase/haier.webp",
+"image": "showcase/haier.webp",
 "infoLink": "http://haieruplus.com/;,
 "pinned": true
   },
   {
 "caption": "中移杭研",
-"image": "../img/showcase/hy10086.png",
+"image": "showcase/hy10086.png",
 "infoLink": "https://hy.10086.cn/;,
 "pinned": true
   },
   {
 "caption": "航天网信",
-"image": "../img/showcase/htzhiyun.png",
+"image": "showcase/htzhiyun.png",
 "infoLink": "https://www.htzhiyun.cn/;,
 "pinned": true
   },
   {
 "caption": "好洛维",
-"image": "../img/showcase/hellowin.jpg",
+"image": "showcase/hellowin.jpg",
 "infoLink": "http://www.hellowin.cn/;,
 "pinned": true
   },
   {
 "caption": "HelloTalk",
-"image": "../img/showcase/HelloTalk.png",
+"image": "showcase/HelloTalk.png",
 "infoLink": "https://www.hellotalk.com/;,
 "pinned": true
   },
   {
 "caption": "华为",
-"image": "../img/showcase/huawei.png",
+"image": "showcase/huawei.png",
 "infoLink": 

[GitHub] [apisix-website] LiteSun merged pull request #270: Feat #266 speed up static file

2021-03-29 Thread GitBox


LiteSun merged pull request #270:
URL: https://github.com/apache/apisix-website/pull/270


   


-- 
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] LiteSun closed issue #255: Action: check broken links after building

2021-03-29 Thread GitBox


LiteSun closed issue #255:
URL: https://github.com/apache/apisix-website/issues/255


   


-- 
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] LiteSun merged pull request #263: feat: broken link checker script

2021-03-29 Thread GitBox


LiteSun merged pull request #263:
URL: https://github.com/apache/apisix-website/pull/263


   


-- 
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 master updated (1bcaba3 -> 6561b84)

2021-03-29 Thread sunyi
This is an automated email from the ASF dual-hosted git repository.

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


from 1bcaba3  feat: support apisix-docker (#275)
 add 6561b84  feat: broken link checker script (#263)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/{deploy.yml => link-check.yml} |  21 ++-
 common.js|  18 +++
 link-checker.js  | 180 +++
 3 files changed, 208 insertions(+), 11 deletions(-)
 copy .github/workflows/{deploy.yml => link-check.yml} (72%)
 create mode 100644 common.js
 create mode 100644 link-checker.js


[GitHub] [apisix-dashboard] codecov-io commented on pull request #1689: docs: update the image in the USER_GUIDE.md #1683

2021-03-29 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1689?src=pr=h1) 
Report
   > Merging 
[#1689](https://codecov.io/gh/apache/apisix-dashboard/pull/1689?src=pr=desc) 
(f3f595b) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/88f323285f2bdbafca027da9aef357b2e3eb4008?el=desc)
 (88f3232) will **increase** coverage by `1.57%`.
   > The diff coverage is `75.00%`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1689?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1689  +/-   ##
   ==
   + Coverage   72.41%   73.99%   +1.57% 
   ==
 Files 133   86  -47 
 Lines5728 2615-3113 
 Branches  666  668   +2 
   ==
   - Hits 4148 1935-2213 
   + Misses   1337  680 -657 
   + Partials  2430 -243 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `?` | |
   | frontend-e2e-test | `73.99% <75.00%> (+0.02%)` | :arrow_up: |
   
   Flags with carried forward coverage won't be shown. [Click 
here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment)
 to find out more.
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1689?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[web/src/pages/Consumer/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Db25zdW1lci9DcmVhdGUudHN4)
 | `76.08% <ø> (ø)` | |
   | 
[web/src/pages/Plugin/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9QbHVnaW4vTGlzdC50c3g=)
 | `96.15% <ø> (ø)` | |
   | 
[web/src/pages/Service/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0NyZWF0ZS50c3g=)
 | `96.42% <ø> (+1.78%)` | :arrow_up: |
   | 
[web/src/pages/Upstream/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9VcHN0cmVhbS9DcmVhdGUudHN4)
 | `79.41% <50.00%> (-1.84%)` | :arrow_down: |
   | 
[web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4)
 | `65.45% <100.00%> (ø)` | |
   | 
[web/src/pages/Plugin/PluginMarket.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9QbHVnaW4vUGx1Z2luTWFya2V0LnRzeA==)
 | `100.00% <100.00%> (ø)` | |
   | 
[.../internal/handler/authentication/authentication.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvYXV0aGVudGljYXRpb24vYXV0aGVudGljYXRpb24uZ28=)
 | | |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | | |
   | 
[api/internal/conf/conf.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvbmYvY29uZi5nbw==)
 | | |
   | 
[api/internal/utils/runtime/runtime.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3J1bnRpbWUvcnVudGltZS5nbw==)
 | | |
   | ... and [43 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1689/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1689?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/1689?src=pr=footer).
 Last update 
[88f3232...f3f595b](https://codecov.io/gh/apache/apisix-dashboard/pull/1689?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] Firstsawyou commented on a change in pull request #3943: test: make plugin/log-rotate.t stable

2021-03-29 Thread GitBox


Firstsawyou commented on a change in pull request #3943:
URL: https://github.com/apache/apisix/pull/3943#discussion_r603752965



##
File path: t/plugin/log-rotate.t
##
@@ -90,8 +90,8 @@ __DATA__
 --- config
 location /t {
 content_by_lua_block {
-ngx.log(ngx.WARN, "start xx")
 ngx.sleep(0.1)
+ngx.log(ngx.WARN, "start xx")

Review comment:
   Why does the execution order of ngx.sleep and ngx.log affect the 
stability of the 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-ingress-controller] gxthrj commented on issue #322: bug: route vars configure synchronization data exceptions

2021-03-29 Thread GitBox


gxthrj commented on issue #322:
URL: 
https://github.com/apache/apisix-ingress-controller/issues/322#issuecomment-809865343


   Yes, It is a bug 
   cc @tokers 


-- 
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] imxhf commented on pull request #3934: feat: Discovery Nacos

2021-03-29 Thread GitBox


imxhf commented on pull request #3934:
URL: https://github.com/apache/apisix/pull/3934#issuecomment-809864565


   > GitHub action is not stable enough. Try to push a new commit again.
   
   It works. Thanks, ze xuan~


-- 
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-ingress-controller] pioneer-hash opened a new issue #322: bug: route vars configure synchronization data exceptions

2021-03-29 Thread GitBox


pioneer-hash opened a new issue #322:
URL: https://github.com/apache/apisix-ingress-controller/issues/322


   ### Issue description
   When I configured two rules in route.yaml, one carried the rules and the 
other did not ,Routes with rules are placed on top and routes without rules are 
placed below.Use the following configuration
   ``` yaml
   apiVersion: apisix.apache.org/v2alpha1apiVersion: apisix.apache.org/v2alpha1
   kind: ApisixRoute
   metadata:
name: test
   spec:
http:
- name: rule1
  match:
paths:
  - /*
exprs:
- subject:
scope: Cookie
name: name
  op: RegexMatch
  value: ".*lisi.*"
  backend:
serviceName: web-huido
servicePort: 80
- name: rule2
  match:
paths:
  - /*
  backend:
serviceName: web-shengchan
servicePort: 80
   ```
   ```
   
{"id":"52b54be8","status":1,"vars":[["cookie_name","~~",".*lisi.*"]],"uris":["\/*"],"priority":0,"update_time":1617071198,"upstream_id":"450a096f","create_time":1617071198,"desc":"default_test_rule1"}
   
{"id":"cbbc1a52","status":1,"vars":[["cookie_name","~~",".*lisi.*"]],"uris":["\/*"],"priority":0,"update_time":1617071198,"upstream_id":"1ef7ab88","create_time":1617071198,"desc":"default_test_rule2"}
   ```
   
   ### Environment
   
   * your apisix-ingress-controller version (output of 
`apisix-ingress-controller version --long`);
   apisix-ingress-controller version: now master  apisix: 
apache/apisix:2.4-centos
   * your Kubernetes cluster version (output of `kubectl version`);
   v 1.17.8
   * if you run apisix-ingress-controller in Bare-metal environment, also show 
your OS version (`uname -a`).
   
   ### Minimal test code / Steps to reproduce the issue
   
   1.
   2.
   3.
   
   ### What's the actual result? (including assertion message & call stack if 
applicable)
   
   ### What's the expected result?
   


-- 
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] defp removed a comment on issue #1397: feat: Customize the configurations of Semantic-Pull-Request check in CI

2021-03-29 Thread GitBox


defp removed a comment on issue #1397:
URL: 
https://github.com/apache/apisix-dashboard/issues/1397#issuecomment-809858236


   
https://github.com/apache/apisix-dashboard/pull/1688/commits/44fa580af59b648957657e56ea3a153aef70daa8
   backport type 


-- 
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] defp commented on issue #1397: feat: Customize the configurations of Semantic-Pull-Request check in CI

2021-03-29 Thread GitBox


defp commented on issue #1397:
URL: 
https://github.com/apache/apisix-dashboard/issues/1397#issuecomment-809858236


   
https://github.com/apache/apisix-dashboard/pull/1688/commits/44fa580af59b648957657e56ea3a153aef70daa8
   backport type 


-- 
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] iamayushdas opened a new pull request #1689: Docs

2021-03-29 Thread GitBox


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


   Please answer these questions before submitting a pull request, **or your PR 
will get closed**.
   
   **Why submit this pull request?**
   
   - [ ] Bugfix
   - [X] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   **What changes will this PR take into?**
   updated the screenshots of USER_GUIDE
   Please update this section with detailed description.
   
   **Related issues**
   
   fix/resolve #1683
   
   **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? If it is not backward compatible, 
please discuss on the mailing list 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




[GitHub] [apisix-dashboard] defp commented on issue #1397: feat: Customize the configurations of Semantic-Pull-Request check in CI

2021-03-29 Thread GitBox


defp commented on issue #1397:
URL: 
https://github.com/apache/apisix-dashboard/issues/1397#issuecomment-809857396


   > Add support for custom types
   https://github.com/zeke/semantic-pull-requests/pull/67
   
   @nic-chen  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-helm-chart] wgy-home commented on issue #49: apisix error:failed to fetch data from etcd: xxxx could not be resolved

2021-03-29 Thread GitBox


wgy-home commented on issue #49:
URL: 
https://github.com/apache/apisix-helm-chart/issues/49#issuecomment-809854657


   > It seems APISIX doens't use the resolver in `/etc/resolv.conf`. Could you 
please paste the nginx.conf in your APISIX container?
   
   This configuration file ?
   ```shell
   # cat /usr/local/apisix/conf/nginx.conf 
   # Configuration File - Nginx Server Configs
   # This is a read-only file, do not try to modify it.
   
   master_process on;
   
   worker_processes auto;
   worker_cpu_affinity auto;
   
   # main configuration snippet starts
   
   
   # main configuration snippet ends
   
   error_log /dev/stderr warn;
   pid logs/nginx.pid;
   
   worker_rlimit_nofile 20480;
   
   events {
   accept_mutex off;
   worker_connections 10620;
   }
   
   worker_rlimit_core  16G;
   
   worker_shutdown_timeout 240s;
   
   env APISIX_PROFILE;
   
   
   
   http {
   # put extra_lua_path in front of the builtin path
   # so user can override the source code
   lua_package_path  
"$prefix/deps/share/lua/5.1/?.lua;$prefix/deps/share/lua/5.1/?/init.lua;/usr/local/apisix/?.lua;/usr/local/apisix/?/init.lua;;./?.lua;/usr/local/openresty/luajit/share/luajit-2.1.0-beta3/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;/usr/local/openresty/luajit/share/lua/5.1/?.lua;/usr/local/openresty/luajit/share/lua/5.1/?/init.lua;";
   lua_package_cpath 
"$prefix/deps/lib64/lua/5.1/?.so;$prefix/deps/lib/lua/5.1/?.so;;./?.so;/usr/local/lib/lua/5.1/?.so;/usr/local/openresty/luajit/lib/lua/5.1/?.so;/usr/local/lib/lua/5.1/loadall.so;";
   
   lua_shared_dict internal_status  10m;
   lua_shared_dict plugin-limit-req 10m;
   lua_shared_dict plugin-limit-count   10m;
   lua_shared_dict prometheus-metrics   10m;
   lua_shared_dict plugin-limit-conn10m;
   lua_shared_dict upstream-healthcheck 10m;
   lua_shared_dict worker-events10m;
   lua_shared_dict lrucache-lock10m;
   lua_shared_dict skywalking-tracing-buffer100m;
   lua_shared_dict balancer_ewma10m;
   lua_shared_dict balancer_ewma_locks  10m;
   lua_shared_dict balancer_ewma_last_touched_at 10m;
   lua_shared_dict plugin-limit-count-redis-cluster-slot-lock 1m;
   lua_shared_dict tracing_buffer   10m; # plugin: skywalking
   lua_shared_dict plugin-api-breaker   10m;
   
   # for openid-connect and authz-keycloak plugin
   lua_shared_dict discovery 1m; # cache for discovery metadata 
documents
   
   # for openid-connect plugin
   lua_shared_dict jwks  1m; # cache for JWKs
   lua_shared_dict introspection10m; # cache for JWT verification 
results
   
   # for authz-keycloak
   lua_shared_dict access_tokens 1m; # cache for service account 
access tokens
   
   # for custom shared dict
   
   # for proxy cache
   proxy_cache_path /tmp/disk_cache_one levels=1:2 
keys_zone=disk_cache_one:50m inactive=1d max_size=1G use_temp_path=off;
   
   # for proxy cache
   map $upstream_cache_zone $upstream_cache_zone_info {
   disk_cache_one /tmp/disk_cache_one,1:2;
   }
   
   
   lua_ssl_verify_depth 5;
   ssl_session_timeout 86400;
   
   underscores_in_headers on;
   
   lua_socket_log_errors off;
   
   resolver 10.254.0.2 valid=30;
   resolver_timeout 5;
   
   lua_http10_buffering off;
   
   lua_regex_match_limit 10;
   lua_regex_cache_max_entries 8192;
   
   log_format main escape=default '$remote_addr - $remote_user 
[$time_local] $http_host "$request" $status $body_bytes_sent $request_time 
"$http_referer" "$http_user_agent" $upstream_addr $upstream_status 
$upstream_response_time "$upstream_scheme://$upstream_host$upstream_uri"';
   
   access_log /dev/stdout main buffer=16384 flush=3;
   open_file_cache  max=1000 inactive=60;
   client_max_body_size 0;
   keepalive_timeout 60s;
   client_header_timeout 60s;
   client_body_timeout 60s;
   send_timeout 10s;
   
   server_tokens off;
   
   include mime.types;
   charset utf-8;
   
   real_ip_header X-Real-IP;
   
   set_real_ip_from 127.0.0.1;
   set_real_ip_from unix:;
   
   # http configuration snippet starts
   
   
   # http configuration snippet ends
   
   upstream apisix_backend {
   server 0.0.0.1;
   balancer_by_lua_block {
   apisix.http_balancer_phase()
   }
   
   keepalive 320;
   }
   
   
   init_by_lua_block {
   require "resty.core"
   apisix = require("apisix")
   
   local dns_resolver = { "10.254.0.2", }
   local args = {
   dns_resolver = dns_resolver,
   }
   apisix.http_init(args)
   }
   
   init_worker_by_lua_block {
   apisix.http_init_worker()
   }
   
   server {
   listen 

[GitHub] [apisix] spacewander edited a comment on issue #3942: request help: How to proxy to a third-party website by developing a plug-in?

2021-03-29 Thread GitBox


spacewander edited a comment on issue #3942:
URL: https://github.com/apache/apisix/issues/3942#issuecomment-809851447


   See 
https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md#upstream.
 You need to use the domain name as the `nodes`. For example,
   
   ```
   {
   "id": "1", 
   "scheme": "https",
   "nodes": {"github.com": 100},
   "type":"roundrobin"
   }
   ```


-- 
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 edited a comment on issue #3942: request help: How to proxy to a third-party website by developing a plug-in?

2021-03-29 Thread GitBox


spacewander edited a comment on issue #3942:
URL: https://github.com/apache/apisix/issues/3942#issuecomment-809851447


   See 
https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md#upstream.
 You need to use the domain name as the `nodes`. For example,
   
   ```
   {
   "id": "1", 
   "scheme": "https",
   "nodes": {"github.com": 100},
   "type":"roundrobin",
   }
   ```


-- 
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 edited a comment on issue #3942: request help: How to proxy to a third-party website by developing a plug-in?

2021-03-29 Thread GitBox


spacewander edited a comment on issue #3942:
URL: https://github.com/apache/apisix/issues/3942#issuecomment-809851447


   See 
https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md#upstream.
 You need to use the domain name as the `nodes`. For example,
   
   ```
   {
   "id": "1", 
   "scheme": "https",
   "nodes": {"github.com:443": 100},
   "type":"roundrobin",
   }
   ```


-- 
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] hackeryutu closed issue #3935: request help: Specify an upstream and remove it from all routes

2021-03-29 Thread GitBox


hackeryutu closed issue #3935:
URL: https://github.com/apache/apisix/issues/3935


   


-- 
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 closed issue #3942: request help: How to proxy to a third-party website by developing a plug-in?

2021-03-29 Thread GitBox


spacewander closed issue #3942:
URL: https://github.com/apache/apisix/issues/3942


   


-- 
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 #3942: request help: How to proxy to a third-party website by developing a plug-in?

2021-03-29 Thread GitBox


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


   See 
https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md#upstream.
 You need to use the domain name as the `nodes`.


-- 
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 #3934: feat: Discovery Nacos

2021-03-29 Thread GitBox


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


   GitHub action is not stable enough. Try to push a new commit again.


-- 
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 edited a comment on issue #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


spacewander edited a comment on issue #3937:
URL: https://github.com/apache/apisix/issues/3937#issuecomment-809849343


   If it reports an error log in 18:26, it doesn't get data from another etcd 
node at that time.
   @Firstsawyou 
   Does the error log happen forever or just for a moment?


-- 
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 #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


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


   If it reports an error log in 18:26, it doesn't get data from another etcd 
node.
   @Firstsawyou 
   Does the error log happen forever or just for a moment?


-- 
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] imxhf commented on pull request #3934: feat: Discovery Nacos

2021-03-29 Thread GitBox


imxhf commented on pull request #3934:
URL: https://github.com/apache/apisix/pull/3934#issuecomment-809848507


   @spacewander @membphis Execuse me, why the checks stopped here? 


-- 
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 #3942: request help: How to proxy to a third-party website by developing a plug-in?

2021-03-29 Thread GitBox


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


   @kongjun01 
   Please use English in the public channel, thx


-- 
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 #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


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


   @Yiyiyimu @spacewander if we can get data from other etcd node, do we need 
print `ERR` level 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] spacewander opened a new pull request #3943: test: make plugin/log-rotate.t stable

2021-03-29 Thread GitBox


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


   Signed-off-by: spacewander 
   
   ### 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?
   * [ ] Is this PR backward compatible? **If it is not backward compatible, 
please discuss on the [mailing 
list](https://github.com/apache/apisix/tree/master#community) 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




[GitHub] [apisix] kongjun01 opened a new issue #3942: request help: 如何通过开发插件代理到第三方的网站?

2021-03-29 Thread GitBox


kongjun01 opened a new issue #3942:
URL: https://github.com/apache/apisix/issues/3942


   ### Issue description
   如题。
   效果和下面类似的(用户访问 http://ip:port,则反向代理到 https://github.com):
 location / {
 proxy_pass  https://github.com;
 proxy_redirect off;
 proxy_set_header   Host $host;
 proxy_set_header   X-Real-IP$remote_addr;
 proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
 }
   
   ### Environment
   
   * apisix version (cmd: `apisix version`):
   * OS (cmd: `uname -a`):
   * OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`):
   * etcd version, if have (cmd: run `curl 
http://127.0.0.1:9090/v1/server_info` to get the info from server-info API):
   * apisix-dashboard version, if have:
   


-- 
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 #3925: feat(skywalking): allow destory and configure report interval for rep…

2021-03-29 Thread GitBox


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


   


-- 
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 closed issue #2895: Can't disable skywalking plugin on the fly

2021-03-29 Thread GitBox


spacewander closed issue #2895:
URL: https://github.com/apache/apisix/issues/2895


   


-- 
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: feat(skywalking): allow destory and configure report interval for reporter (#3925)

2021-03-29 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 7c976b5  feat(skywalking):  allow destory and configure report 
interval for reporter (#3925)
7c976b5 is described below

commit 7c976b50ab02219bbaccb0602d5357adbba20c32
Author: 罗泽轩 
AuthorDate: Tue Mar 30 09:54:18 2021 +0800

feat(skywalking):  allow destory and configure report interval for reporter 
(#3925)

Fix #2895

Signed-off-by: spacewander 
---
 apisix/plugins/skywalking.lua| 17 
 docs/en/latest/plugins/skywalking.md |  3 +-
 docs/zh/latest/plugins/skywalking.md |  3 +-
 t/admin/plugins-reload.t | 54 +++-
 4 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/apisix/plugins/skywalking.lua b/apisix/plugins/skywalking.lua
index c0f74f3..5d6553a 100644
--- a/apisix/plugins/skywalking.lua
+++ b/apisix/plugins/skywalking.lua
@@ -39,6 +39,9 @@ local metadata_schema = {
 type = "string",
 default = "http://127.0.0.1:12800;,
 },
+report_interval = {
+type = "integer",
+},
 },
 additionalProperties = false,
 }
@@ -127,8 +130,22 @@ function _M.init()
 metadata_shdict:set('serviceInstanceName', 
local_plugin_info.service_instance_name)
 
 local sk_cli = require("skywalking.client")
+if local_plugin_info.report_interval then
+sk_cli.backendTimerDelay = local_plugin_info.report_interval
+end
+
 sk_cli:startBackendTimer(local_plugin_info.endpoint_addr)
 end
 
 
+function _M.destroy()
+if process.type() ~= "worker" then
+return
+end
+
+local sk_cli = require("skywalking.client")
+sk_cli:destroyBackendTimer()
+end
+
+
 return _M
diff --git a/docs/en/latest/plugins/skywalking.md 
b/docs/en/latest/plugins/skywalking.md
index 6475fad..b496b84 100644
--- a/docs/en/latest/plugins/skywalking.md
+++ b/docs/en/latest/plugins/skywalking.md
@@ -91,7 +91,8 @@ We can set the endpoint by specified the configuration in 
`conf/config.yaml`.
 |  | -- |  | 
 |
 | service_name | string | "APISIX" | service name for skywalking reporter  
   |
 |service_instance_name|string|"APISIX Instance Name" | service instance name 
for skywalking reporter |
-| endpoint | string | "http://127.0.0.1:12800; | the http endpoint of 
Skywalking, for example: http://127.0.0.1:12800 |
+| endpoint_addr| string | "http://127.0.0.1:12800; | the http endpoint of 
Skywalking, for example: http://127.0.0.1:12800 |
+| report_interval| integer | use the value in the skywalking client library | 
the report interval, in seconds |
 
 Here is an example:
 
diff --git a/docs/zh/latest/plugins/skywalking.md 
b/docs/zh/latest/plugins/skywalking.md
index 888a0d3..ec5acb6 100644
--- a/docs/zh/latest/plugins/skywalking.md
+++ b/docs/zh/latest/plugins/skywalking.md
@@ -95,7 +95,8 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1  -H 
'X-API-KEY: edd1c9f034335f1
 |  | -- |  | 
- |
 | service_name | string |  "APISIX" | skywalking 上报的 service 名称
 |
 |service_instance_name|string| "APISIX Instance Name" | skywalking 上报的 service 
实例名 |
-| endpoint | string | "http://127.0.0.1:12800; | Skywalking 的 HTTP 
endpoint 地址,例如:http://127.0.0.1:12800 |
+| endpoint_addr| string | "http://127.0.0.1:12800; | Skywalking 的 HTTP 
endpoint 地址,例如:http://127.0.0.1:12800 |
+| report_interval| integer | 使用 skywalking 客户端内置的值 | 上报时间间隔,单位是秒|
 
 配置示例:
 
diff --git a/t/admin/plugins-reload.t b/t/admin/plugins-reload.t
index e46b25a..52fb419 100644
--- a/t/admin/plugins-reload.t
+++ b/t/admin/plugins-reload.t
@@ -26,7 +26,9 @@ workers(2);
 add_block_preprocessor(sub {
 my ($block) = @_;
 
-$block->set_value("no_error_log", "[error]");
+if (!defined $block->no_error_log) {
+$block->set_value("no_error_log", "[error]");
+}
 
 $block;
 });
@@ -249,3 +251,53 @@ GET /t
 404
 done
 200
+
+
+
+=== TEST 5: reload plugins to disable skywalking
+--- yaml_config
+apisix:
+  node_listen: 1984
+  admin_key: null
+plugins:
+  - skywalking
+plugin_attr:
+  skywalking:
+service_name: APISIX
+service_instance_name: "APISIX Instance Name"
+endpoint_addr: http://127.0.0.1:12801
+report_interval: 1
+--- config
+location /t {
+content_by_lua_block {
+local core = require "apisix.core"
+ngx.sleep(1.2)
+local t = require("lib.test_admin").test
+
+local data = [[
+apisix:
+  node_listen: 1984
+  admin_key: null
+plugins:
+  - prometheus
+]]
+require("lib.test_admin").set_config_yaml(data)
+
+local code, _, org_body = 

[GitHub] [apisix] kongjun01 closed issue #3783: request help: SSL: error:1408F10B:SSL routines:ssl3_get_record:wrong version number

2021-03-29 Thread GitBox


kongjun01 closed issue #3783:
URL: https://github.com/apache/apisix/issues/3783


   


-- 
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] kongjun01 commented on issue #3783: request help: SSL: error:1408F10B:SSL routines:ssl3_get_record:wrong version number

2021-03-29 Thread GitBox


kongjun01 commented on issue #3783:
URL: https://github.com/apache/apisix/issues/3783#issuecomment-809844807


   问题解决了,强制跳转https用的是重定向,不是重写


-- 
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] Jaycean commented on issue #1687: request help: What’s the function of export OpenAPI on the dashboard

2021-03-29 Thread GitBox


Jaycean commented on issue #1687:
URL: 
https://github.com/apache/apisix-dashboard/issues/1687#issuecomment-809844608


   > > please give some detail about how to reproduce it, thanks.
   > 
   > Just use the function "导出 OpenAPI" on the dashboard, and it exports data 
like:
   > 
   > ```
   > info:
   >   title: RoutesExport
   >   version: 3.0.0
   > openapi: 3.0.0
   > paths:
   >   /acm: {}
   >   /{params}: {}
   >   /{params}-APISIX-REPEAT-URI-3: {}
   >   /{params}-APISIX-REPEAT-URI-4: {}
   >   /{params}-APISIX-REPEAT-URI-5: {}
   > ```
   > 
   > Is it right?
   
   Please provide the detailed data of the export route. Or check if the 
methods are set in the route data. If not, refer to the issue: #1668. We are 
repairing 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] juzhiyuan opened a new pull request #3941: docs: improve Getting Started

2021-03-29 Thread GitBox


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


   ### What this PR does / why we need it:
   
   Improve getting started contents to have a more clear & better Read 
experience.
   
   ### 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? **If it is not backward compatible, 
please discuss on the [mailing 
list](https://github.com/apache/apisix/tree/master#community) 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] 01/01: docs: improve Getting Started

2021-03-29 Thread juzhiyuan
This is an automated email from the ASF dual-hosted git repository.

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

commit f56fcbc2af78f4c89787626637ecc97c11c0cd6f
Author: juzhiyuan 
AuthorDate: Tue Mar 30 09:42:13 2021 +0800

docs: improve Getting Started
---
 docs/en/latest/getting-started.md | 63 +--
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/docs/en/latest/getting-started.md 
b/docs/en/latest/getting-started.md
index 13f685c..e44048b 100644
--- a/docs/en/latest/getting-started.md
+++ b/docs/en/latest/getting-started.md
@@ -21,29 +21,62 @@ title: Getting Started
 #
 -->
 
-## Quick Start Guide
+## Quick Start
 
-The goal of this guide is to get started with APISIX and to configure a 
secured public API with APISIX.
-By the end of this guide, you will have a working APISIX setup and a new 
service which will route to a public API, which is secured by an API key.
+This guide aims to get started with Apache APISIX, we will configure the 
service that will route to a public API, secured by an API key.
 
-The following GET endpoint will be used for the purpose of this tutorial. This 
will act as an echo endpoint and will return the parameters which are sent to 
the API.
+Also, we will take the following `echo` endpoint as an example, it will return 
parameters we passed.
+
+**Request**
 
 ```bash
 $ curl --location --request GET "https://httpbin.org/get?foo1=bar1=bar2;
 ```
 
+**Response**
+
+```json
+{
+  "args": {
+"foo1": "bar1", 
+"foo2": "bar2"
+  },
+  "headers": {
+"Accept": 
"text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
 
+"Accept-Encoding": "gzip, deflate, br", 
+"Accept-Language": "en,zh-CN;q=0.9,zh;q=0.8", 
+"Cache-Control": "max-age=0", 
+"Host": "httpbin.org", 
+"Sec-Ch-Ua": "\"Google Chrome\";v=\"89\", \"Chromium\";v=\"89\", \";Not A 
Brand\";v=\"99\"", 
+"Sec-Ch-Ua-Mobile": "?0", 
+"Sec-Fetch-Dest": "document", 
+"Sec-Fetch-Mode": "navigate", 
+"Sec-Fetch-Site": "none", 
+"Sec-Fetch-User": "?1", 
+"Upgrade-Insecure-Requests": "1", 
+"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_2) 
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36", 
+"X-Amzn-Trace-Id": "Root=1-606276ab-2b451d4b36057c186d666351"
+  },
+  "origin": "58.152.81.42",
+  "url": "https://httpbin.org/get?foo1=bar1=bar2;
+}
+```
+
+
 Let's deconstruct the above URL.
 
-- Scheme: HTTPS
-- Host/Address: httpbin.org
+- Protocol: HTTPS
 - Port: 443
-- URI: /get
+- Host: httpbin.org
+- URI/Path: /get
 - Query Parameters: foo1, foo2
 
 ## Prerequisites
 
-- This guide uses docker and docker-compose to setup APISIX. But if you have 
already installed APISIX in other ways, you can just skip to [step 
2](getting-started.md#step-2-create-a-route-in-apisix).
-- Curl: The guide uses curl command for API testing, but you can also use any 
other tool of your choice (Eg- Postman).
+> If you have installed Apache APISIX, just skip to [Step 
2](getting-started.md#step-2-create-a-route-in-apisix) please.
+
+- This guide uses [Docker](https://www.docker.com/) and [Docker 
Compose](https://docs.docker.com/compose/) to setup Apache APISIX.
+- `curl`: The guide uses curl command for API testing, but you can also use 
any other tools, e.g `Postman`.
 
 ## Step 1: Install APISIX
 
@@ -256,12 +289,12 @@ same route configurations via the dashboard as well.
 - Make sure the required ports are not being used by other systems/processes 
(The default ports are: 9080, 9443, 2379).
 The following is the command to kill a process which is listening to a 
specific port (in unix based systems).
 
-```bash
-sudo fuser -k 9443/tcp
-```
+```bash
+$ sudo fuser -k 9443/tcp
+```
 
 - If the docker container is continuously restarting/failing, login to the 
container and observe the logs to diagnose the issue.
 
-```bash
-docker logs -f --tail container_id
-```
+```bash
+$ docker logs -f --tail container_id
+```


[apisix] branch docs-admin-api created (now f56fcbc)

2021-03-29 Thread juzhiyuan
This is an automated email from the ASF dual-hosted git repository.

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


  at f56fcbc  docs: improve Getting Started

This branch includes the following new commits:

 new f56fcbc  docs: improve Getting Started

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] spacewander commented on a change in pull request #3820: feat: add nacos support

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3820:
URL: https://github.com/apache/apisix/pull/3820#discussion_r603719667



##
File path: apisix/discovery/nacos.lua
##
@@ -0,0 +1,324 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+local local_conf = require("apisix.core.config_local").local_conf()
+local http   = require("resty.http")
+local core   = require("apisix.core")
+local ipairs = ipairs
+local tostring   = tostring
+local type   = type
+local math   = math
+local math_random= math.random
+local error  = error
+local ngx= ngx
+local ngx_re = require("ngx.re")
+local ngx_timer_at   = ngx.timer.at
+local ngx_timer_every= ngx.timer.every
+local string = string
+local table  = table
+local string_sub = string.sub
+local str_byte   = string.byte
+local str_find   = core.string.find
+local str_format = string.format
+local log= core.log
+
+local default_weight
+local applications
+local auth_path
+local service_list_path
+local page_size
+local instance_list_path
+
+local schema = {
+type = "object",
+properties = {
+host = {
+type = "array",
+minItems = 1,
+items = {
+type = "string",
+},
+},
+fetch_interval = {type = "integer", minimum = 1, default = 30},
+prefix = {type = "string", default = "/nacos/v1/"},
+page_size = {type = "integer", minimum = 1, default = 100},
+weight = {type = "integer", minimum = 1, default = 100},
+timeout = {
+type = "object",
+properties = {
+connect = {type = "integer", minimum = 1, default = 2000},
+send = {type = "integer", minimum = 1, default = 2000},
+read = {type = "integer", minimum = 1, default = 5000},
+},
+default = {
+connect = 2000,
+send = 2000,
+read = 5000,
+}
+},
+},
+required = {"host"}
+}
+
+
+local _M = {
+version = 0.1,
+}
+
+
+local function service_info()
+local host = local_conf.discovery and
+local_conf.discovery.nacos and local_conf.discovery.nacos.host
+if not host then
+log.error("do not set nacos.host")
+return
+end
+
+local username, password
+-- TODO Add health check to get healthy nodes.
+local url = host[math_random(#host)]
+local auth_idx = str_find(url, "#")

Review comment:
   You need to escape it as `\@` in the template string. The `@` has a 
special meaning in Perl.




-- 
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] aiyiyi121 commented on issue #1687: request help: What’s the function of export OpenAPI on the dashboard

2021-03-29 Thread GitBox


aiyiyi121 commented on issue #1687:
URL: 
https://github.com/apache/apisix-dashboard/issues/1687#issuecomment-809840009


   > please give some detail about how to reproduce it, thanks.
   
   Just use the function "导出 OpenAPI" on the dashboard, and it exports data 
like:
   
   ```components: {}
   info:
 title: RoutesExport
 version: 3.0.0
   openapi: 3.0.0
   paths:
 /acm: {}
 /{params}: {}
 /{params}-APISIX-REPEAT-URI-3: {}
 /{params}-APISIX-REPEAT-URI-4: {}
 /{params}-APISIX-REPEAT-URI-5: {}
   ```
   Is it right?
   


-- 
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 #3820: feat: add nacos support

2021-03-29 Thread GitBox


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


   Please merge master to resolve conflicts.


-- 
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 a change in pull request #3820: feat: add nacos support

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3820:
URL: https://github.com/apache/apisix/pull/3820#discussion_r603719667



##
File path: apisix/discovery/nacos.lua
##
@@ -0,0 +1,324 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+local local_conf = require("apisix.core.config_local").local_conf()
+local http   = require("resty.http")
+local core   = require("apisix.core")
+local ipairs = ipairs
+local tostring   = tostring
+local type   = type
+local math   = math
+local math_random= math.random
+local error  = error
+local ngx= ngx
+local ngx_re = require("ngx.re")
+local ngx_timer_at   = ngx.timer.at
+local ngx_timer_every= ngx.timer.every
+local string = string
+local table  = table
+local string_sub = string.sub
+local str_byte   = string.byte
+local str_find   = core.string.find
+local str_format = string.format
+local log= core.log
+
+local default_weight
+local applications
+local auth_path
+local service_list_path
+local page_size
+local instance_list_path
+
+local schema = {
+type = "object",
+properties = {
+host = {
+type = "array",
+minItems = 1,
+items = {
+type = "string",
+},
+},
+fetch_interval = {type = "integer", minimum = 1, default = 30},
+prefix = {type = "string", default = "/nacos/v1/"},
+page_size = {type = "integer", minimum = 1, default = 100},
+weight = {type = "integer", minimum = 1, default = 100},
+timeout = {
+type = "object",
+properties = {
+connect = {type = "integer", minimum = 1, default = 2000},
+send = {type = "integer", minimum = 1, default = 2000},
+read = {type = "integer", minimum = 1, default = 5000},
+},
+default = {
+connect = 2000,
+send = 2000,
+read = 5000,
+}
+},
+},
+required = {"host"}
+}
+
+
+local _M = {
+version = 0.1,
+}
+
+
+local function service_info()
+local host = local_conf.discovery and
+local_conf.discovery.nacos and local_conf.discovery.nacos.host
+if not host then
+log.error("do not set nacos.host")
+return
+end
+
+local username, password
+-- TODO Add health check to get healthy nodes.
+local url = host[math_random(#host)]
+local auth_idx = str_find(url, "#")

Review comment:
   You need to escape it as `\@` in the template string.




-- 
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 #3923: request help: timer enhancement

2021-03-29 Thread GitBox


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


   Yes, you are right.
   We can add an option to override this behavior and use it in the background 
timer.
   PR is welcome!


-- 
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 #3935: request help: Specify an upstream and remove it from all routes

2021-03-29 Thread GitBox


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


   Hi, @hackeryutu 
   According to the current description, we do not know what your problem is, 
you need to describe your problem clearly.


-- 
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 #3937: [discuss]: when a node in the etcd cluster fails, no error log is output

2021-03-29 Thread GitBox


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


   The error log is right. If it reports the connection is refused, that means 
it fails to get any data from etcd at that moment.


-- 
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 #1685: docs: tells users where they are

2021-03-29 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=h1) 
Report
   > Merging 
[#1685](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=desc) 
(1b5c270) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/88f323285f2bdbafca027da9aef357b2e3eb4008?el=desc)
 (88f3232) will **decrease** coverage by `1.17%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1685  +/-   ##
   ==
   - Coverage   72.41%   71.24%   -1.18% 
   ==
 Files 133   47  -86 
 Lines5728 3116-2612 
 Branches  6660 -666 
   ==
   - Hits 4148 2220-1928 
   + Misses   1337  653 -684 
 Partials  243  243  
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `61.97% <ø> (+0.12%)` | :arrow_up: |
   | backend-e2e-test-ginkgo | `48.52% <ø> (-0.13%)` | :arrow_down: |
   | backend-unit-test | `51.81% <ø> (ø)` | |
   | frontend-e2e-test | `?` | |
   
   Flags with carried forward coverage won't be shown. [Click 
here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment)
 to find out more.
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[web/src/pages/Upstream/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9VcHN0cmVhbS9MaXN0LnRzeA==)
 | | |
   | 
[web/src/pages/SSL/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TU0wvQ3JlYXRlLnRzeA==)
 | | |
   | 
[web/src/components/Upstream/constant.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbnN0YW50LnRz)
 | | |
   | 
[...pages/Route/components/Step1/RequestConfigView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL1N0ZXAxL1JlcXVlc3RDb25maWdWaWV3LnRzeA==)
 | | |
   | 
[web/src/pages/SSL/service.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TU0wvc2VydmljZS50cw==)
 | | |
   | 
[web/src/components/RightContent/AvatarDropdown.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1JpZ2h0Q29udGVudC9BdmF0YXJEcm9wZG93bi50c3g=)
 | | |
   | 
[web/src/components/PluginOrchestration/index.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbk9yY2hlc3RyYXRpb24vaW5kZXgudHN4)
 | | |
   | 
[web/src/constants.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9jb25zdGFudHMudHM=)
 | | |
   | 
[web/src/pages/Service/components/Step1.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL2NvbXBvbmVudHMvU3RlcDEudHN4)
 | | |
   | 
[...c/pages/Route/components/ResultView/ResultView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL1Jlc3VsdFZpZXcvUmVzdWx0Vmlldy50c3g=)
 | | |
   | ... and [71 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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/1685?src=pr=footer).
 Last update 
[88f3232...1b5c270](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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] codecov-io edited a comment on pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=h1) 
Report
   > Merging 
[#1685](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=desc) 
(1b5c270) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/88f323285f2bdbafca027da9aef357b2e3eb4008?el=desc)
 (88f3232) will **decrease** coverage by `5.37%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1685  +/-   ##
   ==
   - Coverage   72.41%   67.04%   -5.38% 
   ==
 Files 133   47  -86 
 Lines5728 3116-2612 
 Branches  6660 -666 
   ==
   - Hits 4148 2089-2059 
   + Misses   1337  774 -563 
   - Partials  243  253  +10 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `47.36% <ø> (-14.48%)` | :arrow_down: |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `51.81% <ø> (ø)` | |
   | frontend-e2e-test | `?` | |
   
   Flags with carried forward coverage won't be shown. [Click 
here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment)
 to find out more.
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[...l/handler/route\_online\_debug/route\_online\_debug.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGVfb25saW5lX2RlYnVnL3JvdXRlX29ubGluZV9kZWJ1Zy5nbw==)
 | `5.55% <0.00%> (-70.38%)` | :arrow_down: |
   | 
[api/internal/handler/healthz/healthz.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGVhbHRoei9oZWFsdGh6Lmdv)
 | `66.66% <0.00%> (-33.34%)` | :arrow_down: |
   | 
[api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==)
 | `81.25% <0.00%> (-18.75%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | `39.49% <0.00%> (-15.97%)` | :arrow_down: |
   | 
[api/internal/handler/schema/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2NoZW1hL3NjaGVtYS5nbw==)
 | `90.47% <0.00%> (-9.53%)` | :arrow_down: |
   | 
[api/internal/handler/handler.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGFuZGxlci5nbw==)
 | `68.51% <0.00%> (-9.26%)` | :arrow_down: |
   | 
[api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `63.55% <0.00%> (-7.48%)` | :arrow_down: |
   | 
[api/internal/handler/route/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=)
 | `71.42% <0.00%> (-7.35%)` | :arrow_down: |
   | 
[api/internal/handler/ssl/ssl.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc3NsL3NzbC5nbw==)
 | `67.53% <0.00%> (-5.76%)` | :arrow_down: |
   | 
[api/internal/filter/authentication.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9hdXRoZW50aWNhdGlvbi5nbw==)
 | `72.22% <0.00%> (-5.56%)` | :arrow_down: |
   | ... and [86 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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/1685?src=pr=footer).
 Last update 
[88f3232...1b5c270](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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 

[GitHub] [apisix] spacewander commented on a change in pull request #3910: fix: limit-count plugin connect error

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3910:
URL: https://github.com/apache/apisix/pull/3910#discussion_r603714643



##
File path: apisix/plugins/limit-count.lua
##
@@ -103,6 +103,9 @@ local schema = {
 redis_timeout = {
 type = "integer", minimum = 1, default = 1000,
 },
+redis_cluster_name = {
+type = "string", default = "apisix-redis-cluster",
+},
 },
 required = {"redis_cluster_nodes"},

Review comment:
   For the reason I have said, the `redis_cluster_name` should be required. 
Therefore it can't have a default value.




-- 
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 a change in pull request #3910: fix: limit-count plugin connect error

2021-03-29 Thread GitBox


spacewander commented on a change in pull request #3910:
URL: https://github.com/apache/apisix/pull/3910#discussion_r603714643



##
File path: apisix/plugins/limit-count.lua
##
@@ -103,6 +103,9 @@ local schema = {
 redis_timeout = {
 type = "integer", minimum = 1, default = 1000,
 },
+redis_cluster_name = {
+type = "string", default = "apisix-redis-cluster",
+},
 },
 required = {"redis_cluster_nodes"},

Review comment:
   For the reason I have said, the `redis_cluster_name` should be required. 
 

##
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##
@@ -32,7 +32,8 @@ local mt = {
 
 local function new_redis_cluster(conf)
 local config = {
-name = "apisix-redis-cluster-" .. conf.name,
+   -- can set different name for different redis cluster

Review comment:
   style: indent

##
File path: apisix/plugins/limit-count.lua
##
@@ -103,6 +103,9 @@ local schema = {
 redis_timeout = {
 type = "integer", minimum = 1, default = 1000,
 },
+redis_cluster_name = {

Review comment:
   We should update the doc too.




-- 
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 #1687: request help: What’s the function of export OpenAPI on the dashboard

2021-03-29 Thread GitBox


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


   please give some detail about how to reproduce it, 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 commented on issue #1687: request help: What’s the function of export OpenAPI on the dashboard

2021-03-29 Thread GitBox


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


   please give some detail about how to reproduce 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] nic-chen commented on issue #1397: feat: Customize the configurations of Semantic-Pull-Request check in CI

2021-03-29 Thread GitBox


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


   > > By default types specified in commitizen/conventional-commit-types is 
used.
   > 
   > > See: 
https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json
   > 
   > 
   > 
   > No `backport` type in index.json
   > 
   > 
   
   could we add 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] codecov-io edited a comment on pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=h1) 
Report
   > Merging 
[#1685](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=desc) 
(1b5c270) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/88f323285f2bdbafca027da9aef357b2e3eb4008?el=desc)
 (88f3232) will **decrease** coverage by `20.60%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1685   +/-   ##
   ===
   - Coverage   72.41%   51.81%   -20.61% 
   ===
 Files 133   38   -95 
 Lines5728 2650 -3078 
 Branches  6660  -666 
   ===
   - Hits 4148 1373 -2775 
   + Misses   1337 1089  -248 
   + Partials  243  188   -55 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `51.81% <ø> (ø)` | |
   | frontend-e2e-test | `?` | |
   
   Flags with carried forward coverage won't be shown. [Click 
here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment)
 to find out more.
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3ZlcnNpb24uZ28=)
 | `0.00% <0.00%> (-100.00%)` | :arrow_down: |
   | 
[api/internal/filter/request\_id.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9yZXF1ZXN0X2lkLmdv)
 | `0.00% <0.00%> (-100.00%)` | :arrow_down: |
   | 
[api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==)
 | `0.00% <0.00%> (-100.00%)` | :arrow_down: |
   | 
[api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `0.00% <0.00%> (-71.03%)` | :arrow_down: |
   | 
[api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv)
 | `0.00% <0.00%> (-66.67%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | `0.00% <0.00%> (-55.47%)` | :arrow_down: |
   | 
[api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=)
 | `0.00% <0.00%> (-50.00%)` | :arrow_down: |
   | 
[api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `27.41% <0.00%> (-37.50%)` | :arrow_down: |
   | 
[api/internal/handler/handler.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGFuZGxlci5nbw==)
 | `42.59% <0.00%> (-35.19%)` | :arrow_down: |
   | 
[api/internal/handler/schema/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2NoZW1hL3NjaGVtYS5nbw==)
 | `66.66% <0.00%> (-33.34%)` | :arrow_down: |
   | ... and [113 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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/1685?src=pr=footer).
 Last update 
[88f3232...1b5c270](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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] Jaycean commented on a change in pull request #1673: fix: unable to export route with nil methods field

2021-03-29 Thread GitBox


Jaycean commented on a change in pull request #1673:
URL: https://github.com/apache/apisix-dashboard/pull/1673#discussion_r603712340



##
File path: api/internal/handler/data_loader/route_export.go
##
@@ -233,7 +235,7 @@ func (h *Handler) RouteToOpenAPI3(c droplet.Context, routes 
[]*entity.Route) (*o
return nil, err
}
 
-   if plugins != nil {
+   if len(plugins) > 0 {

Review comment:
   
   It was written in the 
past(commit:https://github.com/apache/apisix-dashboard/pull/1673/commits/6dd85785cd752539b0ec50652e68e1f34ef1cf56),
 but go-link will report error, so it was modified according to go-link.




-- 
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] iamayushdas commented on a change in pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


iamayushdas commented on a change in pull request #1685:
URL: https://github.com/apache/apisix-dashboard/pull/1685#discussion_r603709604



##
File path: web/src/pages/Service/Create.tsx
##
@@ -116,7 +116,7 @@ const Page: React.FC = (props) => {
 <>
   

[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1673: fix: unable to export route with nil methods field

2021-03-29 Thread GitBox


nic-chen commented on a change in pull request #1673:
URL: https://github.com/apache/apisix-dashboard/pull/1673#discussion_r603707627



##
File path: api/internal/handler/data_loader/route_export.go
##
@@ -233,7 +235,7 @@ func (h *Handler) RouteToOpenAPI3(c droplet.Context, routes 
[]*entity.Route) (*o
return nil, err
}
 
-   if plugins != nil {
+   if len(plugins) > 0 {

Review comment:
   how about add `plugins != nil &&`




-- 
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 #1667: feat: run manager-api as a systemd daemon/service

2021-03-29 Thread GitBox


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


   > > @bisakhmondal
   > 
   > > I think we could use a library to automate, instead of writing a 
configuration for each platform. What do you think?
   > 
   > 
   > 
   > Totally agree with you :+1: . A few days back I found 
https://github.com/kardianos/service. It seems it's gonna serve our purpose (I 
haven't tested it though). What do you think?
   
   looks good. you could find some more libs and compare them
   


-- 
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 a change in pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


nic-chen commented on a change in pull request #1685:
URL: https://github.com/apache/apisix-dashboard/pull/1685#discussion_r603704429



##
File path: web/src/pages/Service/Create.tsx
##
@@ -116,7 +116,7 @@ const Page: React.FC = (props) => {
 <>
Do we have `serviceId`? cc @nic-chen 
   
   looks like use in creating a service? if yes, we do need it here




-- 
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 a change in pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


juzhiyuan commented on a change in pull request #1685:
URL: https://github.com/apache/apisix-dashboard/pull/1685#discussion_r603694459



##
File path: web/src/locales/zh-CN/component.ts
##
@@ -21,19 +21,24 @@ export default {
   'component.global.search': '查询',
   'component.global.reset': '重置',
   'component.global.confirm': '确认',
+  'component.global.format': '格式',

Review comment:
   ```suggestion
 'component.global.format': '格式化',
   ```

##
File path: docs/en/latest/config.json
##
@@ -1,6 +1,11 @@
 {
   "version": 2.4,
   "sidebar": [
+{
+  "type": "link",
+  "label": "Apache Apisix Dashboard",

Review comment:
   ```suggestion
 "label": "Apache APISIX Dashboard",
   ```

##
File path: web/src/locales/zh-CN/component.ts
##
@@ -21,19 +21,24 @@ export default {
   'component.global.search': '查询',
   'component.global.reset': '重置',
   'component.global.confirm': '确认',
+  'component.global.format': '格式',
+  'component.global.document': '文档',
+  'component.global.enable': '使能够',
+  'component.global.scope': '范围',
+  'component.global.data.editor': '资料编辑器',

Review comment:
   ```suggestion
 'component.global.data.editor': '元数据编辑器',
   ```

##
File path: web/src/pages/Plugin/locales/en-US.ts
##
@@ -16,5 +16,7 @@
  */
 export default {
   'page.plugin.drawer.popconfirm.title.delete': 'Are you sure to delete this 
item?',
-  'page.plugin.list': 'Plugin List'
+  'page.plugin.list': 'Plugin List',
+  'page.plugin.list.enabled': 'List of enabled plugins',
+  'page.plugin.market.config': 'Config Plugin',

Review comment:
   Not sure to use `config` or `configure`?

##
File path: web/src/locales/zh-CN/component.ts
##
@@ -21,19 +21,24 @@ export default {
   'component.global.search': '查询',
   'component.global.reset': '重置',
   'component.global.confirm': '确认',
+  'component.global.format': '格式',
+  'component.global.document': '文档',
+  'component.global.enable': '使能够',
+  'component.global.scope': '范围',
+  'component.global.data.editor': '资料编辑器',
   'component.global.delete': '删除',
   'component.global.cancel': '取消',
   'component.global.submit': '提交',
   'component.global.create': '创建',
   'component.global.createWithEditor': '使用编辑器创建',
   'component.global.add': '新建',
   'component.global.save': '保存',
-  'component.global.edit': '编辑',
+  'component.global.edit': '配置',

Review comment:
   actually, it's more clear to use `编辑` 
   
   ```suggestion
 'component.global.edit': '编辑',
   ```

##
File path: web/src/pages/Plugin/PluginMarket.tsx
##
@@ -20,6 +20,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 
 import PluginPage from '@/components/Plugin';
 import { fetchList, createOrUpdate } from './service';
+import { formatMessage } from 'umi';

Review comment:
   ok, we need to use
   
   ```suggestion
   import { useIntl } from 'umi';
   ```
   
   here, and use `const { formatMessage } = useIntl()`

##
File path: web/src/locales/zh-CN/component.ts
##
@@ -21,19 +21,24 @@ export default {
   'component.global.search': '查询',
   'component.global.reset': '重置',
   'component.global.confirm': '确认',
+  'component.global.format': '格式',
+  'component.global.document': '文档',
+  'component.global.enable': '使能够',

Review comment:
   ```suggestion
 'component.global.enable': '启用',
   ```

##
File path: web/src/locales/zh-CN/component.ts
##
@@ -21,19 +21,24 @@ export default {
   'component.global.search': '查询',
   'component.global.reset': '重置',
   'component.global.confirm': '确认',
+  'component.global.format': '格式',
+  'component.global.document': '文档',
+  'component.global.enable': '使能够',
+  'component.global.scope': '范围',

Review comment:
   ```suggestion
 'component.global.scope': '作用域',
   ```

##
File path: web/src/pages/Service/Create.tsx
##
@@ -116,7 +116,7 @@ const Page: React.FC = (props) => {
 <>
   

[GitHub] [apisix] defp opened a new pull request #3940: docs: ret_code type in plugin redirect should be integer (#3932)

2021-03-29 Thread GitBox


defp opened a new pull request #3940:
URL: https://github.com/apache/apisix/pull/3940


   ### What this PR does / why we need it:
   fix https://github.com/apache/apisix/issues/3932


-- 
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 #1685: docs: tells users where they are

2021-03-29 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=h1) 
Report
   > Merging 
[#1685](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=desc) 
(7cfe580) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/88f323285f2bdbafca027da9aef357b2e3eb4008?el=desc)
 (88f3232) will **increase** coverage by `1.57%`.
   > The diff coverage is `66.66%`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1685  +/-   ##
   ==
   + Coverage   72.41%   73.98%   +1.57% 
   ==
 Files 133   86  -47 
 Lines5728 2614-3114 
 Branches  666  668   +2 
   ==
   - Hits 4148 1934-2214 
   + Misses   1337  680 -657 
   + Partials  2430 -243 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `?` | |
   | frontend-e2e-test | `73.98% <66.66%> (+0.01%)` | :arrow_up: |
   
   Flags with carried forward coverage won't be shown. [Click 
here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment)
 to find out more.
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[web/src/pages/Consumer/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Db25zdW1lci9DcmVhdGUudHN4)
 | `76.08% <ø> (ø)` | |
   | 
[web/src/pages/Plugin/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9QbHVnaW4vTGlzdC50c3g=)
 | `96.15% <ø> (ø)` | |
   | 
[web/src/pages/Plugin/PluginMarket.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9QbHVnaW4vUGx1Z2luTWFya2V0LnRzeA==)
 | `100.00% <ø> (ø)` | |
   | 
[web/src/pages/Service/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0NyZWF0ZS50c3g=)
 | `96.42% <ø> (+1.78%)` | :arrow_up: |
   | 
[web/src/pages/Upstream/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9VcHN0cmVhbS9DcmVhdGUudHN4)
 | `79.41% <50.00%> (-1.84%)` | :arrow_down: |
   | 
[web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4)
 | `65.45% <100.00%> (ø)` | |
   | 
[api/internal/filter/ip\_filter.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9pcF9maWx0ZXIuZ28=)
 | | |
   | 
[...pi/internal/handler/plugin\_config/plugin\_config.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcGx1Z2luX2NvbmZpZy9wbHVnaW5fY29uZmlnLmdv)
 | | |
   | 
[api/internal/filter/authentication.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9hdXRoZW50aWNhdGlvbi5nbw==)
 | | |
   | 
[api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv)
 | | |
   | ... and [43 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1685/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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/1685?src=pr=footer).
 Last update 
[88f3232...7cfe580](https://codecov.io/gh/apache/apisix-dashboard/pull/1685?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] iamayushdas commented on pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


iamayushdas commented on pull request #1685:
URL: https://github.com/apache/apisix-dashboard/pull/1685#issuecomment-809525124


   @juzhiyuan have a check


-- 
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] iamayushdas commented on pull request #1685: docs: tells users where they are

2021-03-29 Thread GitBox


iamayushdas commented on pull request #1685:
URL: https://github.com/apache/apisix-dashboard/pull/1685#issuecomment-809505279


   Okay


-- 
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] tag v2.5 created (now 5c95d97)

2021-03-29 Thread chenjunxu
This is an automated email from the ASF dual-hosted git repository.

chenjunxu pushed a change to tag v2.5
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


  at 5c95d97  (commit)
No new revisions were added by this update.


[GitHub] [apisix-website] nic-chen opened a new pull request #276: feat: upgrade APISIX Dashboard version

2021-03-29 Thread GitBox


nic-chen opened a new pull request #276:
URL: https://github.com/apache/apisix-website/pull/276


   Changes:
   
upgrade APISIX Dashboard version
   
   


-- 
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 dashboard-2.5 created (now 842d706)

2021-03-29 Thread chenjunxu
This is an automated email from the ASF dual-hosted git repository.

chenjunxu pushed a change to branch dashboard-2.5
in repository https://gitbox.apache.org/repos/asf/apisix-website.git.


  at 842d706  feat: upgrade APISIX Dashboard version

This branch includes the following new commits:

 new 842d706  feat: upgrade APISIX Dashboard version

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-website] 01/01: feat: upgrade APISIX Dashboard version

2021-03-29 Thread chenjunxu
This is an automated email from the ASF dual-hosted git repository.

chenjunxu pushed a commit to branch dashboard-2.5
in repository https://gitbox.apache.org/repos/asf/apisix-website.git

commit 842d7066090ec8438d964b0fb5625384638f8653
Author: nic-chen 
AuthorDate: Mon Mar 29 23:48:47 2021 +0800

feat: upgrade APISIX Dashboard version
---
 website/docusaurus.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index c728092..1917956 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -34,8 +34,8 @@ module.exports = {
 shape: "square",
 color: "#10B981",
 githubRepo: "apache/apisix-dashboard",
-version: "2.4",
-releaseDate: "2021-02-12",
+version: "2.5",
+releaseDate: "2021-03-29",
 firstDocPath: "/USER_GUIDE",
   },
   {


[GitHub] [apisix] membphis commented on pull request #3883: feat: add 5xx error page

2021-03-29 Thread GitBox


membphis commented on pull request #3883:
URL: https://github.com/apache/apisix/pull/3883#issuecomment-809485058


   ci failed now


-- 
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 (86e168e -> 0c96ffd)

2021-03-29 Thread membphis
This is an automated email from the ASF dual-hosted git repository.

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


from 86e168e  test: enable master-worker mode by default (#3927)
 add 0c96ffd  test: make consul_kv stable (#3924)

No new revisions were added by this update.

Summary of changes:
 t/discovery/consul_kv.t | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


[GitHub] [apisix] membphis merged pull request #3924: test: make consul_kv stable

2021-03-29 Thread GitBox


membphis merged pull request #3924:
URL: https://github.com/apache/apisix/pull/3924


   


-- 
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




  1   2   >