[GitHub] [apisix-website] guoqqqi commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


guoqqqi commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787033730


   LGTM, and how about making the button centered?



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] guoqqqi opened a new pull request #1523: fix: the CI error for #1518

2021-02-27 Thread GitBox


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


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [ ] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   - Related issues
   #1518 
   ___
   ### Bugfix
   - Description
   `Create and Delete Plugin List`  Unstable
   - How to fix?
   Move to get `plugin-dataset` from beforeEach to the first test, as it is not 
required for each individual test.
   ___



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

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




[GitHub] [apisix-dashboard] codecov-io commented on pull request #1523: fix: the CI error for #1518

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=h1) 
Report
   > Merging 
[#1523](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=desc) 
(b66fcfc) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/4dd7b15bd85c2b2b89b53a60ea7ff8f09f45cf8b?el=desc)
 (4dd7b15) will **decrease** coverage by `17.28%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1523   +/-   ##
   ===
   - Coverage   68.97%   51.69%   -17.29% 
   ===
 Files  48   39-9 
 Lines3056 2600  -456 
   ===
   - Hits 2108 1344  -764 
   - Misses708 1082  +374 
   + Partials  240  174   -66 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=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/1523/diff?src=pr&el=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/1523/diff?src=pr&el=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/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `0.00% <0.00%> (-74.49%)` | :arrow_down: |
   | 
[api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv)
 | `0.00% <0.00%> (-66.67%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=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/1523/diff?src=pr&el=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/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `27.41% <0.00%> (-37.50%)` | :arrow_down: |
   | 
[api/internal/handler/server\_info/server\_info.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmVyX2luZm8vc2VydmVyX2luZm8uZ28=)
 | `57.14% <0.00%> (-33.34%)` | :arrow_down: |
   | 
[api/internal/utils/closer.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2Nsb3Nlci5nbw==)
 | `0.00% <0.00%> (-33.34%)` | :arrow_down: |
   | ... and [29 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=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/1523?src=pr&el=footer).
 Last update 
[4dd7b15...b66fcfc](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=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 #1523: fix: the CI error for #1518

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=h1) 
Report
   > Merging 
[#1523](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=desc) 
(b66fcfc) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/4dd7b15bd85c2b2b89b53a60ea7ff8f09f45cf8b?el=desc)
 (4dd7b15) will **decrease** coverage by `6.60%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1523  +/-   ##
   ==
   - Coverage   68.97%   62.36%   -6.61% 
   ==
 Files  48   48  
 Lines3056 3056  
   ==
   - Hits 2108 1906 -202 
   - Misses708  899 +191 
   - Partials  240  251  +11 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `35.08% <0.00%> (-29.84%)` | :arrow_down: |
   | 
[api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==)
 | `75.00% <0.00%> (-25.00%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | `31.93% <0.00%> (-23.53%)` | :arrow_down: |
   | 
[api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `54.08% <0.00%> (-20.41%)` | :arrow_down: |
   | 
[api/internal/log/log.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2xvZy9sb2cuZ28=)
 | `30.00% <0.00%> (-20.00%)` | :arrow_down: |
   | 
[api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=)
 | `66.12% <0.00%> (-17.75%)` | :arrow_down: |
   | 
[api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv)
 | `54.11% <0.00%> (-11.77%)` | :arrow_down: |
   | 
[api/internal/core/storage/etcd.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmFnZS9ldGNkLmdv)
 | `41.81% <0.00%> (-9.10%)` | :arrow_down: |
   | 
[api/internal/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3JvdXRlLmdv)
 | `76.47% <0.00%> (-8.83%)` | :arrow_down: |
   | 
[api/internal/handler/route/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=)
 | `71.12% <0.00%> (-7.12%)` | :arrow_down: |
   | ... and [5 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=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/1523?src=pr&el=footer).
 Last update 
[4dd7b15...b66fcfc](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=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 #1523: fix: the CI error for #1518

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=h1) 
Report
   > Merging 
[#1523](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=desc) 
(b66fcfc) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/4dd7b15bd85c2b2b89b53a60ea7ff8f09f45cf8b?el=desc)
 (4dd7b15) will **decrease** coverage by `0.09%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1523  +/-   ##
   ==
   - Coverage   68.97%   68.88%   -0.10% 
   ==
 Files  48   48  
 Lines3056 3056  
   ==
   - Hits 2108 2105   -3 
   - Misses708  711   +3 
 Partials  240  240  
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/core/storage/etcd.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmFnZS9ldGNkLmdv)
 | `49.09% <0.00%> (-1.82%)` | :arrow_down: |
   | 
[api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1523/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=)
 | `86.74% <0.00%> (-0.61%)` | :arrow_down: |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=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/1523?src=pr&el=footer).
 Last update 
[4dd7b15...b66fcfc](https://codecov.io/gh/apache/apisix-dashboard/pull/1523?src=pr&el=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] lilien1010 commented on a change in pull request #3577: feat: support conditional response rewrite

2021-02-27 Thread GitBox


lilien1010 commented on a change in pull request #3577:
URL: https://github.com/apache/apisix/pull/3577#discussion_r584095639



##
File path: doc/plugins/response-rewrite.md
##
@@ -45,6 +45,7 @@ response rewrite plugin, rewrite the content returned by the 
upstream as well as
 | body| string  | optional| || New `body` to 
client, and the content-length will be reset too.   

|
 | body_base64 | boolean | optional| false   || Identify if 
`body` in configuration need base64 decoded before rewrite to client.   

  |
 | headers | object  | optional| || Set the new 
`headers` for client, can set up multiple. If it exists already from upstream, 
will rewrite the header, otherwise will add the header. You can set the 
corresponding value to an empty string to remove a header. |
+| vars | array[]  | optional| || A DSL to evaluate 
with the given ngx.var. See `vars` 
[lua-resty-expr](https://github.com/api7/lua-resty-expr#operator-list). |

Review comment:
   added





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] 1502shivam-singh commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787052781


   @qier222  Yes keeping the main head in one single line is a good idea 👍👍, 
will make changes to heading font size for this.
   
   @guoqqqi Well centering the buttons, breaks the alignment and flow of the 
whole section (which is left for this section). 
   Also, it's a good practice to place CTA buttons in alignment with the text 
above it, as then the eye movement is minimal and a straight downward read is 
enough. Also we have to stay uniform with the alignments of elements in this 
section for this matter.  



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] 1502shivam-singh commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787053319


   Also while we are at, did you guys check out the SVG variants I made for the 
original logo (at 
[figma](https://www.figma.com/file/LeICU6ikwITGemfw8lBRs3/APISIX-Apache-swf?node-id=0%3A1))
 ? If you are unable to view, tell me and I will add some screenshots.
   Do tell which one you like more @juzhiyuan @qier222  @guoqqqi.
   I will add that one as logo. 



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] 1502shivam-singh commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787053912


   This looks good -
   
   
![test](https://user-images.githubusercontent.com/57267960/109385192-139a7e00-7918-11eb-863f-036f838e2953.png)
   



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] KafilatAdeleke opened a new pull request #3694: fix Error will be reported when apisix starts , if which is not insta…

2021-02-27 Thread GitBox


KafilatAdeleke opened a new pull request #3694:
URL: https://github.com/apache/apisix/pull/3694


   …lled
   
   ### What this PR does / why we need it:
   
   
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] 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] KafilatAdeleke commented on pull request #3694: fix Error will be reported when apisix starts , if which is not insta…

2021-02-27 Thread GitBox


KafilatAdeleke commented on pull request #3694:
URL: https://github.com/apache/apisix/pull/3694#issuecomment-787055122


   fix Error will be reported when apisix starts , if which is not installed.
   https://github.com/apache/apisix/issues/3611
   This is my first PR. Let me know if you have any 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] yangxikun opened a new issue #3695: bug: upstream timeout not work

2021-02-27 Thread GitBox


yangxikun opened a new issue #3695:
URL: https://github.com/apache/apisix/issues/3695


   ### Issue description
   
   error log: upstream timeout config is 6s
   
   ```text
   2021/02/27 11:37:07 [info] 51#51: *2258 [lua] balancer.lua:190: 
pick_server(): >{"read":6000,"connect":6000,"send":6000} while connecting 
to upstream, client: 192.17.0.1, server: , request: "GET 
/api/v1/admin/navigation HTTP/1.1", host: "lx.net", referrer: 
"http://lx.net/admin";
   ```
   
   access log: request_time is 10.201
   
   ```text
   {
 "@timestamp": "2021-02-27T11:37:18+00:00",
 "time_local": "27/Feb/2021:11:37:18 +",
 "remote_user": "-",
 "http_x_forwarded_for": "-",
 "host": "192.17.5.11",
 "domain": "lx.net",
 "remote_addr": "192.17.0.1",
 "http_x_real_ip": "-",
 "body_bytes_sent": 1549,
 "request_time": 10.201,
 "status": 200,
 "upstream_name": "-",
 "upstream_response_time": "10.202",
 "upstream_response_status": "200",
 "request": "GET /api/v1/admin/navigation HTTP/1.1",
 "http_referer": "http://lx.net/admin";,
 "x-request-id": "5e9e1fe70ce3eb86c6a2471feb051c40",
 "x-gateway-enviroment": "heimdall-local",
 "http_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) 
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.192 Safari/537.36"
   }
   ```
   
   ### Environment
   
   * apisix version (cmd: `apisix version`): 2.2



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

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




[apisix] branch master updated (343d484 -> fa028c1)

2021-02-27 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 343d484  chore: no need to package documentation (#3687)
 add fa028c1  fix: cache server picker for nodes without port (#3665)

No new revisions were added by this update.

Summary of changes:
 apisix/init.lua |  7 +++
 apisix/upstream.lua | 31 +++---
 apisix/utils/upstream.lua   |  7 ++-
 t/node/upstream-discovery.t | 47 +
 4 files changed, 84 insertions(+), 8 deletions(-)



[GitHub] [apisix] membphis merged pull request #3665: fix: cache server picker for nodes without port

2021-02-27 Thread GitBox


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


   



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: add safe limit to avoid infinite loop caused by bug (#3682)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 3950e4a  chore: add safe limit to avoid infinite loop caused by bug 
(#3682)
3950e4a is described below

commit 3950e4a781b2d11bee5ecf4d62229d0a36ce36ff
Author: 罗泽轩 
AuthorDate: Sat Feb 27 20:02:07 2021 +0800

chore: add safe limit to avoid infinite loop caused by bug (#3682)
---
 apisix/balancer/least_conn.lua | 5 -
 apisix/balancer/roundrobin.lua | 9 -
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apisix/balancer/least_conn.lua b/apisix/balancer/least_conn.lua
index a1d37c7..1cfdbf9 100644
--- a/apisix/balancer/least_conn.lua
+++ b/apisix/balancer/least_conn.lua
@@ -31,7 +31,10 @@ end
 
 function _M.new(up_nodes, upstream)
 local servers_heap = binaryHeap.minUnique(least_score)
+local safe_limit = 0
 for server, weight in pairs(up_nodes) do
+safe_limit = safe_limit + 1
+
 local score = 1 / weight
 -- Note: the argument order of insert is different from others
 servers_heap:insert({
@@ -47,7 +50,7 @@ function _M.new(up_nodes, upstream)
 local server, info, err
 if ctx.balancer_tried_servers then
 local tried_server_list = {}
-while true do
+for i = 1, safe_limit do
 server, info = servers_heap:peek()
 if server == nil then
 err = "all upstream servers tried"
diff --git a/apisix/balancer/roundrobin.lua b/apisix/balancer/roundrobin.lua
index 7d4a374..a9469ca 100644
--- a/apisix/balancer/roundrobin.lua
+++ b/apisix/balancer/roundrobin.lua
@@ -18,12 +18,19 @@
 local roundrobin  = require("resty.roundrobin")
 local core = require("apisix.core")
 local nkeys = core.table.nkeys
+local pairs = pairs
 
 
 local _M = {}
 
 
 function _M.new(up_nodes, upstream)
+local safe_limit = 0
+for _, weight in pairs(up_nodes) do
+-- the weight can be zero
+safe_limit = safe_limit + weight + 1
+end
+
 local picker = roundrobin:new(up_nodes)
 local nodes_count = nkeys(up_nodes)
 return {
@@ -34,7 +41,7 @@ function _M.new(up_nodes, upstream)
 end
 
 local server, err
-while true do
+for i = 1, safe_limit do
 server, err = picker:find()
 if not server then
 return nil, err



[GitHub] [apisix] membphis merged pull request #3682: chore: add safe limit to avoid infinite loop caused by bug

2021-02-27 Thread GitBox


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


   



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] membphis commented on a change in pull request #3686: feat: support SRV record

2021-02-27 Thread GitBox


membphis commented on a change in pull request #3686:
URL: https://github.com/apache/apisix/pull/3686#discussion_r584113078



##
File path: docs/en/latest/dns.md
##
@@ -74,3 +74,60 @@ If you want to specify the port for the upstream server, you 
can add it to the `
 "type": "roundrobin"
 }
 ```
+
+Another way to do it is via the SRV record, see below.
+
+### SRV record
+
+By using SRV record you can specify the port and the weight of a service.
+
+Assumed you have the SRV record like this:
+
+```
+; under the section of blah.service
+A   300 IN  A 1.1.1.1
+B   300 IN  A 1.1.1.2
+B   300 IN  A 1.1.1.3
+srv   86400 INSRV 10   60 1980 A
+srv   86400 INSRV 10   20 1981 B
+```
+
+Upstream configuration like:
+
+```json
+{
+"id": 1,
+"discovery_type": "dns",
+"service_name": "srv.blah.service",
+"type": "roundrobin"
+}
+```
+
+is the same as:
+
+```json
+{
+"id": 1,
+"type": "roundrobin",
+"nodes": {

Review comment:
   should use `[` here, it an array object 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] membphis commented on a change in pull request #3494: docs: update the docs of the prometheus plugin

2021-02-27 Thread GitBox


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



##
File path: docs/zh/latest/plugins/prometheus.md
##
@@ -118,12 +118,49 @@ plugin_attr:
 
 ### 可有的指标
 
-* `Status codes`: upstream 服务返回的 HTTP 状态码,每个服务返回状态码的次数或者所有服务的状态码次数总和都可以统计到。
-* `Bandwidth`: 流经apisix的总带宽(可分出口带宽和入口带宽). 每个服务指标或者是所有服务指标的总和都可以统计到。
+* `Status codes`: upstream 服务返回的 HTTP 
状态码,每个服务返回状态码的次数或者所有服务的状态码次数总和都可以统计到。具有的维度:

Review comment:
   ping @moonming 
   
   
![image](https://user-images.githubusercontent.com/6814606/109386725-abf42b00-7937-11eb-9df8-b4fa54682645.png)
   





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] membphis commented on issue #274: docs: update the architecture diagram

2021-02-27 Thread GitBox


membphis commented on issue #274:
URL: 
https://github.com/apache/apisix-ingress-controller/issues/274#issuecomment-787063605


   We can submit a PR to replace the image of  `README.md`:
   
   
![image](https://user-images.githubusercontent.com/6814606/109386761-e6f65e80-7937-11eb-9a39-546ebe9e638f.png)
   
   Update the image file `docs/assets/images/module-0.png`.



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] membphis merged pull request #35: chore: remove unneeded trailing whitespace

2021-02-27 Thread GitBox


membphis merged pull request #35:
URL: https://github.com/apache/apisix-helm-chart/pull/35


   



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-helm-chart] branch master updated: chore: remove unneeded trailing whitespace (#35)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 6eed5b1  chore: remove unneeded trailing whitespace (#35)
6eed5b1 is described below

commit 6eed5b1987f32481ae2e2102849ad186b798014c
Author: John Bampton 
AuthorDate: Sat Feb 27 22:18:52 2021 +1000

chore: remove unneeded trailing whitespace (#35)
---
 charts/apisix/README.md   | 2 +-
 charts/apisix/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 092b532..c246463 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -21,7 +21,7 @@
 
 ## Dependencies
 
-Update the dependency chart 
+Update the dependency chart
 
 ```shell
 $ helm repo add bitnami https://charts.bitnami.com/bitnami
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 50f8535..e2b94b3 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -190,5 +190,5 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: 
+affinity:
   enabled: false



[apisix-docker] branch master updated: chore: remove unneeded whitespace (#142)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 20e2a6a  chore: remove unneeded whitespace (#142)
20e2a6a is described below

commit 20e2a6a97c8a3c265232eafb5dc742d914f6306d
Author: John Bampton 
AuthorDate: Sat Feb 27 22:20:09 2021 +1000

chore: remove unneeded whitespace (#142)
---
 README.md | 4 ++--
 all-in-one/apisix-dashboard/conf.yaml | 2 +-
 build.md  | 2 +-
 example/README.md | 2 +-
 manual.md | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 45a1a4d..c16fd2a 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
 
 ## How To Build Image
 
-**The master branch is for the version of Apache APISIX 2.x . If you need a 
previous version, please build from the 
[v1.x](https://github.com/apache/apisix-docker/releases/tag/v1.x) tag.**
+**The master branch is for the version of Apache APISIX 2.x. If you need a 
previous version, please build from the 
[v1.x](https://github.com/apache/apisix-docker/releases/tag/v1.x) tag.**
 
 ### Build an image from source
 
 1. Build from release version:
 ```
-# Assign Apache release version number to variable `APISIX_VERSION`, for 
example: 2.2 . The latest version can be find at 
`https://github.com/apache/apisix/releases`
+# Assign Apache release version number to variable `APISIX_VERSION`, for 
example: 2.2. The latest version can be find at 
`https://github.com/apache/apisix/releases`
 
 export APISIX_VERSION=2.2
 docker build -t apisix:${APISIX_VERSION}-alpine --build-arg 
APISIX_VERSION=${APISIX_VERSION} -f alpine/Dockerfile alpine
diff --git a/all-in-one/apisix-dashboard/conf.yaml 
b/all-in-one/apisix-dashboard/conf.yaml
index c70134f..9106e20 100644
--- a/all-in-one/apisix-dashboard/conf.yaml
+++ b/all-in-one/apisix-dashboard/conf.yaml
@@ -19,7 +19,7 @@ authentication:
   secret:
 secret  # secret for jwt token generation.
 # NOTE: Highly recommended to modify this value to 
protect `manager api`.
-# if it's default value, when `manager api` start , it 
will generate a random string to replace it.
+# if it's default value, when `manager api` start, it 
will generate a random string to replace it.
   expire_time: 3600 # jwt token expire time, in second
   users:
 - username: admin   # username and password for login `manager api`
diff --git a/build.md b/build.md
index f4fe53a..00e633a 100644
--- a/build.md
+++ b/build.md
@@ -4,7 +4,7 @@
 
 1. install release version (Apache releases are beginning from version 0.9):
 ```
-# Assign Apache release version number to variable `APISIX_VERSION`, for 
example: 2.2 . The latest version can be find at 
`https://github.com/apache/apisix/releases`
+# Assign Apache release version number to variable `APISIX_VERSION`, for 
example: 2.2. The latest version can be find at 
`https://github.com/apache/apisix/releases`
 
 APISIX_VERSION=2.2
 docker build -t apisix:${APISIX_VERSION}-alpine --build-arg 
APISIX_VERSION=${APISIX_VERSION} -f alpine/Dockerfile alpine
diff --git a/example/README.md b/example/README.md
index ef9fdab..8fdc676 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,4 +1,4 @@
-**This example is used for functional verification and is not recommended for 
performance testing. For performance testing, please refer to 
[benchmark](https://github.com/apache/apisix#benchmark) .**
+**This example is used for functional verification and is not recommended for 
performance testing. For performance testing, please refer to 
[benchmark](https://github.com/apache/apisix#benchmark).**
 
 ### Run
 
diff --git a/manual.md b/manual.md
index 77c8b90..156eb66 100644
--- a/manual.md
+++ b/manual.md
@@ -58,7 +58,7 @@ docker run --name test-api-gateway \
 
 Test with admin api
 
-e.g. Get route list, should be return  
+e.g. Get route list, should be return
 
 ```
 curl http://127.0.0.1:9080/apisix/admin/routes/



[GitHub] [apisix-docker] membphis merged pull request #142: chore: remove unneeded whitespace

2021-02-27 Thread GitBox


membphis merged pull request #142:
URL: https://github.com/apache/apisix-docker/pull/142


   



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-docker] membphis commented on pull request #142: chore: remove unneeded whitespace

2021-02-27 Thread GitBox


membphis commented on pull request #142:
URL: https://github.com/apache/apisix-docker/pull/142#issuecomment-787064576


   merged, many 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




[apisix-docker] branch master updated: chore: fix spelling (#141)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new f198360  chore: fix spelling (#141)
f198360 is described below

commit f198360372dc73d65b408451082824457c58c48f
Author: John Bampton 
AuthorDate: Sat Feb 27 22:20:39 2021 +1000

chore: fix spelling (#141)
---
 Makefile   | 2 +-
 all-in-one/apisix-dashboard/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0ffb124..8965cca 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ APISIX_VERSION ?= 2.3
 IMAGE_NAME = apache/apisix
 IMAGE_TAR_NAME = apache_apisix
 
-### build-on-centos:  Build apaceh/apisix:xx-centos image
+### build-on-centos:  Build apache/apisix:xx-centos image
 build-on-centos:
docker build -t $(IMAGE_NAME):$(APISIX_VERSION)-centos -f 
./centos/Dockerfile .
 
diff --git a/all-in-one/apisix-dashboard/Dockerfile 
b/all-in-one/apisix-dashboard/Dockerfile
index f15c743..a6a12b9 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -41,7 +41,7 @@ RUN wget 
https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-
 && ln -s etcd-${ETCD_VERSION}-linux-amd64 etcd
 
 
-# Build APISIX Dashboard - 1. downlaod source code from github
+# Build APISIX Dashboard - 1. download source code from github
 FROM alpine:latest as pre-build
 
 ARG APISIX_DASHBOARD_VERSION



[GitHub] [apisix-docker] membphis merged pull request #141: chore: fix spelling

2021-02-27 Thread GitBox


membphis merged pull request #141:
URL: https://github.com/apache/apisix-docker/pull/141


   



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-docker] membphis commented on pull request #141: chore: fix spelling

2021-02-27 Thread GitBox


membphis commented on pull request #141:
URL: https://github.com/apache/apisix-docker/pull/141#issuecomment-787064620


   many 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] membphis commented on pull request #3494: docs: update the docs of the prometheus plugin

2021-02-27 Thread GitBox


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


   > The Chinese and English documents are written not good that they can’t be 
merged
   
   ok, 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




[apisix] branch master updated: chore: capitalize the constant (#3672)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e2f1fc6  chore: capitalize the constant (#3672)
e2f1fc6 is described below

commit e2f1fc6a7b7da070cfd253c8854358473193237c
Author: 罗泽轩 
AuthorDate: Sat Feb 27 20:33:30 2021 +0800

chore: capitalize the constant (#3672)

See https://github.com/apache/apisix/pull/3629#discussion_r582423351
---
 apisix/upstream.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apisix/upstream.lua b/apisix/upstream.lua
index 7a363be..6ae81c0 100644
--- a/apisix/upstream.lua
+++ b/apisix/upstream.lua
@@ -26,8 +26,8 @@ local is_http = ngx.config.subsystem == "http"
 local upstreams
 local healthcheck
 
-local http_code_upstream_unavailable = ngx.HTTP_SERVICE_UNAVAILABLE
 
+local HTTP_CODE_UPSTREAM_UNAVAILABLE = 503
 local _M = {}
 
 
@@ -216,7 +216,7 @@ function _M.set_by_route(route, api_ctx)
 
 local new_nodes, err = dis.nodes(up_conf.service_name)
 if not new_nodes then
-return http_code_upstream_unavailable, "no valid upstream node: " 
.. (err or "nil")
+return HTTP_CODE_UPSTREAM_UNAVAILABLE, "no valid upstream node: " 
.. (err or "nil")
 end
 
 local same = upstream_util.compare_upstream_node(up_conf, new_nodes)
@@ -243,7 +243,7 @@ function _M.set_by_route(route, api_ctx)
 
 local nodes_count = up_conf.nodes and #up_conf.nodes or 0
 if nodes_count == 0 then
-return http_code_upstream_unavailable, "no valid upstream node"
+return HTTP_CODE_UPSTREAM_UNAVAILABLE, "no valid upstream node"
 end
 
 if not is_http then



[GitHub] [apisix] membphis merged pull request #3672: chore: capitalize the constant

2021-02-27 Thread GitBox


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


   



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] membphis commented on issue #3670: request help:

2021-02-27 Thread GitBox


membphis commented on issue #3670:
URL: https://github.com/apache/apisix/issues/3670#issuecomment-787066263


   please update your title, make a more meaningful



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] membphis edited a comment on issue #3670: request help:

2021-02-27 Thread GitBox


membphis edited a comment on issue #3670:
URL: https://github.com/apache/apisix/issues/3670#issuecomment-787066263


   please update your title, make it more meaningful



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] membphis opened a new issue #3696: ci failed: should use the `skywalking` with the specified version

2021-02-27 Thread GitBox


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


   
   "Unable to find image 'apache/skywalking-oap-server:latest' locally
   docker: Error response from daemon: manifest for 
apache/skywalking-oap-server:latest not found: manifest unknown: manifest 
unknown"
   
   https://github.com/apache/apisix/runs/1993910896#step:8:306
   
   related issue: https://github.com/apache/skywalking/issues/6466



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] membphis commented on issue #3696: ci failed: should use the `skywalking` with the specified version

2021-02-27 Thread GitBox


membphis commented on issue #3696:
URL: https://github.com/apache/apisix/issues/3696#issuecomment-787070169


   Skywalking image list: 
   
   
https://hub.docker.com/r/apache/skywalking-oap-server/tags?page=1&ordering=last_updated



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] membphis commented on issue #3696: ci failed: should use the `skywalking` with the specified version

2021-02-27 Thread GitBox


membphis commented on issue #3696:
URL: https://github.com/apache/apisix/issues/3696#issuecomment-787070935


   the latest doc of skywalking: 
   
   
https://github.com/apache/skywalking-docker/blob/master/oap-server/README.md#start-a-standlone-container-with-h2-storage
   
   we can follow this doc



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] membphis opened a new issue #3697: docs(skywalking): Use the specified version of `skywalking` docker image

2021-02-27 Thread GitBox


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


   here is the latest doc of skywalking:
   
   https://hub.docker.com/r/apache/skywalking-oap-server



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] membphis opened a new pull request #3698: ci: use the specified version of `skywalking`.

2021-02-27 Thread GitBox


membphis opened a new pull request #3698:
URL: https://github.com/apache/apisix/pull/3698


   ### What this PR does / why we need it:
   
   
   
   fix #3696
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] 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] spacewander commented on a change in pull request #3698: ci: use the specified version of `skywalking`.

2021-02-27 Thread GitBox


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



##
File path: docs/en/latest/plugins/skywalking.md
##
@@ -133,7 +133,7 @@ plugin_attr:
 3. Run skywalking server:
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server:8.3.0-es7

Review comment:
   Should be `8.3.0-es6`?

##
File path: docs/zh/latest/plugins/skywalking.md
##
@@ -136,7 +136,7 @@ plugin_attr:
 3. 启动 skywalking:
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server:8.3.0-es7

Review comment:
   ditto





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 #3686: feat: support SRV record

2021-02-27 Thread GitBox


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



##
File path: docs/en/latest/dns.md
##
@@ -74,3 +74,60 @@ If you want to specify the port for the upstream server, you 
can add it to the `
 "type": "roundrobin"
 }
 ```
+
+Another way to do it is via the SRV record, see below.
+
+### SRV record
+
+By using SRV record you can specify the port and the weight of a service.
+
+Assumed you have the SRV record like this:
+
+```
+; under the section of blah.service
+A   300 IN  A 1.1.1.1
+B   300 IN  A 1.1.1.2
+B   300 IN  A 1.1.1.3
+srv   86400 INSRV 10   60 1980 A
+srv   86400 INSRV 10   20 1981 B
+```
+
+Upstream configuration like:
+
+```json
+{
+"id": 1,
+"discovery_type": "dns",
+"service_name": "srv.blah.service",
+"type": "roundrobin"
+}
+```
+
+is the same as:
+
+```json
+{
+"id": 1,
+"type": "roundrobin",
+"nodes": {

Review comment:
   @membphis 
   Solved.





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] membphis commented on a change in pull request #3698: ci: use the specified version of `skywalking`.

2021-02-27 Thread GitBox


membphis commented on a change in pull request #3698:
URL: https://github.com/apache/apisix/pull/3698#discussion_r584123788



##
File path: docs/en/latest/plugins/skywalking.md
##
@@ -133,7 +133,7 @@ plugin_attr:
 3. Run skywalking server:
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server:8.3.0-es7

Review comment:
   I think there should be `8.3.0-es7`.
   
   I got it from 
https://github.com/apache/skywalking-docker/blob/master/oap-server/README.md
   
   Or we can remove the doc about `Of Course, you can use Elasticsearch 
storage`, just link to the doc of SkyWalking.
   
   what do you think @moonming ?





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

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




[GitHub] [apisix-website] juzhiyuan commented on a change in pull request #213: fix: #212

2021-02-27 Thread GitBox


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



##
File path: website/src/css/customTheme.css
##
@@ -57,9 +57,22 @@ header h2 {
   color: var(--color-primary);
 }
 
+.navbar__title{
+  font-size: 18px;
+  height: 30px;
+}
+
 /* home splash */
 .home-splash {
-  margin-top: 8px;
+  margin-top: 0px;
+  margin-bottom: -50px;
+}
+@media only screen and (min-device-width: 360px) and (max-device-width: 736px) 
{
+  .home-splash {
+/* margin-top: 8px; Original*/

Review comment:
   We could remove those unused styles





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

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




[GitHub] [apisix-website] juzhiyuan merged pull request #213: fix: #212

2021-02-27 Thread GitBox


juzhiyuan merged pull request #213:
URL: https://github.com/apache/apisix-website/pull/213


   



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

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




[GitHub] [apisix-website] juzhiyuan closed issue #212: Enhancement: fix visible breakages in website UI on mobile, PNG logo is pixelated and other changes for better UX.

2021-02-27 Thread GitBox


juzhiyuan closed issue #212:
URL: https://github.com/apache/apisix-website/issues/212


   



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: fix: #212 (#213)

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

juzhiyuan 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 bc2fa1b  fix: #212 (#213)
bc2fa1b is described below

commit bc2fa1bded9799b584f0bc093b5c7517e442cbd0
Author: Shivam Singh <57267960+1502shivam-si...@users.noreply.github.com>
AuthorDate: Sat Feb 27 19:14:43 2021 +0530

fix: #212 (#213)
---
 website/docusaurus.config.js|  2 +-
 website/src/css/customTheme.css | 23 ---
 website/src/pages/index.js  |  4 ++--
 website/static/img/logo1.svg|  5 +
 website/static/img/logo2.svg| 15 +++
 website/static/img/logo3.svg| 15 +++
 6 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 08472fc..64189c0 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -136,7 +136,7 @@ module.exports = {
 navbar: {
   title: "Apache APISIX™",
   logo: {
-src: "img/logo.png",
+src: "img/logo2.svg",
   },
   items: [
 {
diff --git a/website/src/css/customTheme.css b/website/src/css/customTheme.css
index b9b873e..2dd6559 100644
--- a/website/src/css/customTheme.css
+++ b/website/src/css/customTheme.css
@@ -57,9 +57,22 @@ header h2 {
   color: var(--color-primary);
 }
 
+.navbar__title{
+  font-size: 18px;
+  height: 30px;
+}
+
 /* home splash */
 .home-splash {
-  margin-top: 8px;
+  margin-top: 0px;
+  margin-bottom: -50px;
+}
+@media only screen and (min-device-width: 360px) and (max-device-width: 736px) 
{
+  .home-splash {
+/* margin-top: 8px; Original*/
+margin-top: -20px;
+margin-bottom: -50px;/*Check*/
+  }
 }
 
 .home-splash .title {
@@ -69,7 +82,7 @@ header h2 {
 }
 
 .home-splash .title.brand {
-  font-size: 2.9rem;
+  font-size: 2.69rem;
   color: #df2d2d;
 }
 
@@ -248,6 +261,7 @@ header h2 {
 }
 .learn-how .container {
   margin-top: 36px;
+  padding-bottom: 30px;
 }
 .learn-how .hero__title {
   font-weight: 700;
@@ -260,11 +274,12 @@ header h2 {
 /* button */
 .button {
   margin: 0 10px;
-  padding: 8px 18px;
+  padding: 18px 18px;
   font-size: 18px;
   font-weight: 600;
   border-radius: 10px;
   border: none;
+  width: 224px;
   background: #fee2e2;
   color: #ef;
   transition: all 0.3s;
@@ -278,6 +293,7 @@ header h2 {
   color: white;
   display: inline-flex;
   align-items: center;
+  margin-bottom: 15px;
 }
 .button.github .github-logo {
   height: 24px;
@@ -294,6 +310,7 @@ header h2 {
   color: var(--color-secondary);
   border: 1px solid #d1d5db;
   box-sizing: border-box;
+  margin-bottom: 15px;
 }
 .button.secondary:hover {
   background: #e5e7eb;
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index a78e506..cef385e 100644
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -10,7 +10,7 @@ import ChevronRight from "../assets/icons/chevron-right.svg";
 
 const HomeSplash = () => {
   const [featureWordIndex, setFeatureWordIndex] = useState(0);
-  const featureWords = ["Dynamic", "Real-Time", "High-Performance"];
+  const featureWords = ["Dynamic", "Real-Time", "Performant"];
 
   const [isShow, setIsShow] = useState(true);
 
@@ -55,7 +55,7 @@ const HomeSplash = () => {
   {featureWords[featureWordIndex]}
 
   
-   Cloud-Native API Gateway
+    Cloud-Native API Gateway
 
 
   Provides rich traffic management features such as load balancing,
diff --git a/website/static/img/logo1.svg b/website/static/img/logo1.svg
new file mode 100644
index 000..4bbf632
--- /dev/null
+++ b/website/static/img/logo1.svg
@@ -0,0 +1,5 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
diff --git a/website/static/img/logo2.svg b/website/static/img/logo2.svg
new file mode 100644
index 000..8e99cc5
--- /dev/null
+++ b/website/static/img/logo2.svg
@@ -0,0 +1,15 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/website/static/img/logo3.svg b/website/static/img/logo3.svg
new file mode 100644
index 000..f950262
--- /dev/null
+++ b/website/static/img/logo3.svg
@@ -0,0 +1,15 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+



[GitHub] [apisix] membphis commented on a change in pull request #3698: ci: use the specified version of `skywalking`.

2021-02-27 Thread GitBox


membphis commented on a change in pull request #3698:
URL: https://github.com/apache/apisix/pull/3698#discussion_r584123835



##
File path: docs/en/latest/plugins/skywalking.md
##
@@ -133,7 +133,7 @@ plugin_attr:
 3. Run skywalking server:
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server:8.3.0-es7

Review comment:
   yes, you are right. update it later





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] membphis commented on a change in pull request #3698: ci: use the specified version of `skywalking`.

2021-02-27 Thread GitBox


membphis commented on a change in pull request #3698:
URL: https://github.com/apache/apisix/pull/3698#discussion_r584123984



##
File path: docs/en/latest/plugins/skywalking.md
##
@@ -133,7 +133,7 @@ plugin_attr:
 3. Run skywalking server:
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server:8.3.0-es7

Review comment:
   fixed





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

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




[apisix-dashboard] branch master updated: fix: fix ci failedx (#1522)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d1a7de0  fix: fix ci failedx (#1522)
d1a7de0 is described below

commit d1a7de02794d4b494d402c395da8923f6ee7f1e9
Author: JinChen <36916582+jayc...@users.noreply.github.com>
AuthorDate: Sat Feb 27 21:46:39 2021 +0800

fix: fix ci failedx (#1522)
---
 api/test/e2enew/route_online_debug/route_online_debug_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/test/e2enew/route_online_debug/route_online_debug_test.go 
b/api/test/e2enew/route_online_debug/route_online_debug_test.go
index 0b6b935..342e087 100644
--- a/api/test/e2enew/route_online_debug/route_online_debug_test.go
+++ b/api/test/e2enew/route_online_debug/route_online_debug_test.go
@@ -21,6 +21,7 @@ import (
"io/ioutil"
"net/http"
"path/filepath"
+   "time"
 
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
@@ -743,6 +744,7 @@ var _ = 
ginkgo.Describe("Route_Online_Debug_Route_With_Files", func() {
 
ginkgo.It("verify the route just imported and delete data", func() {
t := ginkgo.GinkgoT()
+   time.Sleep(time.Duration(500) * time.Millisecond)
request, _ := http.NewRequest("GET", 
base.ManagerAPIHost+"/apisix/admin/routes", nil)
request.Header.Add("Authorization", base.GetToken())
resp, err := http.DefaultClient.Do(request)



[GitHub] [apisix-dashboard] juzhiyuan merged pull request #1522: fix(be): fix ci failed

2021-02-27 Thread GitBox


juzhiyuan merged pull request #1522:
URL: https://github.com/apache/apisix-dashboard/pull/1522


   



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

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




[GitHub] [apisix-website] juzhiyuan commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


juzhiyuan commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787075855


   
![image](https://user-images.githubusercontent.com/2106987/109389083-c6cd9c00-7945-11eb-891b-43efd486a232.png)
   
   Hi, please take a look at other pages, the menu button gets wider. 
https://apisix.apache.org/docs/ingress-controller/design



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 #3692: [discuss]: enable etcd health check

2021-02-27 Thread GitBox


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


   > using a k8s domain
   
   For this case maybe we can resolve the domain each time before retry?



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 #1504: feat: rewrite e2e test(upstream_chash_query_string_arg_xxx_test) with ginkgo

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=h1) 
Report
   > Merging 
[#1504](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=desc) 
(1f52a36) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/d1a7de02794d4b494d402c395da8923f6ee7f1e9?el=desc)
 (d1a7de0) will **not change** coverage.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree)
   
   ```diff
   @@   Coverage Diff   @@
   ##   master#1504   +/-   ##
   ===
 Coverage   51.69%   51.69%   
   ===
 Files  39   39   
 Lines2600 2600   
   ===
 Hits 1344 1344   
 Misses   1082 1082   
 Partials  174  174   
   ```
   
   
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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/1504?src=pr&el=footer).
 Last update 
[d1a7de0...1f52a36](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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




[apisix] branch master updated (e2f1fc6 -> 79a4fc6)

2021-02-27 Thread spacewander
This is an automated email from the ASF dual-hosted git repository.

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


from e2f1fc6  chore: capitalize the constant (#3672)
 add 79a4fc6  docs: plugin-develop.md add to view all plugin priorities 
(#3680)

No new revisions were added by this update.

Summary of changes:
 docs/en/latest/plugin-develop.md | 2 +-
 docs/zh/latest/plugin-develop.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



[GitHub] [apisix] spacewander merged pull request #3680: docs: plugin-develop.md add to view all plugin priorities

2021-02-27 Thread GitBox


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


   



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 #3698: ci: use the specified version of `skywalking`.

2021-02-27 Thread GitBox


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


   



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: ci: use the specified version of `skywalking`. (#3698)

2021-02-27 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 edf838e  ci: use the specified version of `skywalking`. (#3698)
edf838e is described below

commit edf838ea4a54537a0b7b63757f7c7a63562d9876
Author: YuanSheng Wang 
AuthorDate: Sat Feb 27 22:13:29 2021 +0800

ci: use the specified version of `skywalking`. (#3698)
---
 .github/workflows/centos7-ci.yml | 2 +-
 .travis/linux_openresty_common_runner.sh | 2 +-
 docs/en/latest/plugins/skywalking.md | 4 ++--
 docs/zh/latest/plugins/skywalking.md | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 8fa110b..1e3b5fc 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -76,7 +76,7 @@ jobs:
 sleep 5
 docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh 
--create --zookeeper zookeeper-server:2181 --replication-factor 1 --partitions 
1 --topic test2
 docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh 
--create --zookeeper zookeeper-server:2181 --replication-factor 1 --partitions 
3 --topic test3
-docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 apache/skywalking-oap-server
+docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 apache/skywalking-oap-server:8.3.0-es6
 docker run --rm --name consul_1 -d -p 8500:8500 consul:1.7 consul 
agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info 
-data-dir=/consul/data
 docker run --rm --name consul_2 -d -p 8600:8500 consul:1.7 consul 
agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info 
-data-dir=/consul/data
 
diff --git a/.travis/linux_openresty_common_runner.sh 
b/.travis/linux_openresty_common_runner.sh
index 6bc2821..bb2b254 100755
--- a/.travis/linux_openresty_common_runner.sh
+++ b/.travis/linux_openresty_common_runner.sh
@@ -38,7 +38,7 @@ before_install() {
 docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh 
--create --zookeeper zookeeper-server:2181 --replication-factor 1 --partitions 
3 --topic test3
 
 # start skywalking
-docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 apache/skywalking-oap-server
+docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 apache/skywalking-oap-server:8.3.0-es6
 # start consul servers
 docker run --rm --name consul_1 -d -p 8500:8500 consul:1.7 consul agent 
-server -bootstrap-expect=1 -client 0.0.0.0 -log-level info 
-data-dir=/consul/data
 docker run --rm --name consul_2 -d -p 8600:8500 consul:1.7 consul agent 
-server -bootstrap-expect=1 -client 0.0.0.0 -log-level info 
-data-dir=/consul/data
diff --git a/docs/en/latest/plugins/skywalking.md 
b/docs/en/latest/plugins/skywalking.md
index a9eee4d..6475fad 100644
--- a/docs/en/latest/plugins/skywalking.md
+++ b/docs/en/latest/plugins/skywalking.md
@@ -113,7 +113,7 @@ plugin_attr:
 - By default, use H2 storage, start skywalking directly
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 --restart always apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 --restart always apache/skywalking-oap-server:8.3.0-es6
 ```
 
 - Of Course, you can use Elasticsearch storage
@@ -133,7 +133,7 @@ plugin_attr:
 3. Run skywalking server:
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 
-p 12800:12800 --restart always --link elasticsearch:elasticsearch -e 
SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 
apache/skywalking-oap-server:8.3.0-es6
 ```
 
 2. Skywalking WebUI:
diff --git a/docs/zh/latest/plugins/skywalking.md 
b/docs/zh/latest/plugins/skywalking.md
index 2c68351..888a0d3 100644
--- a/docs/zh/latest/plugins/skywalking.md
+++ b/docs/zh/latest/plugins/skywalking.md
@@ -117,7 +117,7 @@ plugin_attr:
 - 默认使用 H2 存储,直接启动 skywalking 即可
 
 ```shell
-sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 --restart always apache/skywalking-oap-server
+sudo docker run --name skywalking -d -p 1234:1234 -p 11800:11800 -p 
12800:12800 --restart always apache/skywalking-oap-server:8.3.0-es6
 ```
 
 - 如果使用 Elasticsearch 存储
@@ -136,7 +136,7 @@ plugin_attr:
 3. 启动 skywalking:
 

[GitHub] [apisix] spacewander closed issue #3696: ci failed: should use the `skywalking` with the specified version

2021-02-27 Thread GitBox


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


   



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 #3697: docs(skywalking): Use the specified version of `skywalking` docker image

2021-02-27 Thread GitBox


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


   Consider solved



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 #3697: docs(skywalking): Use the specified version of `skywalking` docker image

2021-02-27 Thread GitBox


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


   



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] qier222 commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


qier222 commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787079369


   The content inside "View on GitHub" button is not horizontally centered.



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: fix(chash): ensure retry can try every node (#3651)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e58a55f  fix(chash): ensure retry can try every node (#3651)
e58a55f is described below

commit e58a55fbc6e5ad2007ff206ac44096945c869390
Author: 罗泽轩 
AuthorDate: Sat Feb 27 22:17:22 2021 +0800

fix(chash): ensure retry can try every node (#3651)

Previously the default number of retry is equal to the number of node,
but the same node will be tried again according to its weight.

Also ensure the same picker will be used in the whole request,
especially during the retry.
---
 apisix/balancer.lua   |  8 +--
 apisix/balancer/chash.lua | 39 --
 t/admin/balancer.t|  2 ++
 t/node/chash-balance.t| 60 +++
 t/node/healthcheck.t  |  2 +-
 5 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/apisix/balancer.lua b/apisix/balancer.lua
index 2540f2f..4be56fc 100644
--- a/apisix/balancer.lua
+++ b/apisix/balancer.lua
@@ -161,8 +161,12 @@ local function pick_server(route, ctx)
 version = version .. "#" .. checker.status_ver
 end
 
-local server_picker = lrucache_server_picker(key, version,
-create_server_picker, up_conf, checker)
+-- the same picker will be used in the whole request, especially during 
the retry
+local server_picker = ctx.server_picker
+if not server_picker then
+server_picker = lrucache_server_picker(key, version,
+   create_server_picker, up_conf, 
checker)
+end
 if not server_picker then
 return nil, "failed to fetch server picker"
 end
diff --git a/apisix/balancer/chash.lua b/apisix/balancer/chash.lua
index df1568a..f9dbdbb 100644
--- a/apisix/balancer/chash.lua
+++ b/apisix/balancer/chash.lua
@@ -22,6 +22,9 @@ local str_gsub= string.gsub
 local pairs = pairs
 
 
+local CONSISTENT_POINTS = 160   -- points per server, taken from `resty.chash`
+
+
 local _M = {}
 
 
@@ -62,27 +65,59 @@ end
 function _M.new(up_nodes, upstream)
 local str_null = str_char(0)
 
+local nodes_count = 0
+local safe_limit = 0
 local servers, nodes = {}, {}
 for serv, weight in pairs(up_nodes) do
 local id = str_gsub(serv, ":", str_null)
 
+nodes_count = nodes_count + 1
+safe_limit = safe_limit + weight
 servers[id] = serv
 nodes[id] = weight
 end
+safe_limit = safe_limit * CONSISTENT_POINTS
 
 local picker = resty_chash:new(nodes)
 return {
 upstream = upstream,
 get = function (ctx)
 local id
-if ctx.balancer_try_count > 1 and ctx.chash_last_server_index then
-id, ctx.chash_last_server_index = 
picker:next(ctx.chash_last_server_index)
+if ctx.balancer_tried_servers then
+if ctx.balancer_tried_servers_count == nodes_count then
+return nil, "all upstream servers tried"
+end
+
+-- the 'safe_limit' is a best effort limit to prevent infinite 
loop caused by bug
+for i = 1, safe_limit do
+id, ctx.chash_last_server_index = 
picker:next(ctx.chash_last_server_index)
+if not ctx.balancer_tried_servers[servers[id]] then
+break
+end
+end
 else
 local chash_key = fetch_chash_hash_key(ctx, upstream)
 id, ctx.chash_last_server_index = picker:find(chash_key)
 end
 -- core.log.warn("chash id: ", id, " val: ", servers[id])
 return servers[id]
+end,
+after_balance = function (ctx, before_retry)
+if not before_retry then
+if ctx.balancer_tried_servers then
+core.tablepool.release("balancer_tried_servers", 
ctx.balancer_tried_servers)
+ctx.balancer_tried_servers = nil
+end
+
+return nil
+end
+
+if not ctx.balancer_tried_servers then
+ctx.balancer_tried_servers = 
core.tablepool.fetch("balancer_tried_servers", 0, 2)
+end
+
+ctx.balancer_tried_servers[ctx.balancer_server] = true
+ctx.balancer_tried_servers_count = 
(ctx.balancer_tried_servers_count or 0) + 1
 end
 }
 end
diff --git a/t/admin/balancer.t b/t/admin/balancer.t
index b9a76c5..d1b9027 100644
--- a/t/admin/balancer.t
+++ b/t/admin/balancer.t
@@ -52,6 +52,8 @@ add_block_preprocessor(sub {
 for _, key in ipairs(keys) do
 ngx.say("host: ", key, " count: ", res[key])
 end
+
+ctx.server_picker = nil
 end
 _EOC_
 $block->set_value("init_by_lu

[GitHub] [apisix] membphis merged pull request #3651: fix(chash): ensure retry can try every node

2021-02-27 Thread GitBox


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


   



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] 1502shivam-singh commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787080835


   @qier222 This looks fine, just added minimal padding
   
![test3](https://user-images.githubusercontent.com/57267960/109390114-b1e90c80-7935-11eb-8ad1-17c25997a776.png)
   
   @juzhiyuan Is this with your work course
   
![test2](https://user-images.githubusercontent.com/57267960/109390120-b9101a80-7935-11eb-879f-24293927ce05.png)
   



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] 1502shivam-singh commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787081656


   Also, is this intentional - for some ahead work ?
   
   
![version_issue](https://user-images.githubusercontent.com/57267960/109390273-a64a1580-7936-11eb-89aa-74ae501bb243.jpg)
   
   Just asking as it looks weird as it is 🙄



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] qier222 commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


qier222 commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787082551


   > Also, is this intentional - for some ahead work ?
   > 
   > 
   > 
   > 
![version_issue](https://user-images.githubusercontent.com/57267960/109390273-a64a1580-7936-11eb-89aa-74ae501bb243.jpg)
   > 
   > 
   > 
   > Just asking as it looks weird as it is 🙄
   
   This is a issue I haven't fixed yet 



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] qier222 edited a comment on pull request #213: fix: #212

2021-02-27 Thread GitBox


qier222 edited a comment on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787082551


   > Also, is this intentional - for some ahead work ?
   > 
   > 
   > 
   > 
![version_issue](https://user-images.githubusercontent.com/57267960/109390273-a64a1580-7936-11eb-89aa-74ae501bb243.jpg)
   > 
   > 
   > 
   > Just asking as it looks weird as it is 🙄
   
   This is an issue I haven't fixed yet 



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] 1502shivam-singh commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787083489


   Okay, so what exactly did you want here can you tell me ?
   
   Might as well slide it in my next fixing PR, if you like 😄 @qier222 



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: support SRV record (#3686)

2021-02-27 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 6731ca1  feat: support SRV record (#3686)
6731ca1 is described below

commit 6731ca148309c43c65ffcddb349c1c8c18fa46fb
Author: 罗泽轩 
AuthorDate: Sat Feb 27 23:02:57 2021 +0800

feat: support SRV record (#3686)
---
 apisix/core/dns/client.lua | 68 +++
 apisix/discovery/dns.lua   |  4 +--
 docs/en/latest/dns.md  | 63 ++--
 t/coredns/db.test.local| 21 
 t/discovery/dns/sanity.t   | 80 ++
 5 files changed, 231 insertions(+), 5 deletions(-)

diff --git a/apisix/core/dns/client.lua b/apisix/core/dns/client.lua
index 8ace4b6..2b28542 100644
--- a/apisix/core/dns/client.lua
+++ b/apisix/core/dns/client.lua
@@ -18,8 +18,10 @@ local require = require
 local log = require("apisix.core.log")
 local json = require("apisix.core.json")
 local table = require("apisix.core.table")
+local insert_tab = table.insert
 local math_random = math.random
 local package_loaded = package.loaded
+local ipairs = ipairs
 local setmetatable = setmetatable
 
 
@@ -29,6 +31,67 @@ local _M = {
 }
 
 
+local function gcd(a, b)
+if b == 0 then
+return a
+end
+
+return gcd(b, a % b)
+end
+
+
+local function resolve_srv(client, answers)
+if #answers == 0 then
+return nil, "empty SRV record"
+end
+
+local resolved_answers = {}
+local answer_to_count = {}
+for _, answer in ipairs(answers) do
+if answer.type ~= client.TYPE_SRV then
+return nil, "mess SRV with other record"
+end
+
+local resolved, err = client.resolve(answer.target)
+if not resolved then
+local msg = "failed to resolve SRV record " .. answer.target .. ": 
" .. err
+return nil, msg
+end
+
+log.info("dns resolve SRV ", answer.target, ", result: ",
+ json.delay_encode(resolved))
+
+local weight = answer.weight
+if weight == 0 then
+weight = 1
+end
+
+local count = #resolved
+answer_to_count[answer] = count
+-- one target may have multiple resolved results
+for _, res in ipairs(resolved) do
+local copy = table.deepcopy(res)
+copy.weight = weight / count
+copy.port = answer.port
+insert_tab(resolved_answers, copy)
+end
+end
+
+-- find the least common multiple of the counts
+local lcm = answer_to_count[answers[1]]
+for i = 2, #answers do
+local count = answer_to_count[answers[i]]
+lcm = count * lcm / gcd(count, lcm)
+end
+-- fix the weight as the weight should be integer
+for _, res in ipairs(resolved_answers) do
+res.weight = res.weight * lcm
+end
+
+return resolved_answers
+end
+
+
 function _M.resolve(self, domain, selector)
 local client = self.client
 
@@ -45,6 +108,11 @@ function _M.resolve(self, domain, selector)
 
 if selector == _M.RETURN_ALL then
 log.info("dns resolve ", domain, ", result: ", 
json.delay_encode(answers))
+for _, answer in ipairs(answers) do
+if answer.type == client.TYPE_SRV then
+return resolve_srv(client, answers)
+end
+end
 return table.deepcopy(answers)
 end
 
diff --git a/apisix/discovery/dns.lua b/apisix/discovery/dns.lua
index d254db2..64ffe1d 100644
--- a/apisix/discovery/dns.lua
+++ b/apisix/discovery/dns.lua
@@ -52,7 +52,7 @@ function _M.nodes(service_name)
 local nodes = core.table.new(#records, 0)
 for i, r in ipairs(records) do
 if r.address then
-nodes[i] = {host = r.address, weight = 1, port = port}
+nodes[i] = {host = r.address, weight = r.weight or 1, port = 
r.port or port}
 end
 end
 
@@ -74,7 +74,7 @@ function _M.init_worker()
 hosts = {},
 resolvConf = {},
 nameservers = servers,
-order = {"last", "A", "", "CNAME"}, -- avoid querying SRV (we 
don't support it yet)
+order = {"last", "A", "", "SRV", "CNAME"},
 }
 
 local client, err = core.dns_client.new(opts)
diff --git a/docs/en/latest/dns.md b/docs/en/latest/dns.md
index 7d074ba..909b688 100644
--- a/docs/en/latest/dns.md
+++ b/docs/en/latest/dns.md
@@ -22,6 +22,7 @@ title: DNS
 -->
 
 * [service discovery via DNS](#service-discovery-via-dns)
+* [SRV record](#src-record)
 
 ## service discovery via DNS
 
@@ -56,17 +57,16 @@ and `test.consul.service` be resolved as `1.1.1.1` and 
`1.1.1.2`, this result wi
 {
 "id": 1,
 "type": "roundrobin",
-"nodes": {
+"nodes": [
 {"host": "1.1.1.1", "weight": 1},
 {"host": "1.1.1.2", "weight": 1}
-}
+]
 }
 ```
 
 

[GitHub] [apisix] spacewander merged pull request #3686: feat: support SRV record

2021-02-27 Thread GitBox


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


   



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] qier222 commented on a change in pull request #213: fix: #212

2021-02-27 Thread GitBox


qier222 commented on a change in pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#discussion_r584027096



##
File path: website/src/css/customTheme.css
##
@@ -260,11 +274,12 @@ header h2 {
 /* button */
 .button {
   margin: 0 10px;
-  padding: 8px 18px;
+  padding: 18px 18px;
   font-size: 18px;
   font-weight: 600;
   border-radius: 10px;
   border: none;
+  width: 224px;

Review comment:
   Please don't set button width to fixed size, this is global button 
styles.





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] qier222 commented on pull request #213: fix: #212

2021-02-27 Thread GitBox


qier222 commented on pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#issuecomment-787089090


   > Okay, so what exactly did you want here can you tell me ?
   > 
   > Might as well slide it in my next fixing PR, if you like 😄 @qier222
   
   I expect "Version: Next" display inside the docs menu, same as it on desktop.
   
   ![CleanShot 2021-02-27 at 23 19 
13@2x](https://user-images.githubusercontent.com/68148142/109391509-6db83500-7952-11eb-9fac-ece8b7140b7a.png)
   ![CleanShot 2021-02-27 at 23 19 
41@2x](https://user-images.githubusercontent.com/68148142/109391516-74df4300-7952-11eb-9be7-8ce474cda77c.png)
   



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] 1502shivam-singh commented on a change in pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on a change in pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#discussion_r584140899



##
File path: website/src/css/customTheme.css
##
@@ -260,11 +274,12 @@ header h2 {
 /* button */
 .button {
   margin: 0 10px;
-  padding: 8px 18px;
+  padding: 18px 18px;
   font-size: 18px;
   font-weight: 600;
   border-radius: 10px;
   border: none;
+  width: 224px;

Review comment:
   Yes that was the issue for the wide buttons I have fixed it already. 
Will make PR when that "version issue" is done. 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-website] 1502shivam-singh commented on a change in pull request #213: fix: #212

2021-02-27 Thread GitBox


1502shivam-singh commented on a change in pull request #213:
URL: https://github.com/apache/apisix-website/pull/213#discussion_r584141022



##
File path: website/src/css/customTheme.css
##
@@ -57,9 +57,22 @@ header h2 {
   color: var(--color-primary);
 }
 
+.navbar__title{
+  font-size: 18px;
+  height: 30px;
+}
+
 /* home splash */
 .home-splash {
-  margin-top: 8px;
+  margin-top: 0px;
+  margin-bottom: -50px;
+}
+@media only screen and (min-device-width: 360px) and (max-device-width: 736px) 
{
+  .home-splash {
+/* margin-top: 8px; Original*/

Review comment:
   Yes cleared them just 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




[GitHub] [apisix-dashboard] nic-chen opened a new pull request #1524: ci: use the specified version of `skywalking`

2021-02-27 Thread GitBox


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


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [x] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   ___
   ### Bugfix
   - Description
   can't pull skywalking image in ci
   ```
   Pulling skywalking (apache/skywalking-oap-server:)...
   manifest for apache/skywalking-oap-server:latest not found: manifest 
unknown: manifest unknown
   ```
   
   
https://github.com/apache/apisix-dashboard/pull/1504/checks?check_run_id=1994180070#step:6:1409
   
   - How to fix?
   
   use the specified version of `skywalking`
   



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] Yiyiyimu closed pull request #3676: chore: update lua-resty-etcd to v1.4.4

2021-02-27 Thread GitBox


Yiyiyimu closed pull request #3676:
URL: https://github.com/apache/apisix/pull/3676


   



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] Yiyiyimu commented on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail

2021-02-27 Thread GitBox


Yiyiyimu commented on issue #3673:
URL: https://github.com/apache/apisix/issues/3673#issuecomment-787094518


   Hi @GBXing, I tried to reproduce the problem, and the result seems a bit 
different from what you get. My reproduce step is:
   
   1. Configure etcd host with domain name:
   
   ```
   DNS_IP=$(kubectl get svc -n kube-system -l k8s-app=kube-dns -o 
'jsonpath={..spec.clusterIP}')
   echo "dns_resolver:
 - ${DNS_IP}
   etcd:
 host:
   - \\"\\" 
" > ./conf/config.yaml
   ```
   
   2. Setup APISIX and everything works as expect
   3. Kill leader/follower pod of etcd ( gives me the same result ), and the 
error log would produce:
   
   ```
   # Multiple of
   2021/02/27 15:30:19 [error] 49#49: *114289 [lua] config_etcd.lua:566: 
failed to fetch data from etcd: 
/usr/local/apisix//deps/share/lua/5.1/resty/etcd/v3.lua:593: attempt to index 
field 'result' (a nil value)
   stack traceback:
   /usr/local/apisix//deps/share/lua/5.1/resty/etcd/v3.lua:593: in function 
'res_func'
   /usr/local/apisix/apisix/core/config_etcd.lua:125: in function 'waitdir'
   /usr/local/apisix/apisix/core/config_etcd.lua:305: in function 
'sync_data'
   /usr/local/apisix/apisix/core/config_etcd.lua:540: in function 

   [C]: in function 'xpcall'
   /usr/local/apisix/apisix/core/config_etcd.lua:530: in function 
,  etcd key: 
/apisix/global_rules, context: ngx.timer
   
   # Multiple of
   2021/02/27 15:30:38 [error] 53#53: *113602 [lua] config_etcd.lua:544: 
failed to fetch data from etcd: connection refused, etcd key: /apisix/ssl, 
context: ngx.timer
   ```
   
   With etcd-operator, etcd got unreachable for seconds and returned back 
to normal.
   
   Is there any places I missed



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] 1502shivam-singh opened a new pull request #214: Fix: additional increase in button size due to #213

2021-02-27 Thread GitBox


1502shivam-singh opened a new pull request #214:
URL: https://github.com/apache/apisix-website/pull/214


   Fixes: fixes increase in button size due to pull request #213 
   
   Changes:
   
   Removed the padding and margin from global button styles and applied them to 
local styles of specific buttons
   
   Screenshots of the change:
   
   Button size fix
   
   
![test2](https://user-images.githubusercontent.com/57267960/109393066-b9181680-7945-11eb-8f8e-f182bac7fb67.png)
   
   Added padding to "View on Github" on CTA button, for horizontal alignment.
   
   
![test3](https://user-images.githubusercontent.com/57267960/109393068-bd443400-7945-11eb-99f9-4fd7a9b8f4e4.png)
   
   



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] Yiyiyimu edited a comment on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail

2021-02-27 Thread GitBox


Yiyiyimu edited a comment on issue #3673:
URL: https://github.com/apache/apisix/issues/3673#issuecomment-787094518


   Hi @GBXing, I tried to reproduce the problem, and my reproduce steps are:
   
   1. Configure etcd host with domain name:
   
   ```
   DNS_IP=$(kubectl get svc -n kube-system -l k8s-app=kube-dns -o 
'jsonpath={..spec.clusterIP}')
   echo "dns_resolver:
 - ${DNS_IP}
   etcd:
 host:
   - \\"\\" 
" > ./conf/config.yaml
   ```
   
   2. Setup APISIX and everything works as expect
   3. Kill leader/follower pod of etcd ( gives me the same result ), and the 
error log would produce:
   
   ```
   # Multiple of
   2021/02/27 15:30:19 [error] 49#49: *114289 [lua] config_etcd.lua:566: 
failed to fetch data from etcd: 
/usr/local/apisix//deps/share/lua/5.1/resty/etcd/v3.lua:593: attempt to index 
field 'result' (a nil value)
   stack traceback:
   /usr/local/apisix//deps/share/lua/5.1/resty/etcd/v3.lua:593: in function 
'res_func'
   /usr/local/apisix/apisix/core/config_etcd.lua:125: in function 'waitdir'
   /usr/local/apisix/apisix/core/config_etcd.lua:305: in function 
'sync_data'
   /usr/local/apisix/apisix/core/config_etcd.lua:540: in function 

   [C]: in function 'xpcall'
   /usr/local/apisix/apisix/core/config_etcd.lua:530: in function 
,  etcd key: 
/apisix/global_rules, context: ngx.timer
   
   # Multiple of
   2021/02/27 15:30:38 [error] 53#53: *113602 [lua] config_etcd.lua:544: 
failed to fetch data from etcd: connection refused, etcd key: /apisix/ssl, 
context: ngx.timer
   ```
   
   With etcd-operator, etcd got unreachable for seconds and returned back 
to normal.
   
   Is the error log the same with what you met



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] guoqqqi opened a new pull request #3699: docs: added `sidebar` config

2021-02-27 Thread GitBox


guoqqqi opened a new pull request #3699:
URL: https://github.com/apache/apisix/pull/3699


   ### 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?
   * [ ] 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**
   
   Added sidebar in the config and updated some titles in `docs/zh`.



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] guoqqqi commented on pull request #3699: docs: added `sidebar` config

2021-02-27 Thread GitBox


guoqqqi commented on pull request #3699:
URL: https://github.com/apache/apisix/pull/3699#issuecomment-787108798


   
![image](https://user-images.githubusercontent.com/72343596/109395265-6e5ac680-7966-11eb-836a-bc5b18930fa5.png)
   These two documents are not yet available in the Chinese directory.



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] GBXing commented on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail

2021-02-27 Thread GitBox


GBXing commented on issue #3673:
URL: https://github.com/apache/apisix/issues/3673#issuecomment-787109703


   @tokers service name is etcd,namespace is apisix, other nodes can be 
accessed normally



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] GBXing commented on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail

2021-02-27 Thread GitBox


GBXing commented on issue #3673:
URL: https://github.com/apache/apisix/issues/3673#issuecomment-787109936


   @Yiyiyimu I may be using it in a wrong way, do I need to add any additional 
configuration in config.yaml for the health check of  etcd?



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

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




[GitHub] [apisix] juzhiyuan commented on a change in pull request #3699: docs: added `sidebar` config

2021-02-27 Thread GitBox


juzhiyuan commented on a change in pull request #3699:
URL: https://github.com/apache/apisix/pull/3699#discussion_r584191920



##
File path: docs/en/latest/config.json
##
@@ -1,4 +1,161 @@
 {
   "version": 2.3,
-  "sidebar": {}
+  "sidebar": [
+{
+  "type": "doc",
+  "id": "../../../README_ES"

Review comment:
   ES is not in English 

##
File path: README_CN.md
##
@@ -1,3 +1,7 @@
+---
+title: APISIX 说明

Review comment:
   Keep the original translation 

##
File path: docs/en/latest/README.md
##
@@ -19,7 +19,7 @@
 
 ## Reference Documentation
 
-* [APISIX Readme](./README.md)
+* [APISIX Readme](../../../README.md)

Review comment:
   Check again 

##
File path: docs/en/latest/config.json
##
@@ -1,4 +1,161 @@
 {
   "version": 2.3,
-  "sidebar": {}
+  "sidebar": [
+{
+  "type": "doc",
+  "id": "../../../README_ES"
+},
+{
+  "type": "doc",
+  "id": "architecture-design"
+},
+{
+  "type": "doc",
+  "id": "getting-started"
+},
+{
+  "type": "doc",
+  "id": "how-to-build"
+},
+{
+  "type": "category",
+  "label": "Plugins",
+  "items": [
+{
+  "type": "category",
+  "label": "General",
+  "items": [
+"plugins/batch-requests",
+"plugins",
+"https",
+"plugins/serverless",
+"plugins/redirect"
+  ]
+},
+{
+  "type": "category",
+  "label": "Transformation",
+  "items": [
+"plugins/response-rewrite",
+"plugins/proxy-rewrite",
+"plugins/grpc-transcode",
+"plugins/fault-injection"
+  ]
+},
+{
+  "type": "category",
+  "label": "Authentication",
+  "items": [
+"plugins/key-auth",
+"plugins/jwt-auth",
+"plugins/basic-auth",
+"plugins/authz-keycloak",
+"plugins/wolf-rbac",
+"plugins/openid-connect"
+  ]
+},
+{
+  "type": "category",
+  "label": "Security",
+  "items": [
+"plugins/cors",
+"plugins/uri-blocker",
+"plugins/ip-restriction",
+"plugins/referer-restriction"
+  ]
+},
+{
+  "type": "category",
+  "label": "Traffic",
+  "items": [
+"plugins/limit-req",
+"plugins/limit-conn",
+"plugins/limit-count",
+"plugins/proxy-cache",
+"plugins/request-validation",
+"plugins/proxy-mirror",
+"plugins/api-breaker",
+"plugins/traffic-split"
+  ]
+},
+{
+  "type": "category",
+  "label": "Monitoring",
+  "items": [
+"plugins/prometheus",
+"plugins/zipkin",
+"plugins/skywalking"
+  ]
+},
+{
+  "type": "category",
+  "label": "Loggers",
+  "items": [
+"plugins/http-logger",
+"plugins/tcp-logger",
+"plugins/kafka-logger",
+"plugins/udp-logger",
+"plugins/syslog",
+"plugins/log-rotate"
+  ]
+}
+  ]
+},
+{
+  "type": "doc",
+  "id": "admin-api"
+},
+{
+  "type": "doc",
+  "id": "control-api"
+},
+{
+  "type": "doc",
+  "id": "health-check"
+},
+{
+  "type": "doc",
+  "id": "router-radixtree"
+},
+{
+  "type": "doc",
+  "id": "stand-alone"
+},
+{
+  "type": "doc",
+  "id": "stream-proxy"
+},
+{
+  "type": "doc",
+  "id": "grpc-proxy"
+},
+{
+  "type": "doc",
+  "id": "./customize-nginx-configuration"
+},
+{
+  "type": "doc",
+  "id": "./dns"
+},
+{
+  "type": "doc",
+  "id": "../../../CHANGELOG"

Review comment:
   CHANGELOG may be out at the end of this file 

##
File path: docs/zh/latest/stand-alone.md
##
@@ -1,5 +1,5 @@
 ---
-title: Stand-alone mode
+title: 独立运行模型

Review comment:
   Use the original title 

##
File path: docs/en/latest/stand-alone.md
##
@@ -1,5 +1,5 @@
 ---
-title: Stand-alone mode
+title: Stand Alone Model

Review comment:
   Model?

##
File path: docs/zh/latest/README.md
##
@@ -19,22 +19,22 @@
 
 ## 参考文档
 
-* [APISIX 说明](../../README_CN.md)
+* [APISIX 说明](../../../README_CN.md)

Review comment:
   Why put this file outside the latest folder?

##
File path: docs/en/latest/config.json
##
@@ -1,4 +1,161 @@
 {
   "version": 2.3,
-  "sidebar": {}
+  "sidebar": [
+{
+  "type": "doc",
+  "id": "../../../README_ES"
+},
+{
+  "type": "doc",
+  "id": "architecture-design"
+},
+{
+  "type": "doc",
+  "id": "getting-started

[GitHub] [apisix-website] juzhiyuan commented on pull request #214: fix: additional increase in button size due to #213

2021-02-27 Thread GitBox


juzhiyuan commented on pull request #214:
URL: https://github.com/apache/apisix-website/pull/214#issuecomment-787151325


   cc @qier222 to take a look 



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 merged pull request #1524: ci: use the specified version of `skywalking`

2021-02-27 Thread GitBox


juzhiyuan merged pull request #1524:
URL: https://github.com/apache/apisix-dashboard/pull/1524


   



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

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




[apisix-dashboard] branch master updated: ci: use the specified version of `skywalking` (#1524)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 93e55ec  ci: use the specified version of `skywalking` (#1524)
93e55ec is described below

commit 93e55ec043260feff3f4bdc489a26344d78c8512
Author: nic-chen <33000667+nic-c...@users.noreply.github.com>
AuthorDate: Sun Feb 28 05:37:31 2021 +0800

ci: use the specified version of `skywalking` (#1524)
---
 api/test/docker/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/test/docker/docker-compose.yaml 
b/api/test/docker/docker-compose.yaml
index c1a28d5..1c83ca7 100644
--- a/api/test/docker/docker-compose.yaml
+++ b/api/test/docker/docker-compose.yaml
@@ -191,7 +191,7 @@ services:
 ipv4_address: 172.16.238.40
 
   skywalking:
-image: apache/skywalking-oap-server
+image: apache/skywalking-oap-server:8.3.0-es6
 restart: always
 ports:
   - '1234:1234/tcp'



[GitHub] [apisix] moonming commented on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail

2021-02-27 Thread GitBox


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


   v3.lua:593: attempt to index field 'result' (a nil value)
   
   
   is this a bug of apisix?
   
   
   GBXing 于2021年2月28日 周日上午1:53写道:
   
   > @Yiyiyimu  I may be using it in a wrong way,
   > do I need to add any additional configuration in config.yaml for the health
   > check of etcd?
   >
   > —
   > You are receiving this because you commented.
   > Reply to this email directly, view it on GitHub
   > , or
   > unsubscribe
   > 

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



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

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




[GitHub] [apisix] juzhiyuan commented on a change in pull request #3699: docs: added `sidebar` config

2021-02-27 Thread GitBox


juzhiyuan commented on a change in pull request #3699:
URL: https://github.com/apache/apisix/pull/3699#discussion_r584213964



##
File path: docs/en/latest/README.md
##
@@ -105,4 +105,4 @@ The recommended approach is to deploy APISIX with [AWS 
CDK](https://aws.amazon.c
 
 ### Kubernetes
 
-See [this guide](../kubernetes/README.md) and learn how to deploy apisix in 
Kubernetes.
+See [this guide](../../../kubernetes/README.md) and learn how to deploy apisix 
in Kubernetes.

Review comment:
   Why not put this file under the current folder?

##
File path: docs/zh/latest/CHANGELOG_CN.md
##
@@ -1,3 +1,7 @@
+---
+title: 变更日志

Review comment:
   Use CHANGELOG here

##
File path: docs/en/latest/README_US.md
##
@@ -0,0 +1,346 @@
+---
+title: Apache APISIX

Review comment:
   No, use README.md

##
File path: docs/en/latest/config.json
##
@@ -1,4 +1,160 @@
 {
   "version": 2.3,
-  "sidebar": {}
+  "sidebar": [
+{
+  "type": "doc",
+  "id": "README_US"

Review comment:
   Use README





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 #1504: feat: rewrite e2e test(upstream_chash_query_string_arg_xxx_test) with ginkgo

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=h1) 
Report
   > Merging 
[#1504](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=desc) 
(04c4450) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/93e55ec043260feff3f4bdc489a26344d78c8512?el=desc)
 (93e55ec) will **decrease** coverage by `17.35%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1504   +/-   ##
   ===
   - Coverage   69.01%   51.65%   -17.36% 
   ===
 Files  48   39-9 
 Lines3056 2600  -456 
   ===
   - Hits 2109 1343  -766 
   - Misses707 1083  +376 
   + Partials  240  174   -66 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=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/1504/diff?src=pr&el=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/1504/diff?src=pr&el=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/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `0.00% <0.00%> (-74.49%)` | :arrow_down: |
   | 
[api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv)
 | `0.00% <0.00%> (-66.67%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=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/1504/diff?src=pr&el=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/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `27.41% <0.00%> (-37.50%)` | :arrow_down: |
   | 
[api/internal/handler/server\_info/server\_info.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmVyX2luZm8vc2VydmVyX2luZm8uZ28=)
 | `57.14% <0.00%> (-33.34%)` | :arrow_down: |
   | 
[api/internal/utils/closer.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2Nsb3Nlci5nbw==)
 | `0.00% <0.00%> (-33.34%)` | :arrow_down: |
   | ... and [29 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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/1504?src=pr&el=footer).
 Last update 
[93e55ec...04c4450](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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 #1504: feat: rewrite e2e test(upstream_chash_query_string_arg_xxx_test) with ginkgo

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=h1) 
Report
   > Merging 
[#1504](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=desc) 
(04c4450) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/93e55ec043260feff3f4bdc489a26344d78c8512?el=desc)
 (93e55ec) will **decrease** coverage by `6.54%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1504  +/-   ##
   ==
   - Coverage   69.01%   62.46%   -6.55% 
   ==
 Files  48   48  
 Lines3056 3056  
   ==
   - Hits 2109 1909 -200 
   - Misses707  896 +189 
   - Partials  240  251  +11 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `35.08% <0.00%> (-29.84%)` | :arrow_down: |
   | 
[api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==)
 | `75.00% <0.00%> (-25.00%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | `31.93% <0.00%> (-23.53%)` | :arrow_down: |
   | 
[api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `54.08% <0.00%> (-20.41%)` | :arrow_down: |
   | 
[api/internal/log/log.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2xvZy9sb2cuZ28=)
 | `30.00% <0.00%> (-20.00%)` | :arrow_down: |
   | 
[api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=)
 | `66.12% <0.00%> (-17.75%)` | :arrow_down: |
   | 
[api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv)
 | `54.11% <0.00%> (-11.77%)` | :arrow_down: |
   | 
[api/internal/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3JvdXRlLmdv)
 | `76.47% <0.00%> (-8.83%)` | :arrow_down: |
   | 
[api/internal/core/storage/etcd.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmFnZS9ldGNkLmdv)
 | `43.63% <0.00%> (-7.28%)` | :arrow_down: |
   | 
[api/internal/handler/route/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=)
 | `71.12% <0.00%> (-7.12%)` | :arrow_down: |
   | ... and [5 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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/1504?src=pr&el=footer).
 Last update 
[93e55ec...04c4450](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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 #1504: feat: rewrite e2e test(upstream_chash_query_string_arg_xxx_test) with ginkgo

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=h1) 
Report
   > Merging 
[#1504](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=desc) 
(04c4450) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/93e55ec043260feff3f4bdc489a26344d78c8512?el=desc)
 (93e55ec) will **decrease** coverage by `0.03%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1504  +/-   ##
   ==
   - Coverage   69.01%   68.97%   -0.04% 
   ==
 Files  48   48  
 Lines3056 3056  
   ==
   - Hits 2109 2108   -1 
   - Misses707  708   +1 
 Partials  240  240  
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=)
 | `87.34% <0.00%> (-0.61%)` | :arrow_down: |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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/1504?src=pr&el=footer).
 Last update 
[93e55ec...04c4450](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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 #1504: feat: rewrite e2e test(upstream_chash_query_string_arg_xxx_test) with ginkgo

2021-02-27 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=h1) 
Report
   > Merging 
[#1504](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=desc) 
(04c4450) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/93e55ec043260feff3f4bdc489a26344d78c8512?el=desc)
 (93e55ec) will **decrease** coverage by `0.03%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1504  +/-   ##
   ==
   - Coverage   69.01%   68.97%   -0.04% 
   ==
 Files  48   48  
 Lines3056 3056  
   ==
   - Hits 2109 2108   -1 
   - Misses707  708   +1 
 Partials  240  240  
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1504/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=)
 | `87.34% <0.00%> (-0.61%)` | :arrow_down: |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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/1504?src=pr&el=footer).
 Last update 
[93e55ec...04c4450](https://codecov.io/gh/apache/apisix-dashboard/pull/1504?src=pr&el=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-website] qier222 commented on pull request #214: fix: additional increase in button size due to #213

2021-02-27 Thread GitBox


qier222 commented on pull request #214:
URL: https://github.com/apache/apisix-website/pull/214#issuecomment-787220248


   🤔
   https://user-images.githubusercontent.com/68148142/109405582-f2d03800-79ac-11eb-9138-34322a70bd31.png";>
   



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] nic-chen opened a new pull request #3700: fix: validate plugins configuration of `plugin_config` via incremental sync

2021-02-27 Thread GitBox


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


   ### What this PR does / why we need it:
   
   
   
   close #3674
   
   Currently, the `item_schema` is not set for `plugin_config`, 
   which causes the plugin configuration to not be validated when incrementally 
updated from ETCD (see: 
https://github.com/apache/apisix/blob/master/apisix/core/config_etcd.lua#L347), 
   resulting in the default value of the plugin configuration not being set.
   
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [x] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [x] Is this PR backward compatible? **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] nic-chen commented on issue #3674: When multiple plugins are configured in plugin_config, only one takes effect

2021-02-27 Thread GitBox


nic-chen commented on issue #3674:
URL: https://github.com/apache/apisix/issues/3674#issuecomment-787222468


   @spacewander 
   I rechecked it today and found that it was an incremental synchronization 
problem, not a problem of multiple plugins.
   
   Sorry for misleading.
   
   Please take a look at that pr when you have time, 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-ingress-controller] iamayushdas opened a new pull request #275: updated technical architecture of apisix-ingress-controller

2021-02-27 Thread GitBox


iamayushdas opened a new pull request #275:
URL: https://github.com/apache/apisix-ingress-controller/pull/275


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [ ] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   - Related issues
   
   ___
   ### Bugfix
   - Description
   
   - How to fix?
   
   ___
   ### New feature or improvement
   - Describe the details and related test reports.
   
   ___
   ### Backport patches
   - Why need to backport?
   
   - Source branch
   
   - Related commits and pull requests
   
   - Target branch
   



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] codecov-io commented on pull request #275: updated technical architecture of apisix-ingress-controller

2021-02-27 Thread GitBox


codecov-io commented on pull request #275:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/275#issuecomment-787224463


   # 
[Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275?src=pr&el=h1)
 Report
   > Merging 
[#275](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275?src=pr&el=desc)
 (0ed3156) into 
[master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/0c8f306cac9911ababb3c23700ac7ca1efc21833?el=desc)
 (0c8f306) will **increase** coverage by `46.14%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/graphs/tree.svg?width=650&height=150&src=pr&token=WPLQXPY3V0)](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275?src=pr&el=tree)
   
   ```diff
   @@ Coverage Diff  @@
   ##   master  #275   +/-   ##
   
   + Coverage   53.85%   100.00%   +46.14% 
   
 Files  33 1   -32 
 Lines2245 1 -2244 
   
   - Hits 1209 1 -1208 
   + Misses879 0  -879 
   + Partials  157 0  -157 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275?src=pr&el=tree)
 | Coverage Δ | |
   |---|---|---|
   | 
[pkg/types/event.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL3R5cGVzL2V2ZW50Lmdv)
 | | |
   | 
[pkg/types/errors.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL3R5cGVzL2Vycm9ycy5nbw==)
 | | |
   | 
[pkg/kube/translation/apisix\_upstream.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vYXBpc2l4X3Vwc3RyZWFtLmdv)
 | | |
   | 
[pkg/ingress/apisix/tls.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL2luZ3Jlc3MvYXBpc2l4L3Rscy5nbw==)
 | | |
   | 
[pkg/id/idgen.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL2lkL2lkZ2VuLmdv)
 | | |
   | 
[pkg/apisix/cluster.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL2FwaXNpeC9jbHVzdGVyLmdv)
 | | |
   | 
[cmd/ingress/ingress.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-Y21kL2luZ3Jlc3MvaW5ncmVzcy5nbw==)
 | | |
   | 
[pkg/seven/conf/conf.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL3NldmVuL2NvbmYvY29uZi5nbw==)
 | | |
   | 
[pkg/api/router/router.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL2FwaS9yb3V0ZXIvcm91dGVyLmdv)
 | | |
   | 
[pkg/apisix/service.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree#diff-cGtnL2FwaXNpeC9zZXJ2aWNlLmdv)
 | | |
   | ... and [22 
more](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275/diff?src=pr&el=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275?src=pr&el=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-ingress-controller/pull/275?src=pr&el=footer).
 Last update 
[0c8f306...0ed3156](https://codecov.io/gh/apache/apisix-ingress-controller/pull/275?src=pr&el=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] nic-chen opened a new pull request #3701: chore: expose schema of `plugin_config` via control API

2021-02-27 Thread GitBox


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


   ### What this PR does / why we need it:
   
   
   
   expose schema of `plugin_config` via control API,
   
   Then, we can use the schema to verify the configuration of `plugin_config` 
in Dashboard.
   
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [x] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [x] Is this PR backward compatible? **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] guoqqqi commented on a change in pull request #3699: docs: added `sidebar` config

2021-02-27 Thread GitBox


guoqqqi commented on a change in pull request #3699:
URL: https://github.com/apache/apisix/pull/3699#discussion_r584237930



##
File path: docs/en/latest/README.md
##
@@ -105,4 +105,4 @@ The recommended approach is to deploy APISIX with [AWS 
CDK](https://aws.amazon.c
 
 ### Kubernetes
 
-See [this guide](../kubernetes/README.md) and learn how to deploy apisix in 
Kubernetes.
+See [this guide](../../../kubernetes/README.md) and learn how to deploy apisix 
in Kubernetes.

Review comment:
   
![image](https://user-images.githubusercontent.com/72343596/109408978-94fe1900-79c9-11eb-87b7-63bba3330d71.png)
   Can I put that folder into docs, I see that there are other types of files 
in that folder.





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] tzssangglass commented on issue #3692: [discuss]: enable etcd health check

2021-02-27 Thread GitBox


tzssangglass commented on issue #3692:
URL: https://github.com/apache/apisix/issues/3692#issuecomment-787407359


   > For this case maybe we can resolve the domain each time before retry?
   
   Maybe we can do it, but I think we can also do without. My point is: if you 
configure the `domain`, then the component responsible for domain resolution 
should also provide the ability to health check, and it should always return 
the `ip` of a healthy instance under that domain.
   
   I'm not sure if this is a correct point, just a perception.



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